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

581 Commits

Author SHA1 Message Date
icomrade
9e2728af07 Merge pull request #1686 from Bruce-LXXVI/pullrequest/plotManagement 
Pullrequest/plot management
 2016-05-01 11:05:54 -04:00
ebaydayz
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
icomrade
7a11b508e1 No building in trader 
string needs localization
 2016-04-30 18:05:58 -04:00
icomrade
b5c2c6c7bd Fix remove object option 2016-04-29 20:48:16 -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
icomrade
6fa3365b70 check if player is alive for humanity change 2016-04-29 17:19:48 -04:00
icomrade
89eea668f5 better math 2016-04-29 17:00:56 -04:00
icomrade
8158245b83 Possible fix for #1645 2016-04-29 16:48:14 -04:00
ebaydayz
7f1b8db85a Fix MeleeMagazines showing in crafting UI 
Vanilla development commit:

f2e1623ba1
 2016-04-28 21:34:00 -04:00
ebaydayz
2b61ce850a Allow sleeping at all tents 
Vanilla development commit:

e647be13c1
 2016-04-28 20:30:18 -04:00
icomrade
b0afc402e2 Require Config Traders for Advanced Trading 
Since advanced trading can now handle vehicles I don't think there's any
point to have the old dialog if using advanced trading.
 2016-04-28 18:59:50 -04:00
ebaydayz
034d898880 Update tent base class name 
DZ_storage_base is now the base class for all tent and stash types.
 2016-04-28 13:53:21 -04:00
ebaydayz
f42496bb03 Move build checks to separate files 
For better organization
 2016-04-28 11:52:23 -04:00
icomrade
e03b5bdb37 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	CHANGE LOG 1.0.6.txt
 2016-04-27 18:26:07 -04:00
icomrade
1585765ca6 Advanced trading by Zupa @Windmolders 
Stock configuration and basic integration. WE still need config based
trader setups.
 2016-04-27 18:23:55 -04:00
ebaydayz
244b84e74b Update weapon switch hotkey for DZE_TwoPrimaries=2 
Also forgot new dropped class for SledgeHammer
 2016-04-27 16:11:40 -04:00
icomrade
7ea9a270f2 New building functions, vanilla building checks 
DZE_RequiredItemsCheck returns bool, displays an error of all the tools
the player is missing to build the item.

DZE_BuildChecks returns array of bools, canBuild and if the item is a
plotPole.  Also has the ability to check if the player has required
tools to build using DZE_RequiredItemsCheck.

The vanilla build script still needs to be modified to work over water
and allow players to place floating objects, but now uses plot checks.
It would be easiest to just modify the configs to use the epoch building
scripts instead.

fnc_getSetPos now accepts a position as the second element of the input
array. the object will be set to this position if it is used. This
change requires no code updates

Note: scripts with build and/or tool checks should be updated to use the
new functions
 2016-04-27 14:30:11 -04:00
icomrade
f102240821 Fix death board undefined variable error 2016-04-26 22:46:44 -04:00
Adaptivity
4dc46705f9 More progress on localization support 2016-04-25 15:47:09 +03:00
ebaydayz
1879fb8707 Fix siphon fuel 
ItemJerrycanEmpty no longer inherits from ItemJerrycan
 2016-04-22 17:39:52 -04:00
ebaydayz
796c607173 Fix vanilla chop wood error 
Players can now chop wood either with hatchet in their hands (faster) or
via right click on toolbelt (slower).
 2016-04-21 12:28:00 -04:00
ebaydayz
7da7b9e5dd Correct PVDZ_plr_Save for player zombies 2016-04-20 17:00:38 -04:00
ebaydayz
14dacf269c Add back player zombie faces 
Also moved player zombie attack from 'v' key to an addaction with
localized string.
 2016-04-20 14:50:12 -04:00
ebaydayz
9d4bd9221a Add exception in REsec for death messages 2016-04-20 11:53:30 -04:00
ebaydayz
f0c46a0764 Use Epoch player_harvest instead of player_chopWood 2016-04-19 16:51:20 -04:00
ebaydayz
ba480fb218 Improve some RPT logging 2016-04-19 14:01:38 -04:00
ebaydayz
58d54a8ce0 Add A and D keys to interrupt 2016-04-19 13:05:59 -04:00
ebaydayz
4d5dc060d2 Fix tame_dog errors 
Tame_dog_old and player_tameDog are not used.
 2016-04-18 21:49:27 -04:00
