W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 18:01:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,946 Commits 20 Branches 18 Tags
ef8f8382387a54c4ddfab14d59b0085ae2f1c17a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz 638c7dd8b8 Remove some unused variables 2016-12-06 15:02:18 -05:00
ebaydayz 9234244c72 Clarify diag_log 2016-12-06 14:31:30 -05:00
ebaydayz 66f87fac46 Move two localizations to epoch package in stringtable 
Vanilla doesn't refund modulars when deconstructing, Epoch does. Also
upgrade was moved to UserActions of dayz_buildings in vanilla.
 2016-12-06 13:59:25 -05:00
ebaydayz 86d16131bc Update change log 2016-12-06 13:10:07 -05:00
ebaydayz dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz c3af66b23a Fix ServerMagArray count error 
(select 2) selects 3rd element

From 252843d @icomrade
 2016-12-05 15:45:42 -05:00
ebaydayz 1bb76d2d22 Resolve merge conflict for #1807 2016-12-05 14:40:21 -05:00
ebaydayz 5058308f00 Prevent issues caused by respawn_west marker being moved 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/39bcedb4b6e6c1d61f8e8e837b35f28d3502e231
 2016-12-05 14:37:28 -05:00
ebaydayz 2db6692643 Fix undefined var dayz_clientPreload during intro.sqs 2016-12-05 11:14:06 -05:00
ebaydayz 4dc667ac7e Remove unnecessary quotes in scripts.txt 
They are only needed if the keyword contains spaces.
 2016-12-04 21:51:05 -05:00
ebaydayz 44e585343f Update for servers that had single currency 3.0 installed 
Makes life easier for people upgrading 1051 databases. Otherwise their
client will error out on loop in fn_selfActions because dayz_onBack will
be a number when it should be a string.

https://epochmod.com/forum/topic/28493-alpha-release-single-currency-30-storage-default-hive-no-global-banking/
 2016-12-04 19:00:46 -05:00
ebaydayz eb150a8289 Fix typo from 9ae0e7e 2016-12-04 14:52:57 -05:00
ebaydayz 9ae0e7eb11 Fix conversion of medical array for old characters 
Fixes some converted characters having a <null> value in the "rh_factor"
slot of their medical array causing them to fail to save.
 2016-12-04 14:38:47 -05:00
ebaydayz 7ab09b9a9f Fix error with converted characters medical array 
Select 12 actually selects the 13th item in an array, so the rh_factor
line will error if the array is equal to twelve.

This was responsible for some converted characters having a <null> value
in the "rh_factor" slot of their medical array causing them to fail to
save.
 2016-12-04 14:18:37 -05:00
ebaydayz 7af0cb2910 Lower numpad minus keydown timer for block cheats 
Fewer false positives
 2016-12-04 11:37:03 -05:00
ebaydayz f03f116dfc Fix Arma cheats still enterable under certain circumstances 
Thanks to Epoch forums user Golgofinyanin for reporting.
https://epochmod.com/forum/profile/13156-golgofinyanin/
 2016-12-03 16:50:55 -05:00
ebaydayz 45159d81c2 Update pain sound effect 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7cdb2e67fde01bb1cff9be98eb76af199c7c065b
 2016-12-03 13:25:31 -05:00
ebaydayz 43d14dbdba Avoid potential issues with double private vars 
_message is a commonly used var name
 2016-12-02 14:39:04 -05:00
ebaydayz 5d1a6939e6 Fix refuel at gas station with generator #1806 
Fixed mistake from: e398250

The refuel code was only running if a fuel truck was passed to the
script.

Also removed fuel truck classes that do not exist from the
dze_fueltruckarray.
 2016-12-02 12:34:51 -05:00
ebaydayz eacc362e38 Fix z_hunter texture #1805 2016-12-02 10:51:13 -05:00
ebaydayz 119470809f Disable moving of group dialog 2016-12-01 20:31:04 -05:00
ebaydayz baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
ebaydayz 40ea519fd3 Temp fix for vault_pitch.sqf error in 1.0.6 release 2016-12-01 15:31:09 -05:00
ebaydayz c0d5fcf17c Fix vault_pitch PVDZ_obj_Publish array 
106 server_publishObject expects inventory as 4th element.
 2016-12-01 15:15:04 -05:00
ebaydayz 1cd069e2d8 Uncomment PVDZ_dayzCarBomb 
Not sure if functional atm, but still in use if ItemCarBomb is script
spawned and right clicked (not obtainable by default). My mistake from
b6d88b1
 2016-12-01 10:32:25 -05:00
