Commit Graph

46 Commits

Author SHA1 Message Date
ebaydayz
67f6d86440 Use smaller sound muted UI icon and better alignment
Vanilla development commit:

6aba95d251
2016-07-21 14:58:03 -04:00
ebaydayz
9ea9af3272 Change player list and lobby icons to grey instead of blufor
Vanilla development commits:

36337e3c08

3a2d3ac20d

Connecting and normal icons are the same so players can not tell when
someone is in the lobby.

Also removed:
- player name and rank text shown in the top right of diary
- "Current task:" text shown above player list
- "Pool:" text shown in lobby
2016-07-21 14:50:02 -04:00
ebaydayz
f314a39e43 Add better sound muted status UI icon and background
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
2016-07-20 15:24:31 -04:00
oiad
06c8fef001 Various changes (snappoints, dooraccess and fn_selfactions) (#1706)
* Changes to snappoints.hpp fixes issues with metal floors snapping to a cinder wall. Cinder to cinder will create small gaps and then metal floors won't properly line up unless you start with a metal floor then snap cinders. By making both the same snap size, this fixes this issue.

Changes to doorAccess.hpp makes it possible to unlock doors and downgrade them again. It was setting dze_lock_door to the players UID instead of the door code as it should so the conditions would not be met in fn_selfActions to give you additional access.

Changes to fn_selfActions refine access to certain points more accurately (the way they should be IMO)

1) Adds a check to see if the building item can be upgraded anymore before presenting the menu, this stops you receiving the "upgrade item" action even when the item is fully upgraded
2) Adds access checks to the maintain individual item menu action so only item owner, plot owner and plot friends will see it, same with the above upgrade item menu action, this will also stop you receiving this when you are on someone elses plot that you may not have access to (I.e it's useless)
3) Changes modular building access to be item owner, plot owner and plot friend to remove modular items.
4) Changes plot managment action menu so item owner, plot owner and plot friend can access it. I thought there could be a situation where item owner != plot owner. This can be reverted if that is never possible.
5) Changes downgrading so only item owner, plot owner and plot friends can access it. If someone has the door code that doesn't mean they should be able to remove the combo (IMO)

