W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,952 Commits 20 Branches 18 Tags
51308c5b32428bf451704f9c0852b5d7e9469b54
Commit Graph

3952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz
51308c5b32 Fix typo from #1688 
Also remove a duplicate string
 2016-05-01 21:14:38 -04:00
Bruce-LXXVI
72132aa28a Pullrequest/german translation (#1688) 
* Added and reworked german translation.

* Translated AdvancedTrading german strings added by iComrade.

* Changed some german text to fit better.
 2016-05-01 21:04:29 -04:00
icomrade
ad4f3d7556 Kill and eject players from all vehicle types except boats 
The code in the CH53 SFX file must remain there.

Boats/ships do not properly call the destruction EH files so this fix
doesn't work for them. maybe a killed event handler must be added from
the server?
 2016-05-01 21:03:09 -04:00
icomrade
61ffe26fb8 More magazines taking too many slots 2016-05-01 21:00:00 -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
db62ed2019 Only check isPlayer if isMan in fn_selfActions 
Better method than:

66408ded24
 2016-05-01 17:24:21 -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
icomrade
3d3c3abe8c remove unused CA folder 2016-05-01 16:24:05 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
icomrade
d25ad694d8 Fix wrong bloodbag types spawning 2016-05-01 14:15:01 -04:00
icomrade
3f8d79b6ae Update Changelog 2016-05-01 13:41:58 -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
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
icomrade
ba751dad4a Fix Generator 
Not sure what differences BuiltItems will have as opposed to using the
SkodaBase class.

Switch Off/On are removed because they do nothing anyway (the start/stop
options are in fn_selfAction anyway)
 2016-04-30 19:04:52 -04:00
icomrade
deee47b703 Disable OK button before role is selected 2016-04-30 18:33:18 -04:00
icomrade
7a11b508e1 No building in trader 
string needs localization
 2016-04-30 18:05:58 -04:00
ebaydayz
f44901db1b Prevent spamming change clothes 
Vanilla development commit:

98733d37ab
 2016-04-30 16:48:05 -04:00
Anton
4e45b23f94 More work on localization support (#1687) 
fix stringtable.xml

more fixes

added missing $
 2016-04-30 15:54:31 -04:00
icomrade
6deb1a69f1 Tweak gem values 
Any value should work for gems.
 2016-04-30 11:31:12 -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
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
9e5d2f1038 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-04-29 16:48:16 -04:00
icomrade
8158245b83 Possible fix for #1645 2016-04-29 16:48:14 -04:00
ebaydayz
d95474b819 Update main readme 2016-04-29 15:06:34 -04: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
7f1b8db85a Fix MeleeMagazines showing in crafting UI 
Vanilla development commit:

f2e1623ba1
 2016-04-28 21:34:00 -04:00
icomrade
bc370475e5 Update ReadMe.md 2016-04-28 21:11:26 -04:00
ebaydayz
2b61ce850a Allow sleeping at all tents 
Vanilla development commit:

e647be13c1
 2016-04-28 20:30:18 -04:00
icomrade
9df5c5a156 Update test build 2016-04-28 19:38:25 -04:00
icomrade
47070ae4f5 Move advanced trading configs to mission 
allows customization by server owners
 2016-04-28 19:30:43 -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
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