ebaydayz
464c26861c Add back Epoch animals in sched_animals 
player_animalCheck is not used
 2016-04-18 14:19:41 -04:00
ebaydayz
2f45d46d05 Remove legacy stream_location functions 
These are no longer used for anything.
 2016-04-17 21:23:25 -04:00
ebaydayz
e13b5dbdff Fix RoadFlare RPT error 
Fixes:

Error in expression <ehicles","WeaponHolder"], 50];
{ [_x,0] spawn
object_roadFlare } count (allMissi>
  Error position: <spawn
object_roadFlare } count (allMissi>
  Error Type Script, expected Bool
 2016-04-17 20:10:54 -04:00
ebaydayz
a994e7107c Fix readd of halo keydown eventhandler 2016-04-17 18:44:58 -04:00
ebaydayz
f38c6ff72e Fix server FPS logging 
No need to have a config variable for this, admin can easily change it
in server pbo.
 2016-04-17 17:11:49 -04:00
ebaydayz
59a4459809 Fix spawn marker count for non-cherno maps 2016-04-17 15:32:47 -04:00
ebaydayz
a3cfdd4058 Small changes to temperatur for QF11 (Testing) 
df0164b53c

1cd6f5f06a
 2016-04-17 11:24:39 -04:00
ebaydayz
3c4e1fa5a2 Add handling of multiline messages for now 
Eventually dayz_rollingMessages will be updated to use cutRsc instead of
titleText.
 2016-04-16 19:33:29 -04:00
ebaydayz
5157228e67 Update all cutText to dayz_rollingMessages 2016-04-16 15:47:49 -04:00
ebaydayz
993ce14da6 Remove unnecessary key event handler reset 
No need to reset the key event handler again in player_monitor.fsm, it
is already done onPreloadFinished.
 2016-04-15 20:16:13 -04:00
ebaydayz
110befba7f Swap bloodbags in traders and loot for classic system 2016-04-15 16:11:17 -04:00
ebaydayz
577892c40e Roll back to old dayz_objectUID2 
1.8.7 dayz_objectUID2 seems to generate keys that are too long for the
Epoch hive. So, we will keep the old method for now.
 2016-04-13 18:41:36 -04:00
ebaydayz
3d4b15517c Fix combat mode display on classic UI 2016-04-13 14:42:10 -04:00
ebaydayz
652ca51c2c Update combattimeout from time to diag_tickTime 
Also organized change log
 2016-04-12 21:04:17 -04:00
ebaydayz
27d57283a0 Fix server position sync after knockout 
All DayZ Mod Development commits since 1.8.7 release (Jan. 24) have now
been applied.
 2016-04-12 14:51:22 -04:00
ebaydayz
6d3bf3b855 Fix object_monitorGear with R3F disabled 2016-04-09 20:36:36 -04:00
ebaydayz
99d9f12add Add back R3F weight text in object_monitorGear 
The size of control 1001 was shortened in 1.8.7, so it is better to set
it on control 156. The initial text is always blank for that control
when cursorTarget isNull. Showing the weight carried when looking at an
object or vehicle is not necessary. It cuts off with long vehicle names
anyway.
 2016-04-07 20:32:34 -04:00
ebaydayz
6a42ef40d3 Disable TownGenerator and plant spawner by default 
Junk and plant spawning is disabled by default. It can be enabled via
dayz_townGenerator config variable and positions blacklist (for trader
cities, etc.).

The trader objects spawn code was consolidated to functions.
 2016-04-06 19:44:00 -04:00
ebaydayz
03b8c38c6a Add new items to config traders 
Duplicate categories are now marked instead of being listed multiple
times. This makes the configs far easier to maintain. Admins can still
expand each individual category for further customization.
 2016-04-06 13:05:35 -04:00
ebaydayz
666ace6d54 Cleanup duplicate and unused strings 
Cargo count is shown at the top of the gear menu now
 2016-04-04 16:58:59 -04:00
ebaydayz
eda82156be Move CfgServerTrader to dayz_code\configs folder 
Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.
 2016-04-04 13:10:01 -04:00