W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,576 Commits 20 Branches 18 Tags
c4388356e557f9578ea87a9a9218cd5f10b6ae31
Commit Graph

4576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz
c4388356e5 Add setVariable.txt BE exception 2016-09-23 11:18:00 -04:00
ebaydayz
cc03256475 Update purchased vehicle spawn location 
If there was no helipad available findSafePos was called. If that failed
it spawned the vehicle in the debug zone.

Calling findSafePos is no longer necessary since we are now using
createVehicle "NONE".
 2016-09-22 18:12:52 -04:00
icomrade
7f0935c639 add floors to drop array 2016-09-22 15:14:05 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
icomrade
43547c8273 Better key calculation 
append diag_ticktime to key. Max length is 24 characters in the DB so
the limit so this shouldn't cause issues unless the server is up for
hundreds of days.
 2016-09-22 13:26:15 -04:00
ebaydayz
b315c15cb0 Update vanilla chop wood 
Vanilla commit:

1bca531254
 2016-09-21 18:43:23 -04:00
ebaydayz
5e71793c17 Update vanilla building 
Vanilla commits applied:

44f2552ff2

213a333ce5

423d53299d

43bce6554f

f551cdac6e
 2016-09-21 17:14:13 -04:00
ebaydayz
33cf7611ed Don't allow jerry fill from destroyed fuel source 
Vanilla commit:

90251abab3

9204c15d3f
 2016-09-21 16:53:29 -04:00
ebaydayz
ef065aeb35 Fix plot management buildables in range display count 
See #1735
 2016-09-21 15:52:14 -04:00
ebaydayz
f3ccb74eab Also update objects if player is dead in onPlayerDisconnect 
I just noticed before 5f0c2fc this was also running if the player was
dead. Now it will run if the player is alive in playerSync otherwise it
will run here if they are dead.
 2016-09-21 11:41:41 -04:00
icomrade
a60556e8a3 Update SQL 2016-09-21 11:32:20 -04:00
icomrade
c042145081 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-21 11:09:50 -04:00
icomrade
4e946552fd Fix combat logging 
Thanks @ndavalos

@ebaydayz since this was moved after player_sumMedical is called in
5f0c2fcc49
it would no longer save the modified unconcious and timeout vars to the
DB.
 2016-09-21 11:09:03 -04:00
ebaydayz
01b45121d8 Fix dayz_townGeneratorBlacklist not working 
I forgot to update it when these were moved to global spawn recently.
 2016-09-20 20:19:47 -04:00
ebaydayz
e2c2a2a76a Fix 309 error for newly placed safe inventory 
See my comments on ae78fde and a3c3ccc

The object_maintenance function is only for vanilla buildables and is
currently not used. It immediately overwrites with a 306 call.
 2016-09-20 13:47:18 -04:00
ebaydayz
e94a66e9fd Merge pull request #1768 from AirwavesMan/master 
Adding more loot table for zombies
 2016-09-20 12:03:30 -04:00
ebaydayz
ac95c6b0df Make plot and door friends lists backwards compatible 
This prevents errors when upgrading 1051 databases that had plot or door
management installed.

See comments at:

fe9b8fdcb4
 2016-09-19 20:21:27 -04:00
icomrade
b9ec6df95e Revert "Update object management name strings to array format" 
This reverts commit fe9b8fdcb4.
 2016-09-19 19:43:21 -04:00
A Man
7b22d9dd14 New loot tables for zombies 
Adding 3 new  loot tables
 2016-09-20 01:28:42 +02:00
A Man
7ea6e9c7a4 Zombie loot update 
Adding 3 more options for zombie loot to give admins better possibilities to customize the zombie loot.
 2016-09-20 01:27:31 +02:00
A Man
5e3d4c7890 Zombie loot update 2016-09-20 01:25:20 +02:00
icomrade
fe9b8fdcb4 Update object management name strings to array format 2016-09-19 16:34:02 -04:00
ebaydayz
1b7d7a2ecb Clarify benchmark diag_log 2016-09-19 16:23:33 -04:00
ebaydayz
0ab73aa821 Merge pull request #1767 from AirwavesMan/master 
Small loot position update
 2016-09-19 16:13:36 -04:00
A Man
b751ffb278 Small loot position update 
Adding Land_stan to loot positions. It is the same like the Camp. Increasing the high of loot positions to prevent loot from spawning in the ground.
 2016-09-19 21:45:19 +02:00
ebaydayz
13600e9d4c Update 1.8.8 addons link again 2016-09-19 15:39:56 -04:00
icomrade
a30ae01af3 Add SQL Update for Coins in Inventory Column 2016-09-19 15:38:34 -04:00
ebaydayz
df70d1f4a3 Clarify comment about grass 2016-09-19 15:34:40 -04:00
icomrade
c97015fb9a Re-add removal of fuel tanks and engine 
Thanks for the tip on fuel tanks @SmokeyBR
 2016-09-19 14:11:45 -04:00
