Commit Graph

6543 Commits

Author SHA1 Message Date
ebaydayz 85869b32f1 Fix Adv. Trade secondary vehicle check
Forgot this one. See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/f503e530976a34c4ffb3ff136881423feb0c5cdb
2016-05-04 15:53:25 -04:00
ebaydayz f503e53097 Fix Adv. Trade nearby vehicle check detecting animals
Was getting "Buying in Rabbit" when one was nearby.

No need to check "AllVehicles", this is faster and will get all drivable
vehicle types.
2016-05-04 15:47:47 -04:00
ebaydayz c4d3f01f38 Don't show enter/leave text when changing clothes in trader 2016-05-04 15:08:19 -04:00
ebaydayz e6c5930415 Fix unit icon in Advanced Trading selling from gear box
Adds a nice icon of the unit in the top right below "Gear" text.
2016-05-04 14:39:40 -04:00
ebaydayz 800182f7e2 Fix can't buy backpack into vehicle with Advanced Trading
The typo here was causing all vehicles to return 0 for
transportMaxBackpacks.
2016-05-04 14:20:23 -04:00
ebaydayz 5043fafae4 Fix default currency display in Adv. Trading bag item info
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
2016-05-04 12:54:36 -04:00
ebaydayz 085b6d32f9 Enable R3F weight by default
Since we are keeping "everything takes up one gear slot" weight should
be enabled by default. Moved to init.sqf so admins can easily change it.

Also added RedRyder and Anzio_20 weight.
2016-05-04 11:23:50 -04:00
icomrade 8a361a1b44 Wrong order 2016-05-03 23:28:32 -04:00
icomrade e8abd8f403 Add percent damaged display for maintenance #1583 2016-05-03 23:25:25 -04:00
icomrade 51be8aa8a5 Fix reloading 2016-05-03 20:19:01 -04:00
ebaydayz ee70dd49d3 Prevent rags duping
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/31167114e79b7fbde063d543e3f225dc493261f7
2016-05-03 17:28:33 -04:00
icomrade 3f10228b95 should fix knockout issue with self bloodbag
issue most likely happened if you used a typed bag not matching your
blood type when the classic system is enabled.
2016-05-03 16:34:28 -04:00
icomrade 2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
icomrade fcb6d1ab26 Fix some items missing removal option #1135 2016-05-03 15:41:33 -04:00
icomrade cf29731620 Configurable weather effects 2016-05-03 15:21:38 -04:00
Anton 75ae8ad3c0 a couple localization updates (#1690)
* a couple localization updates

* fix merge conflicts

* fix

* fixes
2016-05-03 15:15:44 -04:00
icomrade 5cde6cba69 should fix undefined variable errors 2016-05-03 15:09:13 -04:00
icomrade 7bcc9f305f Configurable temperature effects 2016-05-03 14:31:20 -04:00
icomrade 6936a5dd24 Fix packing storage giving no refund 2016-05-03 14:02:57 -04:00
icomrade b0df4c7f51 Fix unlocking vehicles after adding plot for life 2016-05-03 13:50:59 -04:00
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 f8b3ba2105 Fix mistake from Plot for Life addition 2016-05-03 12:53:48 -04:00
icomrade c2ce8aaf8b better fix for CH53 and add toggle for #1198 2016-05-03 11:14:26 -04:00
icomrade ea8c14c5fb Fix #1187
keypadCancel returns false when a combo/keypad dialog is not open and
when reset by calling the code keyPadReset = {uiSleep 2; keypadCancel =
false;};

There is a 2 second delay which makes brute forcing very very time
consuming. Note there must be a delay when resetting the variable since
fn_selfactions will update so quickly it will display the
unlock/lock/remove option before onUnload is executed.
2016-05-03 01:19:36 -04:00
icomrade 3c27f76c7c use self actions to spawn plot radius, fixes #1566 2016-05-02 23:06:50 -04:00
icomrade 3c0573258a update changelog 2016-05-02 21:44:45 -04:00
icomrade eddcf02ab3 Precise Base Building fix 2016-05-02 21:06:44 -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
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:

https://github.com/DayZMod/DayZ/commit/24194861aa34e57a4ae6096c85db8aae02587314
2016-05-02 14:48:15 -04:00
ebaydayz 99cd64c73b Removed Logging from Temperature system.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/166ae0219cc415be56ee145020468cd047d40fe2
2016-05-02 14:28:58 -04:00
ebaydayz dfe68c7824 Removed Achievements from sync.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/09313b23769b056c5a7f3d34f37583b2e2c599b5
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:

https://github.com/EpochModTeam/DayZ-Epoch/commit/03b8c38c6a9a8473d75addcfec113193f7b2ec6c
2016-05-01 19:02:29 -04:00
ebaydayz db62ed2019 Only check isPlayer if isMan in fn_selfActions
Better method than:

https://github.com/EpochModTeam/DayZ-Epoch/commit/66408ded24c81df771d9f3eb55bb7dda4294dbc5
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