Commit Graph
44 Commits
Author SHA1 Message Date
ebaydayz e61eeaca09 Generator_DZ no longer in BuiltItems
Needed to add it to variables.sqf lists.

@icomrade - Any reason FireBarrel_DZ was removed? I think we still need
it, since it is an epoch buildable class, unless we merge it with
Land_Fire_barrel.
2016-03-08 14:26:33 -05:00
ebaydayz 040cce2a27 More cfgVehicles cleanup 2016-03-06 20:02:24 -05:00
ebaydayz eadb3566c4 Split hatchback and sedan into separate files
Using 1.8.7 style now. If it was erroring out before it's because Skoda
needed to be defined before hatchback.
2016-03-05 21:04:06 -05:00
ebaydayz 5cfe47c718 dayz_anim requiredAddon in dayz_sfx
These changes are consistent with the 1.8.7 files.

@icomrade - Why did you change all of the scope = public; to scope = 2;
in dayz_code? They should be identical since that is included in the
basicDefines.hpp above all configs. We should stay consistent with 1.8.7
and use the human readable names if possible.

Also any reason you left out these extra CfgActions?
2016-03-05 18:16:17 -05:00
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 28c3f9a937 Remove duplicate and unused includes 2016-03-04 19:21:51 -05:00
ebaydayz fbedaf9b8d Remove merge conflict markers
@icomrade - I'm going to start reviewing and testing the commits you've
done here. I'll commit any fixes and additional 1.8.7 stuff that is
needed to this 1.8.7-Rebase branch. Once we have it in a functional
state we can merge it into master if that's good with you.

Let me know if you are working on any files in particular so we don't
duplicate efforts. I'll be in discord while I'm working here too.
2016-03-04 14:59:12 -05:00
ebaydayz 732c2fe5a0 Cleanup some merge conflicts 2016-03-04 14:29:49 -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
ebaydayz ca44e9d8b1 Sensible combat log knockout timer
A five minute knockout timer for combat logging is far too long. Most
players will just leave the server and join another. Two and a half
minutes is more bearable.
2016-03-01 17:02:27 -05:00
ebaydayz 44b9b68fd7 Remove 6.Dingor mission
This is identical to the lingor mission. The only change is "ibr_dingor"
added in mission.sqm. Admins can use the lingor files for dingor. The
two maps are the same apart from the desert skin. There are currently no
servers running dingor at the time of writing this.
2016-03-01 16:45:06 -05:00
ebaydayz e15a913809 Remove 18.Sara mission
This is an exact duplicate of the smd_sahrani_A2 mission. The only
difference is the "oac_core" addon in mission.sqm. That addon is no
longer used in any of the current versions of the map.
2016-03-01 16:19:15 -05:00
ebaydayz 813803cf4b Remove template mission
This is basically a duplicate of Chernarus11. People can use that as a
template.
2016-03-01 14:49:52 -05:00
ebaydayz ca1a508417 Add old files to TraderCitySources for reference
I put all the old trader city mission.sqf files from
dayz_server\missions\ in the TraderCitySources folder for reference. I
renamed the folders to instanceNumber.mapName to be more organized.
2016-03-01 01:08:23 -05:00
ebaydayz b970b28e40 Remove the now unused missions folder
This folder is no longer needed. All files have been moved to
dayz_server\traders and dayz_code\system\mission.
2016-02-29 23:48:45 -05:00
ebaydayz 7b0253debc Spawn trader city objects locally on each machine
Also move dynamic_vehicle.sqf to the dayz_server\system folder
2016-02-29 23:43:12 -05:00
ebaydayz bd5921cc2d Add server files for local trader cities
Trader agents are still spawned on the server machine only.
2016-02-29 22:45:06 -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
ebaydayz f9bec452a5 Consolidate dynamic_vehicle to one file
The only difference between them is the water maps include boats.
2016-02-26 13:29:28 -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
ebaydayz ff4a227a1d Prevent duplicate objectUIDs
See #1504 for the details
2016-02-24 12:31:13 -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
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
ebaydayz 81d5976031 Fix toilet paper dupe exploit when building outhouse
See #1599
2016-02-20 23:09:18 -05:00
ebaydayz 0075b44c0e Add option to restrict wearable clothes
See #1560

Note: Already wearing check is not needed in player_humanityMorph
because it is already done in player_wearClothes. See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/0726311df554d20f7f2ab27fa97554fa145c3377
2016-02-20 22:08:20 -05:00
ebaydayz 9876819da5 Add waves during stormy weather
See #974
2016-02-20 19:15:22 -05:00
ebaydayz 103467a111 Remove unused variables
These vars are unused. See #1605
Amphib FPS issues confirmed. See #1612
RequiredSecureID is deprecated. See #1647
2016-02-20 16:17:48 -05:00
ebaydayz 742b493ab7 Update change log 2016-02-20 13:44:47 -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
ebaydayz 174e11dfdb Remove unused string from #1313 2016-02-19 17:52:24 -05:00
ebaydayz 9d1185409c Fix combine mags not working for M1911 and Revolver
See #1313
2016-02-19 17:37:52 -05:00
ebaydayz 59d853ebc9 Add handling of full toolbelt
Tested and confirmed working in all cases with both copy key and
sledgehammer crafting.
2016-02-19 15:20:53 -05:00
ebaydayz 2b0a5ae790 Animal spawn radius lowered
Animal spawn radius lowered to 600m around player (DayZ Mod default).
Should help with low animal count #1403
2016-02-18 23:53:56 -05:00
ebaydayz fd78f27250 Fix copy key failing when player has no backpack
Related to #1567, so I made this a function so it can be reused. People
should call this whenever they are adding a toolbelt item which the
player may already have. It has localized strings and handles spawning
the weapon holder on water, land and rooftop.

Tested both the sledgehammer and key copying. Confirmed all three
conditions are working.
2016-02-18 22:12:13 -05:00
ebaydayz 4f18f1c884 Update change log 2016-02-18 20:39:00 -05:00
ebaydayz 65c2a7e6b4 Fix opening supply crate over water
See #1558
2016-02-18 19:38:23 -05:00
ebaydayz 7a1058cb6d Block local script execution bug
See:
<pre>https://dev.arma3.com/post/spotrep-00045
Fixed: Exploit with inGameUISetEventHandler granted a menu hack
possibility</pre>
Still not fixed in A20A as of 1.63.131129
2016-02-18 14:16:47 -05:00
ebaydayz 441e9fb231 Update keyboard eventhandler and add rules.sqf
See: https://github.com/EpochModTeam/DayZ-Epoch/pull/1673
2016-02-16 21:59:29 -05:00
ebaydayz edf9b71e12 Update description.ext to 1861 format
Tested with current 106 files without issue.
2016-02-12 17:41:23 -05:00