Commit Graph

700 Commits

Author SHA1 Message Date
ebayShopper 42e519a92e Remove bush b_corylus.p3d from tree list
Vanilla commit:
https://github.com/DayZMod/DayZ/commit/f2bafae2ff05e8cb98473d02aff3d40ffb4c53c1
2018-01-17 16:55:59 -05:00
ebayShopper 6caba339c9 Update change log
Minor improvement to b791dee and 6248add
2018-01-11 15:41:13 -05:00
ebayShopper 2855997c86 Disable POI fires when POIs are off
Vanilla commit:
https://github.com/DayZMod/DayZ/commit/ebad05fe5b32db900542d7c1c499d5a489fcebdc
2018-01-10 15:35:38 -05:00
oiad 141b25e204 Update DZE_SafeZonePosCheck with missing operator
I possibly just need a little more sleep and a little less epoch time
2017-12-30 23:07:36 +13:00
oiad 6248addc3f Make Safe Zone Zombie and Loot spawning a toggle
As requested by a few admins that didn't realise it was now hard coded
to disable loot/zombie spawning
This requires the check since we're also using DZE_SafeZonePosCheck for
DZE_buildChecks with a forced radius.
2017-12-30 22:03:31 +13:00
ebayShopper 694ea87d0d Update scripts.txt
- Updated exceptions, added new filters and removed some which were not
useful
- Removed exceptions for testkit because it is not part of the mod
- Added notes to clarify for now, will move this info to BI wiki later
- Removed two unused files
2017-12-26 00:55:10 -05:00
oiad 91669fae74 Fix Overwatch G3 glitch for combining
Fix
https://github.com/EpochModTeam/DayZ-Epoch/issues/1995#issuecomment-348188066
2017-12-26 11:58:36 +13:00
ebayShopper 2c83f2dfe4 Fix autorun freeze when spamming key 2017-12-21 13:23:23 -05:00
ebayShopper 894dafe4f5 Update change log 2017-12-10 16:47:24 -05:00
ebayShopper 5e9a7271e9 Add option to toggle status icons
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/44bb49e3260fb2d67bb66a8c55361a837bda74a3
2017-12-04 18:14:48 -05:00
ebayShopper b39a15cdd7 Update vanilla building
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ad0d5141180043e1ff7ca89f4168cf3df96095e3
2017-12-04 13:49:12 -05:00
ebayShopper fa0dfd4c47 Define fn_addCargo on server
Needed to define on both in 2f178d8 @oiad
2017-12-01 13:47:34 -05:00
ebayShopper ac10daeb4d Update humanity morphing
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/33d4165e64fde04bf43628069e2d006b45548b38

https://github.com/DayZMod/DayZ/commit/6674be6d5faabc37699142d93e20e08527dda0c3

https://github.com/DayZMod/DayZ/commit/f4d18a6fefd231cef88d39e5b91e4827e09a7a28
2017-11-25 14:52:06 -05:00
ebayShopper 4ea3f36830 Update PVDZ_sec_atp logs
This reverts commit 7b287a2

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a81dd8164c2029221fc4924817615191032b1fa8
2017-11-21 15:05:07 -05:00
ebayShopper 4b4bdbbc29 Update vanilla player_breakin.sqf
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/63aaf07a30803c3d72bdc252b87c3ed974e5e740

https://github.com/DayZMod/DayZ/commit/b074e7d8471b5fde7b20ddc7259c30a40d660f4a

https://github.com/DayZMod/DayZ/commit/fb3f69a69a0ad528f2b85e9dfbb1c47eb52dafdc

https://github.com/DayZMod/DayZ/commit/416cc5dcf186f7d37f82a5198f86cbf048679f16

https://github.com/DayZMod/DayZ/commit/b6c0dd58494d27a425fda58b3a1148fc935c4df1

https://github.com/DayZMod/DayZ/commit/39a3d45965fba93fde635bc6429eb69fd1ab545d
2017-11-20 13:57:19 -05:00
oiad 9b96ddd2c3 Consolidate ItemKeyXXX/Colors to arrays.
Tidies up scripts inside epoch and for script creators.
Moved z_at_buyItems to epoch_generateKey.
2017-11-19 11:27:02 +13:00
oiad 2f178d8978 Consolidate weapon/magazine/backpack adding to function
This moves a lot of duplicated code from a server side only function
(server_addCargo) to a client/server function called fn_addCargo.
2017-11-19 11:06:00 +13:00
ebayShopper 9574aca91e Change publishVeh2 and 3 to call instead of spawn
Following 95b3174 it is now possible to use call to avoid suspension mid
execution as described in:

https://epochmod.com/forum/topic/43805-epoch-shed_safetyvehiclesqf-issue/?tab=comments#comment-292696
2017-11-11 15:59:23 -05:00
ebayShopper 0fadd1e5fc Slightly speed up a switch model check
Check once instead of twice
2017-11-10 12:03:05 -05:00
ebayShopper 42e00475d6 Add sender verification to publish and swap object
Continuation of 8035df0

This is important to have on publish to identify cheaters who spam
create objects in the database or create objects with bad inventory.

- Renamed variables to backport to vanilla
- Removed % and & due to code filtering in publicvariableval.txt

Changes in modular_build.sqf were the same as player_build.sqf.

Tested with building, upgrading buildable/vehicle/tent, downgrading,
buying a vehicle, destroying tent and removing an object.
2017-11-03 16:09:14 -04:00
ebayShopper 780d5d8775 Fix force save when pressing F4
Forgot to remove F4 from the blocked list in 5acad04 @icomrade so it was
being overwritten.

Shift + P is not a hardcoded engine bind. It is just the default
DSInterface bind, so actionKeys "DSInterface" covers that in f760896.
2017-10-28 18:34:37 -04:00
oiad 1f1e96b8fe Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:25:31 +13:00
icomrade d750f576ed Prevent Zed + loot spawn in safezones
thanks BaroN for the idea
2017-09-13 12:45:00 -04:00
ebayShopper 7a68f9f70b Add some basic compatibility for Ruegen map 2017-07-30 16:28:37 -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
icomrade 73926b8785 prevent logout with d/c #1938
Should work to prevent the issue described in #1938 by disabling the abort option, causing the player to alt + F4 if they want to log out without reconnecting. which results in the gear pile/weaponholder from not being created.
2017-07-26 12:39:37 -04:00
ebayShopper e0d271671a Remove unused crafting recipes
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/809de6a0a3a968f23b9ef35cc0f051de705094a4

https://github.com/DayZMod/DayZ/commit/93c128085a066932c4070a8070e786ddd5a5401f
2017-06-10 13:06:16 -04:00
ebayShopper abdb3e0e42 Fix survival time not counted after clothes change
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/cf4fde633539a6980f3ca4297cd37c558d4fca03

https://github.com/DayZMod/DayZ/commit/74dd04616f81f580057927bad37be98156a7b123
2017-06-10 10:07:19 -04:00
ebayShopper 72df07bdf2 Remove medic animation from lock and unlock safe
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
2017-06-06 18:53:44 -04:00
ebayShopper 48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
https://github.com/DayZMod/DayZ/commit/f99a3deced4f4314c4b9a26c1c822e5c5d7f90eb
https://github.com/DayZMod/DayZ/commit/731b957e8e1c3f1bb08474fb397af6165e48a8df

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
ebayShopper 78fbd7ac53 Remove some unnecessary translations
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
2017-04-15 14:19:26 -04:00
ebayShopper e99792d0f4 Update jerry_fill.sqf
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef236938c1531e9d7ba8865fdd09bdf006adc979
2017-04-14 11:26:23 -04:00
ebayShopper 9fc72a8b87 Change dayz_survived to actual play time
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/18eaecb19fc1ea26f5769fccd920824bf843e19b

https://github.com/DayZMod/DayZ/commit/b76b1200cabac8661a0628489a128a561f1f379c

https://github.com/DayZMod/DayZ/commit/78ea61e3345e197e9350910b5808d85ef56f7f11

https://github.com/DayZMod/DayZ/commit/8309427f0dc3f7e5a6acd1d5ec1d155cbe11aec5