icomrade
91e5e875c2 Force save after building and maintain 2016-09-19 13:48:27 -04:00
icomrade
5f33fd3ef5 Fix R3F Tired 2016-09-19 13:39:58 -04:00
icomrade
37a717fe3f Fix generator gear display and Offroad hud 
using generator as a tent should have no adverse effects.

Thanks @SmokeyBR
 2016-09-19 12:08:25 -04:00
ebaydayz
cb6a985645 Update change log 
Fixed several typos. Updated outdated info.
Removed the [FIXED] line for DarkUI because that UI was not present in
1051.
 2016-09-18 17:49:46 -04:00
ebaydayz
61f38fc259 Use number instead of string for weapon slot type in configs 
This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
 2016-09-18 14:58:35 -04:00
icomrade
9ec514cab1 Update Test Build to RC2 
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766
 2016-09-18 09:48:01 -04:00
ebaydayz
708328e486 Avoid gear update for empty random vehicles 
There is no need to update the inventory if no loot was added.

My mistake from d98025c
 2016-09-17 19:07:08 -04:00
ebaydayz
d0e7b26121 Fix wrong distance in relocate diag_log 
My mistake from 9c2f151
 2016-09-17 18:15:16 -04:00
ebaydayz
3d0c5b13cf Fix playerSync error from 5f0c2fc 
@icomrade There are cases where playerSync will receive > 3 params if
achievements are passed. Example:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/system/player_spawn_2.sqf#L305
 2016-09-17 17:43:41 -04:00
ebaydayz
29d9ed9211 Set unit posATL in switchModel if respawn is in water 
Reverts:

bcc16a0135

See:

e8e5d24e80
 2016-09-17 15:41:49 -04:00
ebaydayz
5f0c2fcc49 Speed up onPlayerDisconnect some more 
Moved combat log setVariables to playerSync. Now the player object is no
longer needed for any of the code at the bottom of playerSync or
onPlayerDisconnected.

Update objects is already performed at the bottom of playerSync. There
is no reason to do it again in playerDisconnect since it calls
playerSync.
 2016-09-17 15:02:00 -04:00
ebaydayz
da70306291 Speed up playerSync a little 
Removed unused variables and redundant checks.

_Force was always true so any condition with an OR _force in it was the
same as (true) i.e. redundant.
 2016-09-17 14:03:05 -04:00
ebaydayz
9c2f15159a Correct Air relocate in server_playerSync 
@icomrade you forgot to change the _playerObj variable to _character
when you moved this.

Also if BIS_fnc_findSafePos was successful on the first attempt the way
you had it would use the original _charPos instead of the successful
return because you never set _charPos = _newPos;

ed3227fa7a
 2016-09-17 13:07:27 -04:00
ebaydayz
bc4cb49463 Remove redundant characterID check in server_playerSync 
I made no changes apart from removing the (_characterID != "0") check
and the corresponding spacing/tabs.

If _characterID == "0" the script would have already exited on line 30.
 2016-09-17 12:18:54 -04:00
ebaydayz
a63da4606d Speed up onPlayerDisconnect a little 
Removed redundant diag_log since it is already done in dayz_recordLogin.

Removed noatlf4 variable because we use inCombat instead. Noatlf4 is
only set if the player is hit in the damage handler, while inCombat is
set any time the player is in combat.
 2016-09-17 12:05:32 -04:00
ebaydayz
b9507b2eb4 Don't hideObject on debug floor 
e8e5d24e80 (commitcomment-19060242)
 2016-09-16 17:17:02 -04:00
ebaydayz
bcc16a0135 Roll back to old swimming in ground fix 
See
e8e5d24e80 (commitcomment-19053648)
comments
 2016-09-16 13:26:27 -04:00
ebaydayz
b4ad50bf8f Add comment about grass height 2016-09-16 12:27:32 -04:00
ebaydayz
0ab46abd52 Don't spawn epoch dynamic debris if town generator is on 
Vanilla town generator debris can end up spawning inside of epoch
dynamic debris if both are enabled.
 2016-09-15 17:07:11 -04:00
ebaydayz
6e57bc6f6f Revert fix invisible primary stance glitch 
Partial revert from:

e8e5d24e80

Can't seem to reproduce this one now with this commit reverted. If
anyone has working repro steps let me know.
 2016-09-15 16:49:19 -04:00
ebaydayz
7415c21c2b Small update to object_build 
Vanilla commit:

a10173443b
 2016-09-15 12:48:31 -04:00