Commit Graph

5385 Commits

Author SHA1 Message Date
icomrade
02ff9be46d init vars earlier in updgrade veh
also move vehicle later so the player can't get in until after vehicle is fully initialized
2017-09-25 12:36:37 -04:00
icomrade
95b3174e04 move SQF wait/loop to get OID to SQL Procedure
for some reason you cannot directly get the OID using SELECT LAST_INSERT_ID(); and you cannot return it within the same hive call as the insert call (????).

Requires new procedure for 1.0.6.2
2017-09-25 12:14:41 -04:00
icomrade
cb5d61eff7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-09-19 12:28:19 -04:00
icomrade
83eb130fd2 add BAF_L85A2_RIS_TWS_DZ #1983 2017-09-19 12:27:33 -04:00
ebayShopper
6ab4faba39 Update AI hit log
Correction for 6239959

@oiad isPlayer is not reliable on dead units which may be passed to
fa_plr2Str. Also, the other scripts which call fa_plr2Str always provide
a player, so we only want to check for AI on the hit log source.
2017-09-19 12:11:27 -04:00
icomrade
f69bd80f43 revert distance to player check
Occasionally errors out, but may not be worth implementing in Epoch due to the increased loot
2017-09-15 21:12:30 -04:00
icomrade
51ccf16c30 Fix dupe caused by dupe fix
thanks JasomTM and Salival
2017-09-15 20:16:59 -04:00
icomrade
3593e146c3 remove UH1Y gunner optics overlay
The default venom doesn't actually have an overlay, and it's pretty annoying anyway
2017-09-14 20:17:57 -04:00
icomrade
a4195948ed Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-09-14 18:24:22 -04:00
icomrade
b24129afd9 update changelog 2017-09-14 18:24:16 -04:00
icomrade
64cb21b00e Merge pull request #1982 from worldwidesorrow/master
Trader Updates for 1.0.6.2
2017-09-14 16:38:20 -04:00
worldwidesorrow
4e7f184033 Add files via upload 2017-09-14 14:42:32 -05:00
icomrade
b8d5c7cda7 Change slow zombie behavior and variable
thanks for the idea DieTanx. note: The only changes to the FSM were in the action field of the UnitReady condition
2017-09-14 12:44:44 -04:00
icomrade
7ae6aa56dd Fix #1981 and Incidental dupe
thanks @AirwavesMan
2017-09-13 14:51:34 -04:00
icomrade
d750f576ed Prevent Zed + loot spawn in safezones
thanks BaroN for the idea
2017-09-13 12:45:00 -04:00
icomrade
404210ac04 update version 2017-09-12 17:34:54 -04:00
icomrade
4773ef5af7 Fix No Owner Spam
Doesn't make sense deleting a display would cause issue on a machine without a display... typical BIS BS
2017-09-12 15:11:51 -04:00
icomrade
7637ee6cac Merge pull request #1980 from oiad/patch-15
Fix auto unlock to function like storage
2017-09-11 22:50:30 -04:00
oiad
50ec89489d Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:51:48 +12:00
oiad
76bafe55ec Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:50:52 +12:00
oiad
27801a111b Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:49:32 +12:00
icomrade
2a65a4119d Merge pull request #1979 from oiad/patch-14
Move more diag_log to debug lines
2017-09-08 20:43:58 -04:00
oiad
e8a64c3757 Move more diag_log to debug lines 2017-09-09 12:16:58 +12:00
oiad
ea38067cc1 Move more diag_log to debug lines 2017-09-09 12:11:38 +12:00
icomrade
569b1d3701 Merge pull request #1978 from oiad/patch-10
Add extra magazine instead of reloading current one
2017-09-08 18:52:13 -04:00
oiad
bc93e246ee Add extra magazine instead of reloading current one
e7ffb88075
2017-09-09 09:22:51 +12:00
icomrade
fc23bc73b2 remove hotfix from check 2017-09-08 11:42:03 -04:00
icomrade
b7eeaf2283 scripts.txt 2017-09-08 11:29:27 -04:00
icomrade
e9abd7b161 revise changelog note 2017-09-08 11:29:20 -04:00
icomrade
e0005850b8 Prevent loot pile cleanup right next to player
726155f16d
2017-09-08 11:12:40 -04:00
icomrade
0a54dd02a2 Remove 1.0.6.1A Hotfix from Missions 2017-09-08 11:07:57 -04:00
icomrade
82db7d8109 consolidate eval 2017-09-08 10:11:20 -04:00
icomrade
a21f4f797d Merge pull request #1977 from oiad/patch-8
Allow modular buildables to refund defined parts
2017-09-08 10:07:28 -04:00
icomrade
26da25bf42 Merge pull request #1976 from oiad/patch-7
Only allow lock removal if door is unlocked
2017-09-08 10:05:28 -04:00
icomrade
7a3c831eb3 Merge pull request #1975 from oiad/patch-13
Exclude DZE_PlotManagementAdmins from build checks (safeZone/no build…
2017-09-08 10:05:02 -04:00
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
cdd0db805f Remove debug lines 2017-09-03 19:27:30 +12:00
oiad
5378b1ad76 Fix random count 2017-09-03 19:18:55 +12:00
oiad
ce756a0622 Allow modular buildables to refund defined parts 2017-09-03 19:13:56 +12:00
oiad
0507563e17 Allow modular buildables to refund defined parts 2017-09-03 19:11:53 +12:00
oiad
e1f48ea557 Allow modular buildables to refund defined parts
This allows typically not refunded modular buildables to be configured by the server admin.

	For example:
	DZE_modularConfig = [
		["CinderWall_DZ", [["CinderBlocks",7],["MortarBucket",2]]],
		["CinderWallDoor_DZ", [["CinderBlocks",7],["MortarBucket",2],["ItemTankTrap",3],["ItemPole",[1,3]]]]
	];

	This would refund 7 cinder blocks and 2 mortar for "CinderWall_DZ"
	For "CinderWallDoor_DZ" you would get 7 cinder blocks, 2 mortar, 3 tank traps and a random number of poles between 1 and 3.
	The refund amount can be an array where the first param is the minimum and the second is the maximum, it will refund a random amount between them.

Thanks to @BigEgg for the suggestion and sample code.
2017-09-03 19:03:33 +12:00
oiad
b8dba25cc5 Only allow lock removal if door is unlocked 2017-09-03 13:56:06 +12:00
oiad
08796c65de Update server_swapObject.sqf 2017-08-31 00:07:16 +12:00