Commit Graph

3277 Commits

Author SHA1 Message Date
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
41324139eb Adding CanvasHut_DZ to DZE_isRemovable (#1785)
* Adding CanvasHut_DZ to DZE_isRemovable

CanvasHut_DZ had no remove option.

* Update Prop_Defs.hpp
2016-10-31 19:26:40 -04:00
ebaydayz
3572709697 Merge pull request #1784 from AirwavesMan/master
New german strings
2016-10-31 19:01:23 -04:00
ebaydayz
bff0e3281a Auto promote group leader after changing clothes 2016-10-31 18:11:28 -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
1b3ed13a47 Remove unnecessary check in damage diag_log
Vanilla commit:

e826a8bda9
2016-10-31 16:04:27 -04:00
ebaydayz
3a3413caf5 Allow tools to exceed transportMaxWeapons when buying in bag 2016-10-31 13:54:40 -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
064fa8c8d0 Only spawn wild dogs if dayz_tameDogs is enabled 2016-10-30 15:47:01 -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
abb0475d28 Use joinSilent instead of join 2016-10-30 13:54:55 -04:00
ebaydayz
6d8afc9d32 Revert "Send new group to server for update"
This reverts commit 3f83354066.
2016-10-30 12:50:37 -04:00
ebaydayz
3f83354066 Send new group to server for update 2016-10-29 18:38:53 -04:00
ebaydayz
c4ef6e3115 Hide showOnScreen for lock and unlock inside vehicle action 2016-10-29 17:06:47 -04:00
ebaydayz
92d6257b92 Updated humanity Regen when under 1
Vanilla commit:

8e844e2b63
2016-10-29 16:05:08 -04:00
ebaydayz
9a4afbfc43 Update vanilla maintain
Vanilla commit:

997b8bac9a
2016-10-29 15:56:47 -04:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
ebaydayz
fda831bf4f Consolidate redundant getPlayerUID in selfActions
Vanilla commit:

8c51a24956
2016-10-29 15:25:36 -04:00
ebaydayz
07525388a6 Hide group buttons on use 2016-10-29 15:08:46 -04:00
ebaydayz
127be2472d Add delay before group update 2016-10-28 21:24:03 -04:00
ebaydayz
dbb9e97efc Update group dialog 2016-10-28 20:10:18 -04:00
oiad
cf8e06bc8b Reduce client RPT spam
As per subject
2016-10-29 12:59:21 +13: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
98be67b59c Add safezone scaling to group dialog buttons 2016-10-27 20:16: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
icomrade
f92d84f720 Fix issue laying down near buildables 2016-10-26 16:58:06 -04:00
ebaydayz
c7d9741be4 Add height check for logout in air vehicle exploit
This prevents players who logout in grounded air vehicles from being relocated.
2016-10-25 18:48:54 -04:00
ebaydayz
84d549d0a1 Revisions for #1777 (#1778)
* Update z_at_buyItems.sqf

* Update z_at_buyItems.sqf

* Update z_at_canAfford.sqf

* Update z_at_fillBuyableList.sqf

All of this is already checked in z_checkCloseVehicle at startup. If Z_VehicleChanges between the time the menu is started and the buyable list is filled it's not a big deal, since it only affects the highlighted color.

* Update server_handleSafeGear.sqf

* Update snappoints.hpp

* Update z_at_buyItems.sqf
2016-10-25 13:59:56 -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
icomrade
56abe26b92 Fix combat in AH6 2016-10-21 12:09:51 -04:00
ebaydayz
6713c1cf70 Lower nutrition values for push plane
Vanilla commit:

81297c8e26

Now using the same as refuel.

It takes a lot of pushes to move the plane any significant distance
(usually 10-20).
2016-10-20 15:28:23 -04:00
ebaydayz
9689301b07 Hide show on screen text for Vehicle Locked and Destroy %1 2016-10-20 14:46:08 -04:00
ebaydayz
5e170029d0 Fix dayz_playerUID undefined in selfActions when target is not null at login
Selfactions can run before dayz_playerUID is defined in
player_monitor.fsm.
2016-10-20 14:34:48 -04:00
ebaydayz
74879c85a4 Update onPlayerDisconnect.sqf
Vanilla commit:

b103437918
2016-10-20 14:03:44 -04:00
ebaydayz
cf0ef07ade Fix process hit running twice
Vanilla commit:

604c1f0577
2016-10-20 13:00:58 -04:00
ebaydayz
b8aba38dca Fix humanity hit when crashing vehicle 2016-10-19 19:53:52 -04:00
ebaydayz
17c0661094 Increase crash damage scale 2016-10-19 18:29:25 -04:00
ebaydayz
8beba72cbb Remove unneeded check in toggle streamer mode 2016-10-19 16:02:43 -04:00
ebaydayz
d13aafcd0c Add streamer mode game options setting
The chat list does not appear to be toggleable on the fly because it is
a display with no accessible controls. Giving it an idd and using
closeDisplay did not work. So it needs to be manually set off screen in
its config or covered up.
2016-10-19 15:49:30 -04:00
icomrade
d116bfecb4 Should fix BIS_Effect eject/kill
excludes cars now
2016-10-19 13:23:44 -04:00
icomrade
606098a1e3 Fixes SetFace error 2016-10-19 12:45:35 -04:00
ebaydayz
869e95eb2c Fix wrong variable name in z_at_calcFreeSpace
I didn't catch this mistake before because _backpack was not in the private array, so it was still defined from the script that called this function. Thanks @oiad
2016-10-18 15:56:45 -04:00
ebaydayz
fffcf43bbb Spawn infectious waterholes locally on each machine
Vanilla commits:

2d47c7250c

94a0bac524

44b7114129
2016-10-17 16:49:24 -04:00
ebaydayz
228ac99eb1 Set body studied status globally so confirmed kill is only added once
7402b240df
ensures _source will always be a player, so it's no longer necessary to
check that.

Vanilla commit:

a8c9eaebe0
2016-10-17 16:11:54 -04:00
ebaydayz
1964a084ff Avoid sending humanity hit if source is local
We only want to send a humanity hit if the source is a remote player.
Note it's not necessary to check isNull since (isPlayer objNull) returns
false.

Vanilla commit:

7402b240df
2016-10-17 14:52:34 -04:00