W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-06-13 21:31:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,900 Commits 20 Branches 18 Tags
3a7f1bd90cd959aa120aaada6155e3778b2b5056
Commit Graph

4099 Commits

Author SHA1 Message Date
icomrade b48a0ae2cf Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-01-21 22:41:12 -05:00
icomrade fc99604108 Better anim reset in player_death 2017-01-21 22:41:09 -05:00
ebaydayz 94f342e7b6 Fix typo from 26c1bd9 2017-01-21 22:36:37 -05:00
ebaydayz 295302d9cb Fix undefined error when dayz_bleedingeffect = 1; #1885 2017-01-21 22:00:30 -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 cc3b8801b7 Update zombie event handlers again 2017-01-20 14:27:55 -05:00
icomrade c15caf5f8f Improve BIS_Effects fix #1883 
Now stops particle effects loops when wreck is deleted.

Exucuted in an EH, so it should resolve any issue where the corepatch
fix version, or broken A2 version takes priority.

Minor script formating and performance improvements
 2017-01-20 11:51:55 -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
ebaydayz 194bad12ea Remove some more unused variables 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/68ffe8b1582de007f5392b137634e2aa82247d75
 2017-01-19 12:27:36 -05:00
A Man e009aee8de Update stringtable.xml (#1882) 
* Update stringtable.xml

* Move new safe zone strings down to epoch package
 2017-01-18 19:06:32 -05:00
ebaydayz 6d45ecfcac Fix group dialog button scaling again 2017-01-18 17:10:56 -05:00
icomrade 490fb90303 Disallow salvage in DZE_SafeZonePosArray locations 
by request of JohnnyBravo666 on the epoch forums
 2017-01-18 16:43:23 -05:00
ebaydayz 0d2f96b299 Revert lobby and player list background colors to A2OA default 
Partial reverts of my changes in 6732e5c and e0c0669

It requires too many changes to make the whole A2OA UI match.
 2017-01-17 16:00:49 -05:00
ebaydayz 92ee58900c Fix trader menu server RPT logs partially localized on client 2017-01-17 14:39:31 -05:00
oiad ef5ca5c532 Fix handleSafeGear not showing the failed code correctly (#1880) 
Was displaying failed code as the actual code (obviously wrong)
 2017-01-17 11:58:31 -05:00
ebaydayz 9985f0adbd Fix Bandit1 and Bandit2 skins identical #1874 
Fixes #1874
 2017-01-16 20:27:15 -05:00
ebaydayz 13aaaa5b9a Remove NV cooldown for player zombies #1876 2017-01-16 19:03:49 -05:00
ebaydayz 0b0f2d3455 Update calls to zombie_agent.fsm #1877 
Forgot to update in 6853263

Fixes #1877
 2017-01-16 18:34:47 -05:00
ebaydayz 198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
oiad d68717c7be Fix handleSafeGear not showing eyescan as it should. (#1875) 
This fix makes it so that if the player used Eye Scan it will properly
show eyescan instead of the code.
 2017-01-14 19:53:51 -05:00
oiad fd0b81118b Move dze_supplyCrate and vein wrecks to CfgLoot (#1863) 
* Move dze_supplyCrate and vein wrecks to CfgLoot

Moves both the supply crates and vein wrecks to the CfgLoot tables so
admins can customize.
Also modifies the main add item statement to allow support for weapons,
magazines and backpack refunding/spawning instead of hard coded
magazines.

Should be backwards compatible with the old style (I did test).

* Remove unused _activatingPlayer variable

* Rework
 2017-01-14 19:40:54 -05:00
icomrade 798a994b02 Should fix full cinder vector #1846 2017-01-14 17:55:56 -05:00
icomrade f891797a0d Add full screen NVG 
looking through a pinhole gets old
 2017-01-12 15:00:29 -05:00
icomrade 9c81d727e3 Remove IR Laser from DZ L110A1 - Fix #1873 
Thanks @DeVloek
 2017-01-12 13:34:29 -05:00
ebaydayz 0d2f91f3aa Fix trader menu server RPT log partially localized on client 2017-01-11 16:12:17 -05:00
ebaydayz f25f5e96a6 Fix light fire and build fireplace over water #1866 
Fixes #1866
 2017-01-11 15:25:29 -05:00
ebaydayz b9d8b5798c Hide group icons for units inside the player's vehicle #1865 
Fixes #1865
 2017-01-10 14:32:04 -05:00
ebaydayz 131329fd59 Fix "AI" text localized on wrong client in death message #1867 
Fixes #1867
 2017-01-10 13:38:00 -05:00
ebaydayz 5c8ae96887 Add military flashlight attachments 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b6ba294b70a97adc571f6a8a6416d796053451f5
 2017-01-09 20:19:01 -05:00
ebaydayz 076bd22bfe Update vanilla fence_handleDam.sqf 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef243327b5ada720601867ece968ec02a580260f
 2017-01-09 17:34:58 -05:00
ebaydayz 9d28504ecf Remove comment in player_wearClothes.sqf 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/72b37dc108fa8af90bc44e5a52065374951a3372
 2017-01-09 17:22:41 -05:00
ebaydayz 7857272d82 Add loot pos for some more sahrani and tavi building types 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/578e0f5c0a5cc984e14124bb5efac0b3e41b9e18

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

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

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

https://github.com/DayZMod/DayZ/commit/56d0ab54cbe78afea38b938d76c7b01a74c4ad66

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

Added some new building types. No existing buildings were removed or
changed, just moved around to sync order.
 2017-01-09 17:01:13 -05:00
ebaydayz e4d48cbf38 Revert pain effect to pre-1.8 version #1839 
Same as 1051

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/9b6d3dcd9c97671c26c2e5f5183afc57f08514a3
 2017-01-07 16:51:48 -05:00
ebaydayz 503206cad8 Update version numbers 2017-01-07 15:39:11 -05:00
ebaydayz fa89487f22 Revert pain effect to original #1839 2017-01-07 14:09:52 -05:00
icomrade 0c4d77d2aa Fix running corpses 2017-01-07 11:39:18 -05:00
icomrade 70948ad0a2 Fix unconcious input lock #1860 
due to disableUserInput being a POS
 2017-01-07 11:25:57 -05:00
ebaydayz 80def55420 Show respawn from player zombie or broken legs as suicide 2017-01-06 19:30:05 -05:00
ebaydayz ad556aa0cb Remove two hardcoded Chernarus checks 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/c8455bb718733aa89633c69fee0dd8a6a901d87e
 2017-01-06 17:58:13 -05:00
ebaydayz 58025f591f Fix certain buildables not removable #1859 2017-01-06 16:18:59 -05:00
ebaydayz 571e8d7b11 Add LightPole_DZ to DZE_isRemovable #1859 2017-01-06 15:53:38 -05:00
ebaydayz 33672d99ee Lower or remove nutrition hit for some actions #1857 
Fixes #1857
 2017-01-06 13:27:22 -05:00
ebaydayz 3a7744d18d Add back 1051 handling of RepairParts not listed in config 2017-01-06 12:36:08 -05:00
oiad c5deead4fd Allow merlin_hc3 to be repaired properly (#1858) 
The merlin has 20 windows + 2 side windows, glass 7 - 20 were showing up
as PartGeneric and breaking the repair script for some reason.

https://github.com/EpochModTeam/DayZ-Epoch/issues/1856#issue-199105821
 2017-01-06 11:18:55 -05:00
ebaydayz e074ef0d44 Fix rapid starvation and dehydration from chainsaw and chop wood 
Chainsaw is never used in player_chopWood.sqf. It is only called via
right click on Hatchet which was removed anyway.

The player already takes a nutrition hit on every swing of the hatchet,
and it can take up to twelve swings to chop down one tree.
 2017-01-05 19:38:03 -05:00
oiad d0257b3c7d Add logging failed safe/lockbox and door lock/unlock/failed code attempts (#1853) 
* Add logging failed safe/lockbox and door lock/unlock/failed code attempts

This adds logging for both safes and lockboxes for failed code attempts.

Also adds logging for locking, unlocking and failed code attempts for
doors.

"salival (playerUID) FAILED unlocking LockBox with code: Red11 (actual:
Red57) @110069 [11044.4,8438.32,0.652]"
"salival (playerUID) UNLOCKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) PACKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: EYESCAN (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: 100 (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"

* Revert wrong hinge type

* Remove unused DZE_Lock_Door

* Rework

* Remove redundant code, Make single currency costs use BIS_fnc_numberText

* Rework

* Add changelog line
 2017-01-05 16:45:10 -05:00
ebaydayz 731175f46b Prevent abuse of combine M24 and 2RndShotGun ammo #1848 
Prevents duping exploit described in #1848

Fixes #1848
 2017-01-04 16:16:15 -05:00
ebaydayz cfe01e609e Set RU crates cargo capacity back to normal 2017-01-04 12:43:04 -05:00