* typo.
2016-07-09 12:28:39 -04:00
ebaydayz
cc2918989e Remove duplicate status UI icon files 2016-06-25 10:32:46 -04:00
oiad
801145d664 Advanced trading fixes/modifications (#1698)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading rework

Fixes all problems @ebaydayz
2016-06-21 20:18:41 -04:00
Bruce-LXXVI
5e53a71e88 Pullrequest/door management (#1694)
* Added doorManagement

* Rename FNC_check_owner --> FNC_check_owner_friends

* Fixed typo

* Fixed bug in FNC_check_owner_friends which allowed every user to manage
every plot and door.

* Removed unused DZE_doorManagementHarderPenalty from configVariables.sqf

* Now checking if _playerUID is in _friendlies for both cases.

* DZE_plotforLife should be DZE_permanentPlot

* Fixed case where DZE_permanentPlot is false.

* Forgot to add STR_EPOCH_CANCEL

* Changed translations to suggested string by ebaydayz.

* Renamed EyeScanner to DoorAccess.

* Reworked access rights for door management.

* DZE_doorManagementMustBeClose = true; //Players must be within 10m of
door to be added as a door friend.

* Fixed copy-paste error.

* Replace count with if

* Remove redundant test.

* Also replaced count in door management admins check.

* Change plotManagement and doorManagement to be consistent to
DayZ_UseSteamID (get UID from FNC_GetPlayerUID).

* Use _playerUID and _characterID more consistent.

* Added german translation to
STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST.
2016-06-15 18:22:01 -04:00
ebaydayz
9d51fb2736 Fix plot management buttons color and text alignment
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
2016-05-17 22:02:21 -04:00
ebaydayz
dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -04:00
ebaydayz
bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -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
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -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
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
icomrade
47070ae4f5 Move advanced trading configs to mission
allows customization by server owners
2016-04-28 19:30:43 -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
5157228e67 Update all cutText to dayz_rollingMessages 2016-04-16 15:47:49 -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
426e97dda7 Remove dayz pbo
The only difference from the vanilla dayz pbo is the DeathScreen change.
It is better to do that in dayz_code RscTitles. Then the dayz pbo does
not need to be maintained in this repo.
2016-04-01 12:06:56 -04:00
ebaydayz
69091965a1 Merge new MultiPlayerSetup and autojoin 2016-03-30 17:01:28 -04:00
ebaydayz
91f9b3e33b Make UI toggleable between three options
Admin can choose vanilla, classic epoch or classic epoch dark.

dayz_hungerThirst was replaced with dayz_NutritionSystem
2016-03-29 19:54:19 -04:00
ebaydayz
e2e6e79394 Minor formatting cleanup 2016-03-21 17:58:23 -04:00
ebaydayz
155e5e5616 Remove more unused strings
Also add back call to fn_gearMenuChecks
2016-03-05 01:16:30 -05:00
icomrade
61c64cb14a Fix Merge Conflict 1 2016-03-03 22:09:38 -05:00
ebaydayz
479097e7a8 1.8.7 player_switchWeapon updates 2016-03-03 21:31:32 -05:00
ebaydayz
e660704f97 Add journal and preliminary strings for crafting
The journal is now functional. Preliminary strings are added for the
1.8.7 crafting system, but it is disabled for now.

I've messaged @marceldev89 (ziellos2k) and @AlbyBDPK on the DayZ forums
to ask permission to use fn_updateCraftUI, player_checkRecipe and
player_craftItemGUI. Are you guys okay with us including these in DayZ
Epoch 1.0.6?
2016-03-03 20:11:11 -05:00
icomrade
dfb7bba743 CFG WEAPONS DONE 2016-02-21 13:09:16 -05:00
icomrade
da59f314a0 Fix Timeout Display for Real 2016-02-18 22:40:34 -05:00
icomrade
47b039de74 unused code 2015-12-29 18:02:30 -05:00
icomrade
546e59e959 auto login
I hate sitting in the lobby for the full 90 seconds before loading.
- Default login delay is 10 seconds, can be set in the mission
- Players cannot deselect or change character slots
- Players can click OK or disconnect before timeout
2015-12-29 17:59:40 -05:00
[VB]AWOL
335dd6cba1 readded RscStructuredText for tag system... 2014-06-22 12:48:17 -05:00
[VB]AWOL
a6953a69c2 should fix #1291 2014-06-02 13:46:55 -05:00
[VB]AWOL
05e0df06aa comment out gui backgrounds 2014-05-09 14:24:37 -05:00
[VB]AWOL
9483ed817f remove background of icons. simple = better 2014-05-07 10:16:12 -05:00
[VB]AWOL
d4837bebca fixed #1161 and combine bars button 2014-03-29 15:21:21 -05:00
[VB]AWOL
a1fe8ff336 added text message to combine bars 2014-02-23 09:56:34 -06:00
[VB]AWOL
9b90f8e2af larger button for combine bars 2014-02-23 09:51:14 -06:00
Florian Kinder
a3885ac187 Added german translation 2014-02-20 21:23:49 +01:00
[VB]AWOL
1d113ab7af add combine bars option 2014-02-19 15:42:54 -06:00
Florian Kinder
ad22c7df04 Updated Displays
Disabled new gear system
2014-02-18 23:51:38 +01:00
Skaronator
5a82128500 Sort Config 2014-02-04 16:46:11 +01:00
Skaronator
faaa645922 Include SpawnSelecter Config by Default 2014-01-24 20:52:33 +01:00
Skaronator
e42a9ab689 Cleanup Files, sort files etc. 2013-11-16 20:18:38 +01:00
Skaronator
8fdb9a9b7d SpawnSelecter and PlayerUI cfg in a #ifdef 2013-11-16 15:02:42 +01:00