Commit Graph

544 Commits

Author SHA1 Message Date
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:

44bb49e326
2017-12-04 18:14:48 -05:00
ebayShopper
b39a15cdd7 Update vanilla building
Vanilla commit:

ad0d514118
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:

33d4165e64

6674be6d5f

f4d18a6fef
2017-11-25 14:52:06 -05:00
ebayShopper
4ea3f36830 Update PVDZ_sec_atp logs
This reverts commit 7b287a2

Vanilla commit:

a81dd8164c
2017-11-21 15:05:07 -05:00
ebayShopper
4b4bdbbc29 Update vanilla player_breakin.sqf
Vanilla commits:

63aaf07a30

b074e7d847

fb3f69a69a

416cc5dcf1

b6c0dd5849

39a3d45965
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:

809de6a0a3

93c128085a
2017-06-10 13:06:16 -04:00
ebayShopper
abdb3e0e42 Fix survival time not counted after clothes change
Vanilla commits:

cf4fde6335

74dd04616f
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:
f99a3deced
731b957e8e

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:

ef236938c1
2017-04-14 11:26:23 -04:00
ebayShopper
9fc72a8b87 Change dayz_survived to actual play time
Vanilla commits:

18eaecb19f

b76b1200ca

78ea61e334

8309427f0d

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:

98784aae79
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:

f8c88502e8

98af0ed8b9
2017-03-20 16:46:11 -04:00
ebayShopper
e38f47375c Fix some issues with traps
Removed two unused files.

Vanilla commits:

42e72463a3

02726fb192

6a7c53ebcf

1fb6308995

9543ea057f
2017-03-20 15:53:35 -04:00
ebayShopper
100f9f5da8 Fix unable to chop down POI trees
Vanilla commit:

0bc12e21b0
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:

6479708205
2017-03-05 12:17:09 -05:00
ebayShopper
9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

78b608c854
2017-03-05 09:59:11 -05:00
ebayShopper
9434d43561 Fix undefined error fnc_spawnObjects
My mistake from 26c1bd9
2017-03-01 13:42:21 -05:00
ebayShopper
61630e91b3 Update scripts.txt exceptions
- Removed some unneeded exceptions
- Moved tree chop PVEH to server compile only so client does not need
setdamage exception
- Replaced "showCommandingMenu" filter with stricter
"menu" filter
- Renamed two files with no changes for easier filtering of
"menu"

Vanilla
commits:
1d639b557b
3a29242537
5cdf249ea9
2017-02-28 18:26:37 -05:00
ebayShopper
d416ae80ab Move study body back to fn_selfActions
Adding UserActions to players (CAManBase) is not efficient, because the
condition evaluates onEachFrame when you are "inside" that vehicle type.
Also admins usually want to add more custom actions to dead bodies
anyway.
https://community.bistudio.com/wiki/addAction#Syntax

This partially reverts 3aad4b6.
2017-02-21 15:12:41 -05:00
ebayShopper
74ce95d4b1 Comment unused vanilla PVEHs
Vanilla commit:

69002014b2
2017-02-20 13:28:19 -05:00
ebayShopper
27bca9a7d9 Update vanilla presets
Vanilla commit:

8574fd898d
2017-02-19 18:56:52 -05:00
ebayShopper
952beed531 Tag map markers with player names #1871
closes #1871
2017-02-11 17:15:49 -05:00