W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-23 04:22:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,973 Commits 20 Branches 18 Tags
1eeaa3e792b5eca59d336b3d4fbe677fba909e8c
Commit Graph

461 Commits

Author SHA1 Message Date
ebaydayz
1eeaa3e792 Add epoch_generateKey function 2016-05-03 13:35:50 -04:00
ebaydayz
2f98fc0451 Prevent MeleeMagazines being counted by BIS_fnc_inv 2016-05-03 13:35:50 -04:00
icomrade
3c27f76c7c use self actions to spawn plot radius, fixes #1566 2016-05-02 23:06:50 -04:00
icomrade
5f054393e5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
 2016-05-02 20:44:50 -04:00
icomrade
575682b7c8 Add A Plot For Life modification by RimBlock 
A Plot For Life also includes Precise Base Building by Mikeeeyy. Precise
base building has no variable to switch it on or off, I don't think it
should.

Seems to work well enough, this may conflict with the duplicate object
uid fix, it appears to spam my server rpt.
 2016-05-02 20:42:37 -04:00
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz
8d82693c1b More Advanced Trading localization 
Russian translations provided by Epoch forums user koms:
http://epochmod.com/forum/profile/33066-koms/
 2016-05-02 17:32:27 -04:00
Anton
2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
ebaydayz
f848305b50 Update Advanced Trading with category reuse support 
Tested and working ok.
Updating with change from:

03b8c38c6a
 2016-05-01 19:02:29 -04:00
ebaydayz
66408ded24 Prevent trader menu action showing on players 
Fixes bug where player wearing a skin in serverTraders would show trader
menu action on him.
 2016-05-01 17:08:55 -04:00
icomrade
d6236dcb91 Fix improper total price in advanced trading 
Also sort gems by value when giving total price.
 2016-05-01 16:24:38 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
ebaydayz
b4cd47f5b5 Update PVDZ_plr_save in advanced trading 2016-05-01 13:21:17 -04:00
icomrade
1e65f7a959 Plot Management cleanup + improvement 
New compile DZE_GetPlotFriends

DZE_PlotManagementAdmins allows admin management of plot poles and
buildables near poles

DZE_MaxPlotFriends allows servers to allow more than 6 friends on a pole
at once
 2016-05-01 13:20:21 -04:00
icomrade
9e2728af07 Merge pull request #1686 from Bruce-LXXVI/pullrequest/plotManagement 
Pullrequest/plot management
 2016-05-01 11:05:54 -04:00
ebaydayz
6187006ece Remove duplicate fnc_inString 2016-05-01 11:01:26 -04:00
ebaydayz
f44901db1b Prevent spamming change clothes 
Vanilla development commit:

98733d37ab
 2016-04-30 16:48:05 -04:00
icomrade
83694a452e Gem Trading mostly finished 
Sometimes displays incorrect total price in advanced trading menu.
 2016-04-30 11:17:41 -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
a86b28b0a7 Fix spawn height for boats, and buying bikes 2016-04-29 00:19:22 -04:00
icomrade
bc0d5027f5 Adv. Trading handle other and free vehicle types 
Allow players to sell vehicles without keys and add boat and bike
trading classes to buy/sell
 2016-04-28 23:40:28 -04:00
ebaydayz
4b9d6df0bb Finish localization support 
Vanilla development commit:

33c6cafbcb
 2016-04-28 22:13:48 -04:00
ebaydayz
2b61ce850a Allow sleeping at all tents 
Vanilla development commit:

e647be13c1
 2016-04-28 20:30:18 -04:00
icomrade
55f3a9dc79 Vehicle selling for advanced trading 
This should work fairly okay but I expect there may be a couple exploits
and glitches
 2016-04-28 18:35:03 -04:00
ebaydayz
d2ba027863 Perform build checks before removing magazines 
Also allow tents and stashes to be built without a plot pole (same as
1051).
 2016-04-28 15:32:32 -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
b5af74b72b Add Vehicle Purchasing to Advanced Trading 
Allows 1 vehicle purchase at a time.
Vehicles will still spawn inside each other if one is already parked on
the pad.
 2016-04-27 22:04:47 -04:00
icomrade
17c31a5f21 Fix buying from backpacks/vehicles dupe 2016-04-27 19:29:03 -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
ebaydayz
d63f48af85 Fix pond detection in player_goFishing 
Fixes #1678
Fixed for vanilla too:

8a18fe957c

Ponds and lakes were not being detected at all, neither on foot nor in a
boat.

Tested land (failure), pond, lake and shore both on foot and in a boat.
Working as intended now.
 2016-04-25 21:53:31 -04:00
icomrade
7db6f63935 Update string for gutting zombies 2016-04-24 21:15:26 -04:00
ebaydayz
1879fb8707 Fix siphon fuel 
ItemJerrycanEmpty no longer inherits from ItemJerrycan
 2016-04-22 17:39:52 -04:00
ebaydayz
6ea1df14cf Add missing string for infection death 2016-04-21 19:23:49 -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
5308445f4c Update vanilla player_mineStone 2016-04-19 17:01:07 -04:00
ebaydayz
f0c46a0764 Use Epoch player_harvest instead of player_chopWood 2016-04-19 16:51:20 -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
11741fa710 Update player_tameDog raw meat names 2016-04-18 13:36:09 -04:00
ebaydayz
d46eb13267 Fix redirect to vanilla player_craftItem 2016-04-17 22:51:10 -04:00
ebaydayz
59a4459809 Fix spawn marker count for non-cherno maps 2016-04-17 15:32:47 -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