Commit Graph

125 Commits

Author SHA1 Message Date
ebaydayz
3f27bef1e3 Add version define in config.cpp
Vanilla commit:

75ff017b53
2016-08-27 10:09:55 -04:00
ebaydayz
56d63f608a Comment out CfgLoot include in configFile
No need to load twice.
2016-08-24 12:50:20 -04:00
ebaydayz
a345b69a77 Swap vanilla ItemPadLock for Epoch ItemComboLock
This greatly simplifies things over having two separate combo lock
classes.
2016-08-17 13:27:08 -04:00
Bruce-LXXVI
5e53a71e88 Pullrequest/door management (#1694)
* Added doorManagement

* Rename FNC_check_owner --> FNC_check_owner_friends

* Fixed typo

* Fixed bug in FNC_check_owner_friends which allowed every user to manage
every plot and door.

* Removed unused DZE_doorManagementHarderPenalty from configVariables.sqf

* Now checking if _playerUID is in _friendlies for both cases.

* DZE_plotforLife should be DZE_permanentPlot

* Fixed case where DZE_permanentPlot is false.

* Forgot to add STR_EPOCH_CANCEL

* Changed translations to suggested string by ebaydayz.

* Renamed EyeScanner to DoorAccess.

* Reworked access rights for door management.

* DZE_doorManagementMustBeClose = true; //Players must be within 10m of
door to be added as a door friend.

* Fixed copy-paste error.

* Replace count with if

* Remove redundant test.

* Also replaced count in door management admins check.

* Change plotManagement and doorManagement to be consistent to
DayZ_UseSteamID (get UID from FNC_GetPlayerUID).

* Use _playerUID and _characterID more consistent.

* Added german translation to
STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST.
2016-06-15 18:22:01 -04:00
ebaydayz
d01446414c Move Zupa dialog includes to config.cpp
@icomrade - configFile and missionConfigFile are in different scopes.
Admins can overwrite any dialog in RscDisplay with their own version
included in the mission without getting "class already defined" errors.
I tested to make sure it is possible. So there is no benefit to having
these includes in description.ext.
2016-05-19 18:43:23 -04:00
ebaydayz
cbca23ddce Remove duplicate ZSCdefines.hpp include
@Bruce-LXXVI it was already included from the mission description.ext
2016-05-19 13:39:38 -04:00
ebaydayz
914b37a413 Pass cursorTarget to maintain_area.sqf
CursorTarget should always be passed from fn_selfActions, not reacquired
in action scripts. This is to ensure the same object is referenced. Plot
Management maintain_area is called from the dialog button, not
fn_selfactions.
2016-05-19 13:10:20 -04:00
Bruce
59c731ba70 Added ZSCdefines. Checking plotfriends against dayz_playerUID. 2016-04-30 02:01:27 +02:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
ebaydayz
bb66b4446c Add Anzio 20mm sniper by @arma2WillRobinson to addons list 2016-04-27 12:30:57 -04:00
ebaydayz
7732481a8d Add new items to R3F weight config
I split CfgWeight into separate files to make it more readable.
2016-04-07 18:42:44 -04:00
ebaydayz
6de88c7b07 Update some WeaponHolder to WeaponHolderBase 2016-03-31 11:35:33 -04:00
ebaydayz
69091965a1 Merge new MultiPlayerSetup and autojoin 2016-03-30 17:01:28 -04:00
ebaydayz
91f9b3e33b Make UI toggleable between three options
Admin can choose vanilla, classic epoch or classic epoch dark.

dayz_hungerThirst was replaced with dayz_NutritionSystem
2016-03-29 19:54:19 -04:00
ebaydayz
23caf14dc9 Update mission
It should no longer be necessary to load dayz_vehicles in the
mission.sqm addons. It was taken out of mission.sqm in vanilla around
1.8.

The dayz_logo_ca.paa file was identical to loadingscreen.paa
2016-03-27 15:18:28 -04:00
ebaydayz
28c3f9a937 Remove duplicate and unused includes 2016-03-04 19:21:51 -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
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
1f8118c1cb Remove RedRyder from Required Addons 2016-02-22 10:41:43 -05:00
icomrade
186bc48231 Move Waves to CfgWorlds 2016-02-21 18:12:57 -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
9876819da5 Add waves during stormy weather
See #974
2016-02-20 19:15:22 -05:00
ebaydayz
66a674ad31 Update version number 2015-04-18 15:19:17 -04:00
raymix
5c8da27d4d optional snap building added 2014-07-10 20:13:30 +01:00
[VB]AWOL
83c04c9f4e update versions 2014-07-01 15:22:39 -05:00
[VB]AWOL
3aa6837247 version bump 2014-06-25 08:58:39 -05:00
[VB]AWOL
d4bfc2e4c1 should fix #1208 2014-06-07 17:54:49 -05:00
Florian Kinder
ad22c7df04 Updated Displays
Disabled new gear system
2014-02-18 23:51:38 +01:00
[VB]AWOL
96f9e1009b version bump to 1.0.5 2014-02-18 13:48:36 -06:00
Florian Kinder
407741b7dd Last changes new lootsystem
refs #1109
2014-02-16 00:58:57 +01:00
[VB]AWOL
46dae90e9c version bump to 1.0.4.2 2014-02-10 11:16:50 -06:00
[VB]AWOL
963b54b024 not needed here 2014-02-05 12:02:58 -06:00
[VB]AWOL
8fa82911ef changed to missionConfigFile and commented out include
an
2014-02-04 14:33:41 -06:00
[VB]AWOL
746755f42f testing config traders 2014-02-04 13:12:26 -06:00
Skaronator
5a82128500 Sort Config 2014-02-04 16:46:11 +01:00
[VB]AWOL
144ea74935 version bump for 1.0.4.1 2014-01-30 11:47:14 -06:00
[VB]AWOL
293c5cb6b5 version bump, prep for 1.0.4 2014-01-01 20:05:16 -06:00
[VB]AWOL
cebe9e588c Version bump for upcoming hotfix 2013-12-08 11:02:42 -06:00
[VB]AWOL
1f5f177cb7 1.0.3 2013-12-05 13:52:13 -06:00
[VB]AWOL
0b79bbc210 RC5 2013-12-04 23:59:09 -06:00
[VB]AWOL
68a88005a9 version bump 2013-12-03 11:51:56 -06:00
[VB]AWOL
ec4f68c4d1 RC2 2013-11-30 10:23:36 -06:00
[VB]AWOL
d431b21ce0 1029 version bump 2013-11-24 14:15:04 -06:00
[VB]AWOL
bc7b19dd64 moved r3f realism into client files 2013-11-17 02:08:28 -06:00
[VB]AWOL
c3f8355022 fixes errors during bin/packing 2013-11-16 21:39:23 -06:00
Skaronator
e42a9ab689 Cleanup Files, sort files etc. 2013-11-16 20:18:38 +01:00