Commit Graph

5411 Commits

Author SHA1 Message Date
icomrade
7cd8cd18d4 revert 68be0c6003 2017-10-25 16:23:49 -04:00
ebayShopper
97a30adc3b Fix gem sell currency typo
@icomrade Correct me if I'm wrong, but it looks like this was a copy paste typo from https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcBuyableList.sqf#L57

in 83694a4
2017-10-25 14:12:01 -04:00
oiad
64b5659bbd Better checks for removing the owner of plots/doors
Revert
f0e8796996

Partial revert:
2f0774d531 (diff-c3aa237d9007054fc3a724116a5d9f1a)

This is a better check for removing the owner of plots/doors based on
conversations on discord.
Plot/door owner can remove them selves
plot/door friends can't remove plot owner
plot/door admins can remove anyone
2017-10-24 20:19:21 +13:00
A Man
7a8d23bdeb German stringstable overhaul again (#1991)
* German stringstable overhaul

* update

* update

* update
2017-10-22 20:11:35 +13:00
icomrade
0a2c352993 Merge pull request #1990 from oiad/patch-2
Fix issues with DZE_limitPlots
2017-10-15 11:56:13 -04:00
oiad
f0e8796996 Check if players are owner of other plots correctly
This fixes the checking done not picking up that a player was the owner of the plot by the userlist on the plot when it wasn't them that placed it
2017-10-16 00:04:59 +13:00
oiad
de94cdfb23 Check plot ownership when removing players from plot pole
Additional work for 73899d520f (diff-0cdf3d56b40b62e92b498e7362874f34)
This fixes an issue of players removing them selves from a plot so a friend can become plot owner and bypass the original DZE_limitPlots check
2017-10-15 23:53:24 +13:00
icomrade
eb4cc51239 Merge pull request #1989 from dreamforceinc/patch-1
Update russian translation.
2017-10-10 19:32:56 -04:00
W0LF
765ed17a78 Update russian translation. 2017-10-10 23:43:05 +03:00
icomrade
298b3e823b Merge pull request #1988 from BigEgg17/master
Added option to limit build height
2017-10-08 13:37:31 -04:00
BigEgg
e9ff8ff45b Removed "=" from dze_buildChecks.sqf
Salival recommended a >=, however upon further thought, this would be irrelevant as this variable is meant to prevent building over a certain height, not at that specific height. Having >= would restrict building at exactly 30 meters for example rather than simply above it. The = sign was also not used in modular_build.sqf
2017-10-08 00:12:19 -05:00
BigEgg
dc3939fce5 Update Change Log 2017-10-08 00:06:18 -05:00
BigEgg
3521447972 Update Change Log 2017-10-08 00:02:49 -05:00
BigEgg
20d2d1f078 Altered variable in configVariables.sqf
Salival recommended that I change the variable name to DZE_BuildHeightLimit.
2017-10-07 23:55:01 -05:00
BigEgg
c00b0ad1af Added build height check to modular_build.sqf 2017-10-07 23:53:20 -05:00
BigEgg
ac72c00687 Added build height check to dze_buildChecks.sqf 2017-10-07 23:45:27 -05:00
BigEgg
820d8bdf2b Update stringtable.xml 2017-10-07 23:42:00 -05:00
BigEgg
730dcb88a2 Add DZE_HeightLimit to configVariables.sqf 2017-10-07 23:14:30 -05:00
icomrade
67ebb65081 Merge pull request #1987 from oiad/patch-1
Alter DZE_SafeZonePosCheck to allow custom radii
2017-10-05 09:58:03 -04:00
oiad
6f7f1c7f93 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:30:48 +13:00
oiad
c1c0db9b95 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:29:58 +13:00
oiad
2a5dab6d89 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:28:59 +13:00
oiad
b318ee5c8b Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:27:58 +13:00
oiad
0aafb1d827 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:27:09 +13:00
oiad
1f1e96b8fe Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:25:31 +13:00
icomrade
e079381931 move deleteVehicle to server 2017-09-26 16:18:47 -04:00
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