W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,738 Commits 20 Branches 18 Tags
155e5e5616df681d37876897fcb8fbe137a6cfe9
Commit Graph

662 Commits

Author SHA1 Message Date
ebaydayz
155e5e5616 Remove more unused strings 
Also add back call to fn_gearMenuChecks
 2016-03-05 01:16:30 -05:00
ebaydayz
214a648bc1 Remove unused string and duplicate defines 2016-03-04 22:41:00 -05:00
ebaydayz
732c2fe5a0 Cleanup some merge conflicts 2016-03-04 14:29:49 -05:00
icomrade
61c64cb14a Fix Merge Conflict 1 2016-03-03 22:09:38 -05:00
ebaydayz
479097e7a8 1.8.7 player_switchWeapon updates 2016-03-03 21:31:32 -05:00
ebaydayz
e660704f97 Add journal and preliminary strings for crafting 
The journal is now functional. Preliminary strings are added for the
1.8.7 crafting system, but it is disabled for now.

I've messaged @marceldev89 (ziellos2k) and @AlbyBDPK on the DayZ forums
to ask permission to use fn_updateCraftUI, player_checkRecipe and
player_craftItemGUI. Are you guys okay with us including these in DayZ
Epoch 1.0.6?
 2016-03-03 20:11:11 -05:00
icomrade
84eb6f815a Missing Files 2016-02-29 00:55:29 -05:00
icomrade
18c9e72e15 Some compiles, start separation of blood system 2016-02-27 09:56:53 -05:00
icomrade
61cbd16de1 Merge remote-tracking branch 'upstream/master' 2016-02-27 09:01:02 -05:00
icomrade
dde3215f9a CFGLoot should be done 
Make sure there's no attachments or NEW _DZ weapons that support
attachments!!!!
 2016-02-26 11:24:20 -05:00
icomrade
43b9da7c17 I hate loot tables 2016-02-25 13:23:15 -05:00
icomrade
0309e1de40 re-add mil-industrial 2016-02-25 13:08:45 -05:00
icomrade
6c550faf27 move includes to CfgBuildingPos 
for consistency with old releases
 2016-02-25 11:59:34 -05:00
icomrade
71d045875b BuildingPos Done and Separated/Sorted 2016-02-25 11:43:55 -05:00
icomrade
a118851ca8 Loot Defines done, need to do building loot now 
Add legacy loot defines, needs new blood bags if server wants to use
bloodtype system.
 2016-02-25 09:49:29 -05:00
icomrade
3b272776b3 Ammo still, and needs to implement weapon groups 2016-02-24 10:02:15 -05:00
icomrade
468accce2a Tents config magazine 2016-02-24 09:04:21 -05:00
icomrade
71956df248 CfgLootSmall Done, left off at tents[] in CfgLoot 2016-02-23 10:39:33 -05:00
Adaptivity
dd40bae42f Russian localization update, safe localization 
Fix quotes
 2016-02-22 23:50:09 +03:00
icomrade
8cdc8e6e36 CfgMagazines - still need script tweaks for buldables 2016-02-22 13:31:14 -05:00
icomrade
ab2976f98c CfgAmmo Update 2016-02-22 10:58:33 -05:00
icomrade
812bef4c49 Fix some config errors 2016-02-22 10:41:23 -05:00
icomrade
46bc08c9a4 cfg fix 2016-02-22 00:09:44 -05:00
icomrade
186bc48231 Move Waves to CfgWorlds 2016-02-21 18:12:57 -05:00
icomrade
744d2e43a3 one more 2016-02-21 13:16:13 -05:00
icomrade
fc6bb2cfb7 moved to /configs/CfgVehicles/CfgVehicles.hpp 2016-02-21 13:16:11 -05:00
icomrade
f885e06c2a CfgVehicles and Scope issues done 2016-02-21 13:14:03 -05:00
icomrade
fd4bd5a5a1 Fix a bunch of errors 2016-02-21 13:13:00 -05:00
icomrade
86273a4d53 Faces 2016-02-21 13:09:18 -05:00
icomrade
dfb7bba743 CFG WEAPONS DONE 2016-02-21 13:09:16 -05:00
ebaydayz
81d5976031 Fix toilet paper dupe exploit when building outhouse 
See #1599
 2016-02-20 23:09:18 -05:00