Should be ready for Hive update @icomrade . If you upload it to a test
folder I'll test it.
2017-04-13 18:35:28 -04:00
ebayShopper 496681cd9b Add support for harvesting added plants
Closes #1928
2017-04-04 13:32:06 -04:00
oiad 088945e074 Remove public variable event handler when using config traders. (#1930)
* Remove public variable event handler when using config traders.

This stops the public variable event handler from being loaded when
you're using config based traders, it's not needed in this situation

* Change nearestObjects to nearEntities in z_checkCloseVehicle.sqf

* Fixes vehicle selling not able to sell correctly

If more than 1 vehicle of the same classname was in a trader and the
local vehicle was further away it would not be able to be sold till
moved closer. We are using DZE_myVehicle for everything and we do
previous checks to make sure it's not null and local so we can assume it
is okay to use.

Fixes
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/#comment-290036
2017-04-01 13:02:51 -04:00
ebayShopper b3fdd26d3b Update fn_damageHandler.sqf
Continuation of 50ba58f

Also removed some unused variables
2017-03-30 17:26:25 -04:00
ebayShopper 746b921321 Use nearEntities for plot pole searches
Also made 73899d5 compatible with DZE_permanentPlot = false; at the
request of @oiad
2017-03-29 16:04:48 -04:00
icomrade 35556adbfb Merge pull request #1918 from oiad/master
Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
2017-03-28 08:53:14 -07:00
icomrade 12abbfa686 Should fix #1926 2017-03-27 23:53:08 -04:00
ebayShopper 50ba58f5ae Fix death message showing RunOver when it shouldn't 2017-03-25 20:05:36 -04:00
ebayShopper 6a711deccc Add reliable workaround for swimming in ground and air issue
Fixes #1913
2017-03-23 15:58:14 -04:00
oiad 73899d520f Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
This adds DZE_limitPlots where admins can restrict a player to only
having 1 plot pole. Disabled by default.
2017-03-23 22:39:22 +13:00
ebayShopper 93d6c85dbc Skip gear sound in player_forceSave
Don't play sound when gear flashes open momentarily for force save and
backpack mag ammo count.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/98784aae797cc50978ad848b8ee9b4f70aad231f
2017-03-20 17:26:41 -04:00
ebayShopper 8d545d14a1 Fix dayz_lastSave variable again
Continuation of bca17aa.

This variable is set in player_forceSave and uses diag_tickTime.

Vanilla commits:

https://github.com/DayZMod/DayZ/commit/f8c88502e85ba9b2070d313b8d25a6e2a6fb8332

https://github.com/DayZMod/DayZ/commit/98af0ed8b936ea112de563f282f8177c8c1fb4cc
2017-03-20 16:46:11 -04:00
ebayShopper e38f47375c Fix some issues with traps
Removed two unused files.

Vanilla commits:

https://github.com/DayZMod/DayZ/commit/42e72463a3f3722ad974d50a093b4f57edbf8c00

https://github.com/DayZMod/DayZ/commit/02726fb1923a7354121796a0e306a8ca92cdc42f

https://github.com/DayZMod/DayZ/commit/6a7c53ebcf48f6e552bf4d5bb65be07792a0cd92

https://github.com/DayZMod/DayZ/commit/1fb6308995584472b0494a54d211dc5b216bfd98

https://github.com/DayZMod/DayZ/commit/9543ea057f97ba6f1105f6abecaa04e1fe5d4457
2017-03-20 15:53:35 -04:00
ebayShopper 100f9f5da8 Fix unable to chop down POI trees
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0bc12e21b0b6c103f6c7631310788e14ec96b8d8
2017-03-20 14:58:49 -04:00
icomrade 7a6c6df33b re-add config for nutrition 2017-03-08 13:57:00 -05:00
ebayShopper da34b688d2 Fix hunger and thirst "working" hits way too high
By default this was multiplying all "Working" hunger and thirst hits by
10 @icomrade  because (1 min 0.1) always picks 0.1. For example:
dayz_thirst = dayz_thirst + (5 / 0.1)
dayz_thirst = dayz_thirst + 50

A config variable isn't really needed for this, since it is only used in
one file. It can be easily configured in compiles.sqf which most servers
already overwrite anyway.

This reverts 62b7c21.
2017-03-08 13:08:46 -05:00
ebayShopper 92b09aa530 Remove some unused variables
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/6479708205bccbb4bdd1379a53d9aeed5613f08a
2017-03-05 12:17:09 -05:00
ebayShopper 9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/78b608c854b90640ca1d46ae6c2708b525bc55e0
2017-03-05 09:59:11 -05:00