Commit Graph

5343 Commits

Author SHA1 Message Date
icomrade
894ea80c16 Merge pull request #1974 from oiad/patch-3
Add support for keeping the key on vehicle sale
2017-09-08 10:04:35 -04:00
icomrade
1f929b526b Merge pull request #1972 from oiad/patch-12
Fix javelin/stinger selling
2017-09-08 10:04:10 -04:00
icomrade
7ad57d999f Merge pull request #1968 from oiad/patch-6
Switch forgotten "time" to "diag_tickTime"
2017-09-08 10:03:44 -04:00
icomrade
89019f1ced Merge pull request #1967 from oiad/patch-5
Fix bad sentences for locking/packing fails.
2017-09-08 10:03:12 -04:00
icomrade
ec78f61918 Merge pull request #1966 from oiad/patch-4
Dont show incomplete lockbox code
2017-09-08 10:03:01 -04:00
icomrade
58171acda2 Merge pull request #1964 from oiad/patch-2
Remove comment for engine starting/stopping
2017-09-08 10:02:31 -04:00
icomrade
23597db275 Merge pull request #1963 from oiad/patch-1
Fix vehicles bouncing when upgrading.
2017-09-08 10:01:49 -04:00
icomrade
6239959a13 Merge pull request #1962 from oiad/master
AI hit messages and continuity
2017-09-08 10:01:31 -04:00
oiad
08796c65de Update server_swapObject.sqf 2017-08-31 00:07:16 +12:00
oiad
5eba1edf4b Update server_publishVehicle.sqf 2017-08-31 00:06:44 +12:00
oiad
9b79dde3aa Update server_publishVehicle3.sqf 2017-08-31 00:05:35 +12:00
oiad
7a40f5d621 Add support for keeping the key on vehicle sale 2017-08-30 23:48:48 +12:00
oiad
63bc345f9f Add support for keeping the key on vehicle sale 2017-08-30 23:47:20 +12:00
oiad
f8a230e3b1 Fix javelin/stinger selling
The previous fix 4fa36dfd94 was not working correctly, if you had say the a stinger launcher and a stinger ammo it would detect them both as weapons, this properly classifies them and all others as how they should be.

Moved to use epoch_tempKeys also

This forces the player to only be able to sell a vehicle from the gear menu instead of backpack and vehicle menu since most of the time you would be using add all.

From: https://epochmod.com/forum/topic/44413-prevent-selling-vehicles-from-backpack/?tab=comments#comment-297328
2017-08-26 09:56:28 +12:00
oiad
7decf4dd9e Switch forgotten "time" to "diag_tickTime"
Seems like these were forgotten at some point, the rest are diag_tickTime
2017-08-21 20:50:23 +12:00
oiad
5fc0b36e5b Fix bad sentences for locking/packing fails. 2017-08-20 23:00:35 +12:00
oiad
403e40063f Update server_handleSafeGear.sqf 2017-08-19 20:28:46 +12:00
oiad
367d74f3f4 Update server_handleSafeGear.sqf 2017-08-19 11:53:11 +12:00
oiad
ecf013839e Dont show incomplete lockbox code
If the player enters a wrong code the algorithm can make the entered code seem completely bogus, let's just exit out of the routine if that's the case.

Sample bad code (Just hit red key):
```11:45:54 "salival (playerUID) FAILED unlocking LockBox with code: Red0-9900 (actual: Red34) @038117 [3899.36,3580.24,1.632]"```
2017-08-19 11:46:35 +12:00
oiad
e21e0e217f Remove comment for engine starting/stopping
Actually makes this functional without editing it, this is quite useful for custom scripts.
2017-08-17 23:33:51 +12:00
oiad
bdfbcb1e32 Fix vehicles bouncing when upgrading.
This helps stop vehicles bouncing when being upgraded.
The Vehicle Key Changer script I rewrote uses the epoch vehicle upgrade system to claim/change the vehicle key, we noticed that it was causing the vehicles to bounce, but VKC uses all the position functions from the epoch script so it's not something that VKC has introduced.
2017-08-17 23:28:16 +12:00
oiad
4355824aad Revert commit 2017-08-17 23:25:08 +12:00
oiad
d04a99aa04 Fix vehicles bouncing when upgrading.
This helps stop vehicles bouncing when being upgraded.
The Vehicle Key Changer script I rewrote uses the epoch vehicle upgrade system to claim/change the vehicle key, we noticed that it was causing the vehicles to bounce, but VKC uses all the position functions from the epoch script so it's not something that VKC has introduced.
2017-08-17 23:19:48 +12:00
oiad
7428f3fd1f AI hit messages and continuity
This changes the hit messages to only show AI instead of the AI's names.
Changes this:
20:08:37 "P1ayer PID#7(salival) hit by PID#1(Qadeer Hakimi) with
vil_G36VA4Eot/B_556x45_Ball <ammo left:25> from 356 meters in head_hit
for 0 damage"
To this:
20:08:37 "P1ayer PID#7(salival) hit by AI with
vil_G36VA4Eot/B_556x45_Ball <ammo left:25> from 356 meters in head_hit
for 0 damage"

