W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-06-28 20:51:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,194 Commits 20 Branches 18 Tags
8b3f28dc0c92830af2e7459fd3da6928fa8242a1
Commit Graph

934 Commits

Author SHA1 Message Date
ebayShopper 8b3f28dc0c Update player_sharpen.sqf 
Fixes extra knife being deleted if player already had a fully sharpened
knife on their toolbelt (duplicate weapon).

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0332fcbe711b657723704fc9a4d5fd8f66f52b77
 2017-03-20 18:18:04 -04:00
ebayShopper d4eb7ac6e4 Block bypassing unconscious wake up animation with bandage 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/698eacba79db042a201e9aa1bd57a22e5275148a
 2017-03-20 18:01:30 -04: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 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 bca17aa2d6 Fix forcesave check 
thanks @eraser1
 2017-03-14 14:51:22 -04:00
oiad 2ec5390b70 Standardize coin variables, prevent coins not refreshing on skin change. (#1904) 
* Standardize coin variables, prevent coins not refreshing on skin change.

* Add missing commit
 2017-03-11 13:05:34 -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 2032094fb4 Fix undefined groupTags error 
My mistake from 6736cd9
 2017-03-01 11:24:09 -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:
https://github.com/DayZMod/DayZ/commit/1d639b557b1b2a57399c113184e17992d678ef7b
https://github.com/DayZMod/DayZ/commit/3a29242537439b866388aeeb63574692d6e9677e
https://github.com/DayZMod/Battleye-Filters/commit/5cdf249ea979649246730e7e823a6d5f976d4157
 2017-02-28 18:26:37 -05:00
ebayShopper 122d9e16f7 Update player_packTent again 2017-02-26 16:43:33 -05:00
ebayShopper 0eaa995d27 Fix action in progress message in player_packTent 2017-02-26 14:03:39 -05:00
ebayShopper d12fda5e21 Add a few missing playerIsNear checks 
Blocks duping method reported by Sercan and confirmed with @oiad .
Thanks
 2017-02-25 17:29:27 -05:00
oiad 33fd92db67 Extend epoch_tempKeys to be able to read from backpack as well. (#1897) 
* Extend epoch_tempKeys to be able to read from backpack as well.

* Rework
 2017-02-24 16:58:16 -05:00
ebayShopper 6736cd92ff Update group tags again 
Also fixed wrong string name "STR_EPOCH_RADIO_CONTACT_LOST" thanks @oiad
 2017-02-24 14:11:55 -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 9e0c251baf Update vanilla building again 
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/e4144e561f50e4b50f0ec5a9c1203233c66b0f27
 2017-02-19 18:44:47 -05:00
ebayShopper fdf24d4013 Update vanilla vehicle_getOut again 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/508e73d59c491556a45f1b5defe2163eaac5a6a1

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

https://github.com/DayZMod/DayZ/commit/2078268b67310eb46d52c4eea4917c10723e9ea0
 2017-02-19 16:54:59 -05:00
ebayShopper 6e846847de Only run group tags loop when in a group 2017-02-13 14:27:49 -05:00
oiad e8dd8fac63 Stop server_publishVehicle3 duping a vehicle if hive fails to update (#1895) 
* Stop server_publishVehicle3 duping a vehicle if hive fails to update

server_publishVehicle3 first creates the vehicle in the database then
reads it back to see if it's successful, previously it wasn't deleting
the vehicle if it failed.

Added a 1 second delay after the vehicle delete to stop duping of
vehicles also.

Fixed references to server_deleteObj that were using 2 parameters
instead of the required 3 and updated the example.

* Rework
 2017-02-13 14:09:21 -05:00
ebayShopper 2ef93e6c57 Fix panic sound chance from fbc56ff #1861 
Previously was ~8% chance every 1 second, so ~72% chance to play once or
more every 9 seconds.

Now it is a 50% chance to play once every 9 seconds.
 2017-02-12 16:04:48 -05:00
ebayShopper fbc56ff556 Fix panic sound overlapping #1861 2017-02-12 15:08:37 -05:00
ebayShopper 952beed531 Tag map markers with player names #1871 
closes #1871
 2017-02-11 17:15:49 -05:00
ebaydayz 18191b0e3a Use effectiveCommander for humanity hit 2017-02-05 16:30:32 -05:00
ebaydayz 76971cbaf4 Prevent sprint and prone through doors glitch 2017-02-02 16:57:30 -05:00
ebaydayz 59b1d1ea60 Update vanilla building 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/8fdd0e915a2386eef35d6f1d5d9c81b3d640646c

https://github.com/DayZMod/DayZ/commit/6afd0bc103b7462e83ea4d94c240a6fb23cb2a59
 2017-02-02 15:28:39 -05:00
ebaydayz b0ba29440d Update vanilla vehicle_getOut 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/492ba6d33aec4acd88e0e81e40cece6f6a261cca
 2017-02-02 14:58:47 -05:00
ebaydayz 097a02b19a Make zombie_agent.fsm customizable for admins #1877 
Also fixed HandleDamage EH was added twice. We moved it to the configs
and forgot to take it out of the FSM in 6853263.
 2017-02-01 20:36:00 -05:00
ebaydayz 6aa5c9b64f Add setting to disable base takeover #1886 
No classes inherit from Generator_DZ, so there is no need to use
isKindOf over typeOf.
 2017-02-01 12:16:16 -05:00
ebaydayz 9afb74ff26 Remove plot take ownership feature #1811 
See #1811
 2017-01-31 15:22:23 -05:00
ebaydayz 05f1cf9fe0 Use nearObjects instead of nearestObjects for spawn check #1816 
Lowered spawn check radius for loot and zombies to the same as 1051.
(200m)
 2017-01-30 15:45:14 -05:00
ebaydayz 2ecb614534 Update comments for POI spawning 
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/0defa2af1ec0a9a46d15a665eb25f6be604a0a07
 2017-01-29 20:14:43 -05:00
ebaydayz 8c1caa9c1c Remove some redundant checks 
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/da55eaa53e2a9bda3a30733785b2e0f5b540bb53
 2017-01-29 19:36:48 -05:00
ebaydayz cfd0f74870 Send damage selection normally for RPT log c10a7c3 2017-01-29 12:02:27 -05:00
ebaydayz 611fd73bbd Shorten some isKindOf checks 2017-01-28 21:04:26 -05:00
ebaydayz 9270050bc6 Update damage handler again 
This fixes hits from players shooting from vehicle weapons not showning
in server RPT.
 2017-01-28 20:38:35 -05:00
ebaydayz c10a7c3bc9 Update damage handler 
- Added damage and selection to server RPT hit log
- Increased damage a bit for RunOver due to consistently low damage in
testing
 2017-01-28 16:08:56 -05:00
ebaydayz d30b7b5ffc Prevent queuing multiple vehicle upgrades 2017-01-27 20:23:36 -05:00
ebaydayz 028924770f Increase headshot damage for non-zombie hits 
A single headshot with a DMR from ~500m will now kill instead of doing
~8k blood as it did previously.
 2017-01-27 17:43:29 -05:00
ebaydayz 1bb894b1c9 Add missing private var in player_death 2017-01-27 16:13:58 -05:00
ebaydayz d8ac3f42b1 Remove unnecessary check for upgrade storage 
Fixes desert tent not upgradeable

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/4e886c8c27265e78fec957bccfc9b7badaaf67c9
 2017-01-27 13:17:14 -05:00
ebaydayz c7b71f93f0 Remove fn_upgradeActions 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/02bc22f325ff57c16b25c20b5de6ecb81d29d86c
 2017-01-26 21:19:17 -05:00
ebaydayz 405dd7e519 Disable flies by default and add enableFlies config variable 
Also, when enabled, flies now spawn ten minutes after the player's death
instead of two minutes after as recommended by @oiad .
 2017-01-25 13:05:09 -05:00
ebaydayz 6c62b3f8e4 Rework player_death for respawnDelay=0; #1825 
See #1825
 2017-01-24 15:55:15 -05:00
ebaydayz ff6463473f Update vanilla building 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/2ee56936bec09fbc1fe4bc37f8b0fe0a7894348c

https://github.com/DayZMod/DayZ/commit/8497b42d3f9e406f84cc9a3bd5cf13744108d30a

https://github.com/DayZMod/DayZ/commit/eb234f8b0685ea331ebacf949ff6147ac2bdfdc4
 2017-01-22 14:41:53 -05:00
icomrade fc99604108 Better anim reset in player_death 2017-01-21 22:41:09 -05:00
ebaydayz 4613e0c084 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	CHANGE LOG 1.0.6.1.txt
 2017-01-21 21:46:58 -05:00
ebaydayz 26c1bd9a86 Properly disable town generator and plant spawner loops 
Stops intensive loop from running unnecessarily when dayz_townGenerator
= false; The comfrey plants are pointless atm since the only thing they
may be used for is crafting a sepsis bandage.

Also added waterHoleProxy for Napf and Namalsk placed by @skigoggles

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b5a91250865db7f3bdce7f0d2bfc676be27d7884
 2017-01-21 21:44:43 -05:00
oiad a68e4b273b fix epoch_tempKeys.sqf making massive arrays. (#1884) 
* fix epoch_tempKeys.sqf making massive arrays.

epoch_tempKeys was making a massive array every time it was called due
to them setting the array size to the _ownerKeyId instead of count
_temp_keys_names.

For example: Call this function 10k times in testkit and see it lag the
client due to making a massive array over and over again.

```"[[["9379"],[<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<n
"Test script finished. Code took 0.440002 seconds to run"
```

With fixed code:
```"[[["9379"],["Yellow Key (65d0)"]],false]"
"Test script finished. Code took 0.000991821 seconds to run"
```

* Update fn_selfActions to support fixed epoch_tempKeys fix.

Forgot this from my previous commit, this will select the right key now
for displaying in the unlock_veh.sqf (I broke this with my previous
commit)

* Rework
 2017-01-21 17:01:42 -05:00
ebaydayz d8828d9df1 Fix "AI" text localization again 
This was my mistake from 131329f. SourceName needs to be checked, not
bodyName.
 2017-01-19 17:36:26 -05:00