ebaydayz
8e8cb55bd9 Fix M113_DZE no entry config errors and gunner seat not working 
See #1514
 2016-02-20 00:01:10 -05:00
icomrade
da59f314a0 Fix Timeout Display for Real 2016-02-18 22:40:34 -05:00
icomrade
c3ed4e49e1 Replace sleep with uiSleep 
see the below links for more info. uiSleep is based off of a more
accurate method of tracking time, whereas sleep can fluctuate depending
on application performance since it is based on framerate.
https://community.bistudio.com/wiki/uiSleep
https://community.bistudio.com/wiki/sleep_vs_uiSleep
https://community.bistudio.com/wiki/sleep
 2016-02-17 13:03:17 -05:00
ebaydayz
508a6e75fc Add upgraded ArmoredSUV classes 
Thanks @McKeighan https://github.com/EpochModTeam/DayZ-Epoch/pull/1518
 2016-02-16 14:47:34 -05:00
ebaydayz
d17eb651a3 Merge pull request #1538 from McKeighan/patch-12 
Add upgraded Kamaz classes
 2016-02-16 14:18:32 -05:00
ebaydayz
05b2f15e93 Fix upgraded VWGolf maxSpeed 
Thanks @McKeighan https://github.com/vbawol/DayZ-Epoch/pull/1530
 2016-02-16 12:44:02 -05:00
ebaydayz
0753b27341 Fix upgraded Lada fuelCapacity 
Thanks @McKeighan https://github.com/vbawol/DayZ-Epoch/pull/1529
 2016-02-16 12:27:48 -05:00
icomrade
47b039de74 unused code 2015-12-29 18:02:30 -05:00
icomrade
546e59e959 auto login 
I hate sitting in the lobby for the full 90 seconds before loading.
- Default login delay is 10 seconds, can be set in the mission
- Players cannot deselect or change character slots
- Players can click OK or disconnect before timeout
 2015-12-29 17:59:40 -05:00
icomrade
53fb0b11b6 Duplicate loot entry 2015-12-13 16:27:00 -05:00
Zupa
f701affda8 Merge pull request #1548 from githubmil/master 
Fix UAZ Cargo Upgrade & Balance Armor Upgrades & Fix L85A2 Price in config traders.
 2015-07-01 23:49:54 +02:00
ebaydayz
3162cf2eff Update version number 2015-04-18 15:15:29 -04:00
vbawol
f0782d9c89 Merge pull request #1648 from seb3sec/patch-5 
Correct output for deconstruction round bagfence
 2015-04-03 22:58:28 -05:00
vbawol
5790d1e129 Merge pull request #1633 from seb3sec/patch-3 
Add BAF_L110A1_Aim_DZE
 2015-04-03 22:58:18 -05:00
vbawol
c343541bb4 Merge pull request #1638 from seb3sec/patch-4 
Remove hiddenSelections restrictions
 2015-04-03 22:49:54 -05:00
vbawol
8d3239ad93 Merge pull request #1636 from Mikeeeyy/patch-15 
Update Ammo.hpp
 2015-04-03 22:49:25 -05:00
vbawol
444fd125d0 Merge pull request #1632 from seb3sec/patch-2 
Fix for compile error "Item listed twice..."
 2015-04-03 22:14:27 -05:00
seb3sec
d2bacf367e Correct output for deconstruction round bagfence 2015-03-18 12:32:08 +01:00
seb3sec
e8430a49c5 removed hiddenSelections definition 2015-02-21 02:56:25 +01:00