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,965 Commits 20 Branches 18 Tags
5f054393e5e09323d9b5813a9b2139225f93708d
Commit Graph

3965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ebaydayz
c4ed93959e Better combat log detection method on server 
"noatlf4" variable is set on server through PV from damage handler. No
need to worry about diag_tickTime difference between clients and server.
 2016-05-02 15:12:43 -04:00
ebaydayz
c951680ffd Added new Login Processing check for Ghost mode. 
Players who alt f4 while in ghost mode should no longer lose position
updates.

Vanilla development commit:

24194861aa
 2016-05-02 14:48:15 -04:00
ebaydayz
99cd64c73b Removed Logging from Temperature system. 
Vanilla development commit:

166ae0219c
 2016-05-02 14:28:58 -04:00
ebaydayz
dfe68c7824 Removed Achievements from sync. 
Vanilla development commit:

09313b2376
 2016-05-02 14:26:35 -04:00
ebaydayz
4df9a1e00b Fix wrong translations from #1689 @Adaptivity 
@Adaptivity
 2016-05-02 14:15:06 -04:00
ebaydayz
adff6440ed Fix errors from #1689 localization 
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
 2016-05-02 14:03:41 -04:00
Anton
2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
ebaydayz
765b035764 Add note about PVDZ_plr_Save 2016-05-02 11:23:50 -04:00
icomrade
16fe17645f Don't redefine vehicle EH 
doing so breaks the destruction fix
 2016-05-01 22:10:38 -04:00
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