Commit Graph

187 Commits

Author SHA1 Message Date
ebaydayz
6c2f5448e1 Update a Russian translation
e009aee8de (commitcomment-20629913)
2017-01-26 14:34:21 -05:00
ebaydayz
fc40845583 Remove a duplicate translation 2017-01-25 13:45:09 -05:00
A Man
e009aee8de Update stringtable.xml (#1882)
* Update stringtable.xml

* Move new safe zone strings down to epoch package
2017-01-18 19:06:32 -05:00
icomrade
490fb90303 Disallow salvage in DZE_SafeZonePosArray locations
by request of JohnnyBravo666 on the epoch forums
2017-01-18 16:43:23 -05:00
ebaydayz
5c8ae96887 Add military flashlight attachments
Vanilla commit:

b6ba294b70
2017-01-09 20:19:01 -05:00
oiad
6f072982c3 Add harder penalties for wrong combination on doors, More spelling mistakes. (#1847)
* More spelling mistakes

Further to commit:
0e938ba8f3

* Add harder penalties for wrong combination on doors

This adds a variable (DZE_doorManagementHarderPenalty) to make attempts
at code breaking doors harder. This will exponentially increment the
time between attempts or if you set it to false will make it 5 seconds
between attempts.

Unlike the original (that was useless TBH) this will actually lock out
the combo lock UI until the timer is set.

Will reset completely after 120 seconds.

* Add German translations

* Resolve merge conflict

* Resolve merge conflict
2017-01-03 16:39:05 -05:00
ebaydayz
e33519ffd4 Readd changes from #1836
I accidentally removed these when resolving merge conflicts with 854c41c
.
2016-12-30 14:16:18 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -05:00
ebaydayz
0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
ebaydayz
d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -05:00
ebaydayz
66f87fac46 Move two localizations to epoch package in stringtable
Vanilla doesn't refund modulars when deconstructing, Epoch does. Also
upgrade was moved to UserActions of dayz_buildings in vanilla.
2016-12-06 13:59:25 -05:00
ebaydayz
dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz
baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
A Man
90453641d4 adding 3 missing german strings (#1804) 2016-12-01 12:46:09 -05:00
ebaydayz
4ffa25adf2 Improve rejoined group message grammar 2016-11-30 11:58:29 -05:00
ebaydayz
416fdbc4ab Improve filterCheats and VON block
Filter cheats is now added to the main options menus that needed it.

It is not needed on the map (display 12) because KeyDown for display 46
also fires when it is open. So filterCheats was firing twice (once on
each display) in that case.

KeyDown does not fire on display 63 at all
regardless of whether PTT or VON is held down, toggled or chat open.
Keydown does fire on 55, but only after the mic icon is locked on, so it
is of limited use. MouseButtonDown does not fire on 55 or 63. So it is
useless to add to those displays. You can confirm this with:
(findDisplay 63) displayAddEventHandler ["KeyDown","systemchat
'fired';"];

Filter cheats is now only checked on display 46 when a
voice, channel, or cheat key is pressed instead of on every key press.
This still works 100% of the time for blocking cheat input. For
performance reasons it's probably not worth checking all the conditions
in filterCheats with every key press on display46 just for the VON
block. Doing so covers some edge combination bind cases better, so it
may be worth considering again if no better alternative is found. For
now this solution is good enough to cover the majority of cases without
slowing down the keyhandler during normal usage.

The VON message now
tells you exactly which channel block you triggered instead of listing
all of them.

Fixed issue mentioned in 52c9c7c with VON getting stuck on when using a
double tap keybind.

Tested:
1. Talk in side with regular/combo/mouse bind
2. Change channels
while mic is locked on with regular/combo/mouse bind
3. Change channels
with Up/Down arrows while chat is open.
4. Trying all cases in steps 1-3
with a dialog open.

It is possible to bypass the VON block with some different control
settings and combinations of the above, but for default controls and
common usage it works the majority of the time.
2016-11-29 23:44:28 -05:00
ebaydayz
6abd92034a Make bloodbag interrupt message more accurate
The blood bag isn't actually removed in any of the three cases this
message is used.
2016-11-27 12:21:44 -05:00
A Man
560e8bce82 german string update (#1802) 2016-11-26 21:26:59 -05:00
ebaydayz
6cdc0a51c9 Add extra animations to ArmoredSUV, MV22, UH1Y 2016-11-26 21:14:12 -05:00
ebaydayz
b6d88b1329 Update vanilla building
Vanilla commits:

9b2092c9f7

674624d122
2016-11-25 16:25:26 -05:00
ebaydayz
6aa0cb8215 Update vanilla building
Vanilla commits:

a351c810d5

dfc46eff7b
2016-11-21 14:57:02 -05:00
ebaydayz
3aad4b61e9 Move some addActions to config UserActions
Should improve client FPS while still allowing conditions and scripts to
be customized.

Some special vehicles like MV22, UH1Y, etc. have UserActions overwritten
in their configs, so please let me know if you find any others that do
not get the option to repair or salvage because UserActions is
overwritten in their config. I think I got them all.

Vanilla commits:

a8c4238c0c

350d73abe1
2016-11-20 19:47:21 -05:00
ebaydayz
0525763ffb Update German translations from #1798
Submitted by @DAmNRelentless and reviewed by @AirwavesMan
2016-11-18 19:46:24 -05:00
ebaydayz
da5285e0ec Update damage handler diag_log
Vanilla commit:

21864d065c
2016-11-18 16:36:37 -05:00
ebaydayz
f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz
e506a97ad6 Remove redundant check in player_onPause
Switch executes the first case that matches and does not check any more
cases after that. So these conditions are always met when this case is
checked.
https://community.bistudio.com/wiki/switch_do
2016-11-12 21:22:11 -05:00
oiad
be1fb51fe8 player_onPause fixes (#1796)
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
2016-11-12 20:56:58 -05:00
A Man
6ac9c879f0 Update german strings (#1795) 2016-11-12 14:44:05 -05:00
ebaydayz
fe773bd571 Send notfication to player kicked from group 2016-11-11 15:46:44 -05:00
oiad
310fef893d Hotwire vehicle changes
Adds a localization for hotwire kit working
Updates localization for hotwire kit failing
Adds medic animation/sound and zombie notify
2016-11-11 10:45:07 +13:00
ebaydayz
32b9c84784 Add notification messages for group changes 2016-11-08 16:39:50 -05:00
ebaydayz
01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz
e0c06692e2 Update scrollbar color in lobby and player list
To match 6732e5c
2016-11-07 15:21:56 -05:00
A Man
1223e08d79 Fixing string is not displayed correctly (#1791)
* Fixing not shown string

* Fixing not shown string
2016-11-04 20:42:24 -04:00
oiad
cbe51bcad1 SQL Update fix for MeleeHatchet_DZE -> MeleeHatchet, localization fix (#1790)
Makes MeleeHatchet_DZE for converted bases properly get renamed
Changes Destroy to Remove since you're not completely destroying it
2016-11-04 20:15:31 -04:00
A Man
106b90dbfa Update for german strings (#1789)
* Update for german strings

* Update stringtable.xml
2016-11-04 19:24:42 -04:00
oiad
497b065663 Localization changes/additions. (#1787)
* Localization changes/additions.

Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.

* Toolbox change

Update camonet removal to 10m instead of 5m

* Safe zone no building near/blacklisted buildings no building near

Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.

* typo

fix typo

* Safezone/blacklisted changes

As per requests.

* Rework

Rework

* Remove unused variables

as per subject

* Misc changes

Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces

* rework

rework
2016-11-04 12:08:47 -04:00
A Man
560580b0a2 Removing 2 old rightclick actions, shorter german text (#1786)
* Removing old code

Build Sandbag Fence is not longer used since the rightclick action to build a sandbag.

* Removing old code

Old code "remove tank trap" is not longer used since we have the scroll action for that.

* Update Prop_Defs.hpp

* Cutting some strings, removing old strings

* Update stringtable.xml
2016-11-01 15:10:59 -04:00
A Man
da4bf5d9da New german strings 2016-10-31 22:44:46 +01:00
ebaydayz
f21b5b74a7 Add systemChat message when a new player joins the group 2016-10-31 17:30:03 -04:00
ebaydayz
866358e4d0 Add launcher handling to advanced trading 2016-10-31 13:07:07 -04:00
ebaydayz
cd48b883a7 Remove unused localization for maintain 2016-10-30 16:23:55 -04:00
ebaydayz
25d6b6e448 Increase DZ_BlackScreen resource layer
Prevent rolling messages from showing over the top of it.

Also fixed grammar typo @oiad
2016-10-30 15:34:24 -04:00
ebaydayz
b2d668812b Update change log 2016-10-30 14:54:20 -04:00
oiad
b1171c5f9b player_wearclothes changes, string changes and maintain area moving (#1783)
* player_wearclothes changes, string changes and maintain area moving

Adds 2 toggles for admins to modify:

DZE_backpackRemove forces the player to drop his/her backpack when they
change gear.
DZE_maintainCurrencyRate modifies the amount of worth each item is worth
to maintain.

Changes the error message in player_wearClothes to tell the player why
they can't change gear yet
Remove some debug lines that spam RPT

* Rework

Rework as per @ebaydayz

* Rework

Rework
2016-10-30 14:11:54 -04:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
oiad
1c7e96a0ff Advanced trading modifications, maintain_area modifications (#1780)
* Advanced trading modifications, maintain_area modifications

This lot of changes brings forth the following:

Sets up a "default" set of compiles that are the minimum needed for
maintain_area.sqf and custom scripts to utilize the gem based currency
that @icomrade added.

maintain_area.sqf: This will now utilize the gem based currency system.

Removed the redundant Z_Vehicle and replaced it with the Epoch built in
DZE_myVehicle

z_at_buyItems: Code tidying and optimization

z_at_checkCloseVehicle: Tidied up the code since removing Z_Vehicle
allowed us to remove some now useless code.

z_at_getVehicleItems: Removed the nearestObjects check for your vehicle
since we now do z_checkCloseVehicle on Advanced trading start up.

* Advanced trading missed redundant variables

As per description

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Revert "Advanced trading rework"

This reverts commit a589bd19b9.

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Advanced trading rework

More rework

* Remove single currency add/remove coins functions

at request of @ebaydayz.
2016-10-28 19:29:04 -04:00
A Man
aa267bda2c Adding many new strings (#1781)
* More Stringtable updates

Ive added and corrected more german strings. Some german strings were too long. Lots of building items needed a localization. Adding after request the Winter Ghillie Suit localization for Namalsk compatibility.

* Update for new localization

* Update for localization

* Update for new localization

* Update again

* localization update

* Update stringtable.xml

* Update Doors.hpp

* Update ModularBuilding.hpp

* Update stringtable.xml

* Update stringtable.xml

* Update Doors.hpp

* Update Prop_Defs.hpp
2016-10-28 15:05:35 -04:00
ebaydayz
f770b0a85d Add group system
Initial commit, not tested in multiplayer yet. Some revisions still left
to do.
2016-10-27 16:06:49 -04:00
oiad
bef2506653 Advanced trading fixes, server_handleSafeGear human readibility (#1777)
* Advanced trading fixes

Fixes a few issues and a dupe with advanced trading as well as some
localization of where a vehicle key is going.

Z_at_buyItems: Now adds localization for the key getting added to your
toolbelt, backpack and vehicle, this stops players thinking they didn't
get a key when infact it was added to their backpack/vehicle.

Z_at_canAfford.sqf: This fixes a dupe from a bad copy paste for whomever
wrote this script, it was using _backpackMoney in the
z_allowTakingMoneyFromVehicle part, changed to the proper variable
_vehicleMoney.

z_at_fillBuyableList.sqf: this fixes a bug where a vehicle would show
green even when it isn't local, just basically added more checking to
make sure the vehicle it's making green in the list is a) local, b)
alive and that the typeOf == _name.

z_at_logTrade.sqf: fixes some tidyness.

advancedTrading/init.sqf: adds a z_checkCloseVehicle call otherwise even
with Z_AllowTakingMoneyFromVehicle = true it will not get currency from
your vehicle until you clicked on the "Vehicle" tab.

dayz_server/server_tradeObject.sqf: More tidying as per the
z_at_logTrade and removes the useless Player:, as it is obvious a player
has bought something not an AI.

dayz_server/server_handleSafeGear.sqf: Makes the diag_log at the end
more human readable with GPS coordinates as well as the lock code for
the safe or the lockbox.

* advanced trading fixes. I hate you github

WHY U GET MISSED?? STUPID GITHUB.

* snappoints changes

Fixes the issue @SmokeyBR reported
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-253864795
Adds all floor types to snap list for all barriers so you can snap a
sandbag etc to a floor instead of manually lining it up
2016-10-25 13:10:48 -04:00