Commit Graph

1727 Commits

Author SHA1 Message Date
ebaydayz
28c3f9a937 Remove duplicate and unused includes 2016-03-04 19:21:51 -05:00
icomrade
9863c0765a Pointless merge conflict 2016-03-04 15:23:22 -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
ebaydayz
585841a3ad Fix snap build errors
@raymix in most of your helper functions you are using exitWith {}; in
the same way the main player_build uses it. The problem is exitWith
inside of a called function only exits that function, not the parent
script it was called from.

When a helper function exits the main script continues on with undefined
variables and other problems. The easiest solution was to just remove
these helper functions for now. I just directly substituted their code
back into the main modular_build file and removed the passes to and from
them.

We should consolidate player_build and modular_build into one file first
since they are about 80% identical. After that we need to integrate
plot4life. Dividing player_build up into smaller sub functions like this
can be left for last.

I tested this thoroughly and can confirm the undefined errors are fixed
now.
2016-03-02 22:16:07 -05:00
ebaydayz
78e193d7c4 Fix DZE_BuildLimit check
NearObjects "All" counts things like local plot markers, weapon holders,
ambient life, etc. We only want to count buildables. The radius should
also start at the plot pole if available, not the player position.

Thanks to Epoch forums user jOoPs for pointing this out. I will fix this
in modular_build.sqf too.

Tested and confirmed working.
2016-03-02 17:03:47 -05:00
ebaydayz
959507bfc7 Add autorun hotkey
Tested while autorunning:
- getting knocked out
- breaking legs
- running into water
- getting into and out of vehicles
- climbing a ladder
- dying
- antiTP enabled
- running up steep hills
- as player zombie

Everything works as expected. This does allow you to run up and down
pretty steep hills, but if you try to scale something too steep you will
break your legs as expected.
2016-03-01 22:34:36 -05:00
icomrade
bad0a2e461 add 2 new vars and fix up variable names
DZE_HeartBeat
DZE_UseBloodTypes
2016-03-01 00:23:14 -05:00
ebaydayz
075336008e Add files for local trader cities
I've loaded and checked each of these on their respective map in the
editor. I've also tested both Chernarus ones on my test server.
2016-02-29 22:32:16 -05:00
icomrade
a3dac45061 Some small changes 2016-02-29 11:53:49 -05:00
icomrade
b667d01c1c Actions Done 2016-02-29 10:45:53 -05:00
icomrade
a47c3dc137 Fixes 2016-02-29 01:20:37 -05:00
icomrade
84eb6f815a Missing Files 2016-02-29 00:55:29 -05:00
icomrade
b96cd2d971 Update compiles - 2 more files to do
fn_selfActions.sqf
player_updateGui.sqf
2016-02-29 00:26:12 -05:00
icomrade
a83909b918 System is done (i think) 2016-02-28 15:28:59 -05:00
icomrade
c034f43d0b Additional Folders/Files in System 2016-02-27 22:34:50 -05:00
icomrade
3ba3781432 Traps and Utill Folders/Files 2016-02-27 22:31:43 -05:00
icomrade
cfbebe7ffd Init more or less done 2016-02-27 22:30:15 -05:00
icomrade
e418e921c5 Compiles more or less done 2016-02-27 16:48:21 -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
ebaydayz
03353b9483 Add lock and unlock vehicle from inside
See: #1103
Made vehicle gear always accessible from inside.

Also added optional variable to prevent stealing from backpacks by
non-friendlies at traders.  Thanks to @maca134 for the method.
2016-02-24 20:56:13 -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
ebaydayz
9bbeb1e43e Use nearEntities for empty drivable vehicles
NearEntities is faster and works fine for empty drivable vehicles that
are not destroyed.
2016-02-22 16:52:39 -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
1f8118c1cb Remove RedRyder from Required Addons 2016-02-22 10:41:43 -05:00
icomrade
812bef4c49 Fix some config errors 2016-02-22 10:41:23 -05:00
icomrade
1710a87297 Update Stringtable to 1.8.7
stringtable is in DayZ_Code now, Epoch and legacy strings remain in
DayZ_Epoch_b
2016-02-22 10:41:09 -05:00
icomrade
46bc08c9a4 cfg fix 2016-02-22 00:09:44 -05:00
ebaydayz
9311ac4479 Add waitUntil in lockVault and unlockVault
Wait for response from server to verify safe was saved and logged before
proceeding with deleting safe object.

Tested and confirmed this solves #1413. Most likely helps with #1503
too.
2016-02-21 21:31:09 -05:00
icomrade
186bc48231 Move Waves to CfgWorlds 2016-02-21 18:12:57 -05:00
icomrade
accb9e9032 Dup strings note 2016-02-21 13:16:20 -05:00
icomrade
dffcb01efa Stringtable - Needs to be merged with DayZ_Epoch 2016-02-21 13:16:17 -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