Commit Graph

2980 Commits

Author SHA1 Message Date
icomrade
c746d98853 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-27 20:55:13 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
dbd84e419b Use spawn for dynamicText kill feed
My mistake from 9b13bd0
2016-09-27 20:54:38 -04:00
ebaydayz
15b05dc84b Fix return change free space check when buying into vehicle
This fixes incorrect return of "not enough space to accept change" when
purchasing large quantities of magazines into a vehicle.

Thanks @oiad for noticing this.
2016-09-27 19:09:54 -04:00
ebaydayz
a2fcb69579 Remove scheduler_corpse setPosATL
Vanilla commit:

b4b54b51cc
2016-09-27 17:20:24 -04:00
ebaydayz
f15db73072 Update vanilla player_build
Vanilla commits:

f1e12509e1

ce98e0b1d5
2016-09-27 17:15:43 -04:00
ebaydayz
79c6d605a5 Add back playMoveNow in fn_unconscious.sqf
Partially reverting 341d45f

See comment on 341d45f
2016-09-27 16:50:59 -04:00
ebaydayz
cc28d43d25 Remove unit's local event handler anticheat check
The createUnit remote execution locality exploit was fixed in current
A2OA stable patch 131129:
https://forums.bistudio.com/topic/186695-a2a2oa-patch-18122015/

This is now unnecessary and would needlessly restrict modders.
2016-09-27 16:04:14 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
icomrade
58e90da07d Fix transfusion in vehicle 2016-09-27 12:46:13 -04:00
icomrade
8c3fe83a87 Better UID Calculation + Longer ObjectUID Column
Don't even bother using vector in the key calculation, the sqf ObjectUID
isn't as critical anymore. This method will be much faster.

Changed ObjectUID column to Varchar since with this key generation
method we can approach the BigINT ceiling much quicker than we used to.
2016-09-26 16:34:26 -04:00
icomrade
514ac67650 Better OnPause 2016-09-25 20:31:38 -04:00
oiad
c02053176d Advanced trading bugfix, Snap building typo and snap point fixes
Fixes a bug with advanced trading green "you have this item" text in
buyables list, this was showing you had the item when you didn't.
Snap building typo
Snap building snap points for large cinder walls as reported by
@SmokeyBR
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-248021073
2016-09-24 18:53:02 +12:00
icomrade
40d419e475 Re-add abort timeout
Timeout is no longer restarted when you click abort and the loop now
closes the gear menu so the player cannot attempt to dupe with the gear
menu and abort menu open at the same time.
2016-09-23 19:10:39 -04:00
icomrade
770378b3af Private array 2016-09-23 17:22:57 -04:00
icomrade
cabf978fe7 Modify linebreaks in stringtable for parsetext 2016-09-23 16:59:17 -04:00
icomrade
e8006a40af Non-blocked messages
Displays at the bottom center of the screen. This now accepts formated
(structured) text, see https://community.bistudio.com/wiki/parseText for
more info
2016-09-23 14:02:31 -04:00
ebaydayz
c1763171db Fix damage on local trader city objects
This fixes local trader city objects taking damage from being run over.
2016-09-23 12:08:51 -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
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
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
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
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
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