Sanity fix for hit and kill for vehicles so they match:
Before:
22:44:03 "P1ayer PID#3(salival) hit by AI in Pickup (PK) DZ from 15
meters in head_hit for 0.88666 damage"
After:
22:44:03 "P1ayer PID#3(salival) hit by AI with a Pickup (PK) DZ from 15
meters in head_hit for 0.88666 damage"
Kill message:
22:44:04 "salival (76561197999617086) salival was killed
by AI with a Pickup_PK_INS_DZ from 15m"
2017-08-17 23:09:10 +12:00
ebayShopper
026788e714 Block another A2OA script execution exploit
Thanks to Dihan for reporting on Discord.

This exploit may work with other event handlers, displays and controls.
Please leave a comment if you find any others that work. I tested GPS,
abort, MP setup and group menu displays, as well as the map diary list
box controls, but none of those had this problem.

This should be fixed with an A2OA patch, please report to Bohemia.
2017-08-13 16:07:03 -04:00
icomrade
368aa1217b Merge pull request #1961 from oiad/master
Condense locked status to a variable
2017-08-06 14:40:28 -04:00
oiad
2a01194d87 Condense locked status to a variable
This will be easier for custom mods that use the lock checking
(vkc/virtual garage etc) as well as removing overhead from
fn_selfActions
2017-08-06 09:41:23 +12:00
icomrade
de36dee67c Update scripts.txt 2017-08-04 20:59:11 -04:00
icomrade
b701907c18 Merge pull request #1960 from oiad/master
extend epoch_tempKeys to return key classnames also
2017-08-04 10:03:24 -04:00
oiad
751fdc9e82 extend epoch_tempKeys to return key classnames also 2017-08-04 23:18:27 +12:00
icomrade
68be0c6003 remove squad xml input box
doesn't actually stop a squad xml from being loaded, but if the player opens the panel the url will be erased from their profile file
2017-08-03 17:01:30 -04:00
icomrade
ae0ddbe735 duplicates 2017-08-03 17:00:09 -04:00
icomrade
e2f14dcb04 adjust filters 2017-08-02 18:59:15 -04:00
icomrade
e326678504 Don't str str 2017-08-02 18:57:26 -04:00
icomrade
f7608965df remove server control panel 2017-08-01 20:54:39 -04:00
icomrade
9cc3c82d5d set humanity early 2017-08-01 19:34:15 -04:00
icomrade
fbfb124296 use str instead of format 2017-08-01 17:39:53 -04:00
icomrade
9acae56aba more scripts.txt filters 2017-07-30 18:41:57 -04:00
icomrade
6c7b884958 restrict again 2017-07-30 18:39:38 -04:00
icomrade
688c6a9423 increment version 2017-07-30 17:57:39 -04:00
ebayShopper
7a68f9f70b Add some basic compatibility for Ruegen map 2017-07-30 16:28:37 -04:00
ebayShopper
84556c9d03 Revert group menu color scheme to A2OA default 2017-07-30 12:44:58 -04:00
icomrade
de92ae22be reduce charset 2017-07-29 21:12:23 -04:00
icomrade
096da756fe Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-07-29 21:09:26 -04:00
icomrade
8035df0ba0 Rudimentary auth for DeleteObj
limits distance to object, as well as validating random auth key.  added server_deleteObjDirect which is only for direct execution on the server, whereas server_deleteObj should be used for PVEH execution only
2017-07-29 21:09:20 -04:00
oiad
09bfddb46c Remove extra fn_selfActions check for refueling. (#1958) 2017-07-29 17:59:52 -04:00
icomrade
9b3ccaaa02 forgot 2017-07-29 17:32:08 -04:00
icomrade
4191fbfc3a should fix invincibility 2017-07-29 17:31:23 -04:00
icomrade
bc4be38629 tweak switch model/morph again 2017-07-29 14:50:24 -04:00
icomrade
ff7ec49ac5 make important point 2017-07-26 17:58:02 -04:00