ebaydayz 1dd337b8ed Add @ndavalos and @SmokeyBR to credits in README 
Both contributed numerous corrections and bug reports. Thanks
 2016-12-01 10:28:10 -05:00
ebaydayz 74cc99ddad Remove identical lootPos comment 
There was no difference between the lootpos except spacing after the
commas.
 2016-11-30 12:17:06 -05:00
ebaydayz 4ffa25adf2 Improve rejoined group message grammar 2016-11-30 11:58:29 -05:00
ebaydayz 546dc4fc41 Update scripts.txt 2016-11-30 11:54:26 -05:00
ebaydayz bee00e9a57 EnableRadio if globalChat death messages are on 2016-11-30 00:36:51 -05:00
ebaydayz 27ee69695c Update my username in readmes 2016-11-30 00:08:52 -05:00
ebaydayz 416fdbc4ab Improve filterCheats and VON block 
Filter cheats is now added to the main options menus that needed it.

It is not needed on the map (display 12) because KeyDown for display 46
also fires when it is open. So filterCheats was firing twice (once on
each display) in that case.

KeyDown does not fire on display 63 at all
regardless of whether PTT or VON is held down, toggled or chat open.
Keydown does fire on 55, but only after the mic icon is locked on, so it
is of limited use. MouseButtonDown does not fire on 55 or 63. So it is
useless to add to those displays. You can confirm this with:
(findDisplay 63) displayAddEventHandler ["KeyDown","systemchat
'fired';"];

Filter cheats is now only checked on display 46 when a
voice, channel, or cheat key is pressed instead of on every key press.
This still works 100% of the time for blocking cheat input. For
performance reasons it's probably not worth checking all the conditions
in filterCheats with every key press on display46 just for the VON
block. Doing so covers some edge combination bind cases better, so it
may be worth considering again if no better alternative is found. For
now this solution is good enough to cover the majority of cases without
slowing down the keyhandler during normal usage.

The VON message now
tells you exactly which channel block you triggered instead of listing
all of them.

Fixed issue mentioned in 52c9c7c with VON getting stuck on when using a
double tap keybind.

Tested:
1. Talk in side with regular/combo/mouse bind
2. Change channels
while mic is locked on with regular/combo/mouse bind
3. Change channels
with Up/Down arrows while chat is open.
4. Trying all cases in steps 1-3
with a dialog open.

It is possible to bypass the VON block with some different control
settings and combinations of the above, but for default controls and
common usage it works the majority of the time.
 2016-11-29 23:44:28 -05:00
ebaydayz 185d84f14f Remove unneeded global var Z_AT_FolderLocation 
This variable is not useful. If you change it you need to copy all the
AT files to your mission.

It is fewer files in the mission to just overwrite the path in compiles
and fn_selfActions.

Also fixed mistake with not replacing macros in scripts.txt with their
actual values.
 2016-11-27 20:30:34 -05:00
ebaydayz ca73853179 Update readme 2016-11-27 19:02:10 -05:00
ebaydayz 5986b00823 Update server install readme 2016-11-27 14:42:55 -05:00
ebaydayz a8ab2f5d54 Allow drinking from hands at ponds on Cherno 
Town generator configs may be added for other maps in the future.
 2016-11-27 14:04:18 -05:00
ebaydayz 6abd92034a Make bloodbag interrupt message more accurate 
The blood bag isn't actually removed in any of the three cases this
message is used.
 2016-11-27 12:21:44 -05:00
ebaydayz 19e3947669 Fix empty snack bags giving drink option 
Thanks @Helios27

https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-263117080
 2016-11-27 12:02:29 -05:00
ebaydayz 15fa1fc7a7 Update test build 2016-11-26 21:34:58 -05:00
ebaydayz 6cdc0a51c9 Add extra animations to ArmoredSUV, MV22, UH1Y 2016-11-26 21:14:12 -05:00
ebaydayz 7c566a1345 Remove unused variable dayz_deseedloot 2016-11-26 14:08:34 -05:00
ebaydayz effabd711d Remove some more excessive client log spam 
Only needed when debugging zombie targetting
 2016-11-26 13:45:03 -05:00
ebaydayz 6f7a69fd68 Update REsec.hpp allowed execVM 
Update for new corepatch:

https://github.com/Goliath86/CorePatch/blob/master/CorePatch_Modules/Functions/main.sqf#L9

Also fixed false positive due to case sensitivity:
"WARNING RE rexecVMcode with illegal
args:[any,any,"ca\modules\Functions\init.sqf"]"
 2016-11-26 13:34:00 -05:00
ebaydayz d14416931a Fix VON block mistake from b9a5c59 
I forgot filterCheats is already called in keyboard.sqf
 2016-11-25 19:31:14 -05:00
ebaydayz 27f492f401 Fix typo in VON block 
My mistake from b9a5c59
 2016-11-25 18:42:38 -05:00
ebaydayz 808c8cf736 Hide group icons on death screen 2016-11-25 18:30:48 -05:00
ebaydayz b9a5c59660 Include all controls in VON block 
Moved to display 46 keydown since keydown on 63 only fires after the VON
transmission has already started (slight delay).

Added mouseButtonDown so it can not be bypassed via assigning a mouse
button.
 2016-11-25 18:22:41 -05:00
ebaydayz b6d88b1329 Update vanilla building 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/9b2092c9f7f1bb57607452691cae7e6975ccb959

https://github.com/DayZMod/DayZ/commit/674624d1221e7f661189206631e066b48870e0c7
 2016-11-25 16:25:26 -05:00
ebaydayz cf64805d10 Disable RadioProtocol group chat spam 
Works well with AI, still needs multiplayer testing.
 2016-11-24 17:46:57 -05:00
ebaydayz 2b6481a515 Fix dead body cleanup mistake from 97431f8 2016-11-24 14:13:32 -05:00
ebaydayz 97431f81c2 Should fix flies spawning where player relogs 
AI mods will need to setVariable "bodyName" on their dead units to
prevent them being cleaned up.
 2016-11-23 17:14:00 -05:00
ebaydayz f49c8a4ed6 Remove excessive REsec log spam on clients 2016-11-23 15:48:55 -05:00
ebaydayz ea389b59ea Remove unneeded isKindOf "Man" checks 
"Man" includes animals and zombies:

https://community.bistudio.com/wiki/ArmA_2:_CfgVehicles#Man_Class_Vehicles
 2016-11-23 14:43:59 -05:00
ebaydayz c202c697eb Update loot spawn.sqf 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/4752621ffcb00945c8a2ac0e1db47ed4ea1b9b56
 2016-11-23 13:50:24 -05:00
ebaydayz ec6b5eb679 Move Repair and Salvage back to fn_selfActions 
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
 2016-11-23 13:34:22 -05:00
ebaydayz edb622d8bd Update test build 2016-11-21 21:08:15 -05:00
ebaydayz aea0bb1298 Update animal cleanup on log out 
Partial revert of 0483fa6
 2016-11-21 20:54:33 -05:00
ebaydayz 43b900835e Fix infectiousWaterholes init again 2016-11-21 20:28:07 -05:00
ebaydayz 0483fa61f6 Fix live animals being deleted in front of players 
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/9d6be1731eca33172c340bc584771032ede92a69
 2016-11-21 18:49:03 -05:00
ebaydayz d7ecf29744 Update infectious waterholes 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0dadb0897cb64286e57dd24d735cd66c4a0a2c97
 2016-11-21 18:39:50 -05:00
ebaydayz 6853263f3d Update zombie generate 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/09aa9f8879b40013e852e2c8333ab2a219cff25e

https://github.com/DayZMod/DayZ/commit/68be696c4d91b59bc144267b189d90280abbcb46
 2016-11-21 18:33:41 -05:00
ebaydayz 2924daf0c4 Add missing createDialog scripts.txt exception 2016-11-21 15:11:17 -05:00
ebaydayz 6aa0cb8215 Update vanilla building 
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/dfc46eff7b3188dfe65ffa616f9b7cb2985bc654
 2016-11-21 14:57:02 -05:00
ebaydayz 7f239754cc Fix anitbiotics to remote player cures own infection 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/4c6b45d50751b90f035b3caf69443dda614bddb5
 2016-11-21 14:33:20 -05:00
ebaydayz 2d394c32da Move sharpen action to ItemKnifeBlunt 
Avoids confusing message "Missing ItemKnifeBlunt to do this"
 2016-11-21 13:55:09 -05:00
ebaydayz 0c9fbc40c8 Remove Salvage from Bicycle in configs 2016-11-21 13:43:11 -05:00
ebaydayz 5e97435d7b Fix can't sell classic bloodbag 2016-11-20 21:24:27 -05:00
ebaydayz 901329c9ec Fix vanilla crafting actionInProgress 2016-11-20 20:34:05 -05:00
ebaydayz 2f1c57047a Fix infectedWaterHoles init for non-cherno maps 2016-11-20 20:03:18 -05:00
ebaydayz 3aad4b61e9 Move some addActions to config UserActions 
Should improve client FPS while still allowing conditions and scripts to
be customized.

Some special vehicles like MV22, UH1Y, etc. have UserActions overwritten
in their configs, so please let me know if you find any others that do
not get the option to repair or salvage because UserActions is
overwritten in their config. I think I got them all.

Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/350d73abe1e39f15b3b41d38400ce9ec2d0d74e8
 2016-11-20 19:47:21 -05:00
ebaydayz efeadcfa35 Rename selectPlayer and selectGroupMember functions 
Fewer scripts.txt exceptions needed
 2016-11-19 19:39:08 -05:00
ebaydayz 76d9de9e53 Update change log 2016-11-18 21:12:17 -05:00
ebaydayz edec813d3e Update test build 2016-11-18 20:22:21 -05:00
ebaydayz 0525763ffb Update German translations from #1798 
Submitted by @DAmNRelentless and reviewed by @AirwavesMan
 2016-11-18 19:46:24 -05:00
ebaydayz f307386cb2 Fix cherno field hospital tent position 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7e18cef9cbc6627e0c4209365b4eaf3544218f2c
 2016-11-18 18:43:28 -05:00
ebaydayz da5285e0ec Update damage handler diag_log 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/21864d065c88b4c1f4579f4f20afc7bc6efc0097
 2016-11-18 16:36:37 -05:00
ebaydayz bec4ccce38 Update dayz_server 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/95bf775fd2efaaa915f0fbcce3457eab888ff54f

https://github.com/DayZMod/DayZ/commit/6e638aeb8c18faeb5758e6acb3906b82b2d6eb60
 2016-11-18 15:28:00 -05:00
ebaydayz 5072ea4e8b Update infectious waterholes init 
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/0d18630c11667894f0691a6f46ceb7b016322865
 2016-11-18 14:16:45 -05:00
ebaydayz b01a4165a8 Comment some unused achievement code 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/3ec1cc3c5db3cb9c8a0a974ef6d11248b761cea0

https://github.com/DayZMod/DayZ/commit/3171f68beee73430d3236cfd4e43e13535209174
 2016-11-18 13:22:36 -05:00
ebaydayz ad9a287d00 Remove unused Lada base class 
Also removed some values that are already inhertied from 8429ad1
 2016-11-18 12:18:13 -05:00
ebaydayz 6769104580 Add some missing scripts.txt exceptions 2016-11-17 16:01:20 -05:00
ebaydayz 8429ad1fbc Clear typicalCargo for some vehicles missing it 
Prevents preloading units, may help with load times a little.
 2016-11-17 15:40:08 -05:00
ebaydayz f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz 20d84ddba8 Sort scripts.txt alphabetically 
Missed these
 2016-11-15 17:22:36 -05:00
ebaydayz acef12a7f9 Add some scripts.txt filters 
These will probably need some additional exceptions and corrections.

Please post the scripts.log entry if you get any kicks or logs that are
not from custom changes or third party mods.
 2016-11-15 17:07:00 -05:00
ebaydayz 43330c2046 Diminish humanity reward for transfusion 
As suggested on:
cdb9776
and
https://github.com/DayZMod/DayZ/issues/731
 2016-11-15 15:31:58 -05:00
ebaydayz 110f677f1e Fix allowDammage typo for easier scripts.txt filtering 2016-11-15 14:34:42 -05:00
ebaydayz cdb9776d4e Add bloodbag cooldown 2016-11-15 13:57:40 -05:00
ebaydayz 414fd7e1b7 Add auto open chute option to HALO 2016-11-14 20:25:26 -05:00
ebaydayz de44b32c83 Remove unneeded isBicycle check in fn_selfActions 
Bicycles always have characterID=0, so there is no need to check.
 2016-11-14 14:38:45 -05:00
ebaydayz 81013ace75 Fix gear menu bypass mistake from 89078d1 2016-11-13 15:02:36 -05:00
ebaydayz 89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
ebaydayz e6b9644b71 Update test build 2016-11-12 22:01:03 -05:00
ebaydayz e506a97ad6 Remove redundant check in player_onPause 
Switch executes the first case that matches and does not check any more
cases after that. So these conditions are always met when this case is
checked.
https://community.bistudio.com/wiki/switch_do
 2016-11-12 21:22:11 -05:00
ebaydayz 00f1f8537a Remove redundant unconscious checks in damage handler 
This is already check above. My mistake from e4ede46
 2016-11-12 20:12:04 -05:00
ebaydayz e266fee651 Fix right click on radio generic error 2016-11-12 19:16:19 -05:00
ebaydayz abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz 8b3376643d Fix unload patients action not being removed from vehicle 2016-11-12 17:23:52 -05:00
ebaydayz e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz e260d335ce Don't allow loading unconscious player into locked vehicle 2016-11-12 16:12:48 -05:00