Commit Graph

2859 Commits

Author SHA1 Message Date
ebaydayz a245690cae Use looser values for logout in air vehicle fix
Fixes problems with
https://github.com/EpochModTeam/DayZ-Epoch/commit/7b354e7d552546303d065d24fea6f76986115f47
2016-08-28 12:40:32 -04:00
icomrade 0887b80556 Fix server_monitor
thanks @Bruce-LXXVI
2016-08-28 12:10:01 -04:00
ebaydayz 7b354e7d55 Fix relog over base in air vehicle to get inside exploit
Tested over forest, regular terrain and water without issue.
2016-08-28 11:35:32 -04:00
oiad d6324723e9 Plot management force maintain option
This replaces the "refresh" menu option with a "force maintain" option.
Allows you to maintain the base even if it doesn't need it to either get
all your items in sync or if you are going away or similar.

Tested with:
dze_permanent plot true/false
z_singlecurrency true/false

Also fixes an undefined variable error in system_monitor that was
introduced
https://github.com/EpochModTeam/DayZ-Epoch/commit/8f58baf3f286454a9f398517dc4f1980bd4d5c8e
2016-08-28 20:13:25 +12:00
ebaydayz 755adc7798 Initialize CurrencyName in configVariables.sqf
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242927452
2016-08-27 15:09:49 -04:00
ebaydayz 04b6711822 Round humanity in journal
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/145ec00b76914597f4d7454ba09de83f44887ec9
2016-08-27 10:11:49 -04:00
ebaydayz 3f27bef1e3 Add version define in config.cpp
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/75ff017b539f17d40bc1e6c1bf518d0b7a3a5cb4
2016-08-27 10:09:55 -04:00
ebaydayz f2c39e0038 Fix wrong _name variable in server_onPlayerDisconnect
My mistake from #1753, name is already passed from onPlayerDisconnected:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/init/server_functions.sqf#L141
2016-08-27 09:48:14 -04:00
Niklas Wagner 65593be995 Add German String (#1755) 2016-08-27 14:38:33 +02:00
oiad f838739975 Supply crate localization fixes
Extends the displayName RSC width to the same as the description (Not
sure why this was so small, it truncated longer display names)
Added localization strings for all the supply crates so they were easier
to distinguish in the gear menu.
2016-08-28 00:02:27 +12:00
icomrade 95310b9000 Re-add observer to UH1Y and AH6X
This fixes config errors for unknown animation sources for both
vehicles. The turrets do not have thermal capabilities and this restores
the missing co-pilot/observer seat in the UH1Y. Also I can't seem to get
the turret on the AH6X to rotate, but if someone knows how please leave
a comment or commit the changes. there's currently no overlay for the
observer of the AH6X since it can't move I feel it's limited enough
without an overlay like the UH1Y.
2016-08-26 15:21:03 -04:00
ebaydayz ae329db599 Add TurnLeft and TurnRight actionkeys to interrupt
Fixes #1753
2016-08-25 17:42:24 -04:00
ebaydayz c2b16f0828 Consolidate DZE_ActionInProgress and r_action_count to one variable
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
2016-08-25 15:38:27 -04:00
ebaydayz a0973f12a1 Minor improvement to diag_log 2016-08-24 14:02:05 -04:00
ebaydayz a8e2ce07b5 Optimize some createVehicleLocal
https://community.bistudio.com/wiki/Code_Optimisation#createVehicle.28Local.29
2016-08-24 13:34:11 -04:00
ebaydayz 56d63f608a Comment out CfgLoot include in configFile
No need to load twice.
2016-08-24 12:50:20 -04:00
ebaydayz 632f70482e Merge pull request #1752 from AirwavesMan/master
Better Cessna display names
2016-08-23 19:38:38 -04:00
ebaydayz b4b8d3dc00 Remove DayZ_UseSteamID variable
Forgot to remove with
https://github.com/EpochModTeam/DayZ-Epoch/commit/134a6142555dfa04c1596d3e660fc7455e8c2937
2016-08-23 19:31:59 -04:00
ebaydayz 93d152209a Use distance > 0 instead of BIS_fnc_areEqual
This is faster and actually works.
2016-08-23 19:24:41 -04:00
ebaydayz 8af3d001ba Revert "Add faster array compare function"
This reverts commit d7cc4be585.
2016-08-23 18:22:06 -04:00
A Man 454583a461 Better Cessna display names 2016-08-24 00:11:22 +02:00
ebaydayz a323f453d2 Make minor change to fn_waitForObject.sqf 2016-08-23 17:49:53 -04:00
ebaydayz 134a614255 Remove FNC_getPlayerUID
It's been over two years since it was added. All servers should be
updated to steam ID by now.
2016-08-23 15:40:26 -04:00
ebaydayz 7d27b5c0b1 Remove DZE_advancedTrading config variable
The legacy config trader menu was removed, so this variable is redundant
now.
2016-08-23 14:26:17 -04:00
ebaydayz c871c1e2c1 Move DZE_ConfigTrader to configVariable.sqf
Most servers will want to use config traders.
2016-08-23 14:10:10 -04:00
ebaydayz 164ba6a135 Remove unused variable dayz_baseTypes
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/220178844ff2e4e298a122f90fc9f57becb7e0e1
2016-08-23 14:02:20 -04:00
ebaydayz 6783ef9b1d Merge pull request #1751 from oiad/master
Plot/Door management userlist fix
2016-08-23 13:51:42 -04:00
ebaydayz bebff83996 Update german translation #1749
Sorry @AirwavesMan I missed that you wanted to change this too.
2016-08-23 13:34:36 -04:00
ebaydayz e74f12752b Remove unused duplicate clothing translations
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a49042262c5f6343c14a88907bd4f9759db9298c
2016-08-23 13:29:44 -04:00
ebaydayz 81473754f9 Revert unnecessary change from #1747
https://github.com/EpochModTeam/DayZ-Epoch/pull/1747#issuecomment-241802114
2016-08-23 13:12:01 -04:00
ebaydayz 29acecc2f2 Retire DZE_MissionLootTable variable
AFAIK there is no performance difference between configFile and
missionConfigFile.

Using missionConfigFile by default simplifies loot scripts and makes the
extra config variable unnecessary. It's one less step for admins to
customize their tables.
2016-08-23 12:57:12 -04:00
ebaydayz 10b006d4eb Improve readability of trade_any type lists 2016-08-23 11:57:09 -04:00
ebaydayz 5c13101254 Add arrays slightly faster in dynamic_vehicle.sqf
Set is faster when adding a single element to an array, but + is faster
for combining arrays (or append in A3).
2016-08-23 11:34:58 -04:00
ebaydayz d7cc4be585 Add faster array compare function
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7bbeab4e7db4d340cdd34b6c288bafc0833b1a8e
2016-08-23 11:17:07 -04:00
oiad 4da8e07cb0 Plot/Door management userlist fix
This fixes the userlist from overflowing onto the Add button when
there's too many users in the userlist.
2016-08-23 23:25:46 +12:00
icomrade 8c43b0fc1a Move actualSpawnMarkerCount
thanks for the tip @ndavalos
2016-08-22 23:21:08 -04:00
icomrade 3dc7f21de6 Adjust toneMaping
A little less gloom by default
2016-08-22 21:29:59 -04:00
ebaydayz 38b2a551bd Fix fn_waitForObject handling multiple of same object type
Forgot to handle case where there is already one or more of that object
type in the area (safes, cars, etc.).
2016-08-22 20:14:11 -04:00
icomrade a70501cf59 Use GetOut
Doesn't create a parachute with air vehicles
2016-08-22 19:28:50 -04:00
ebaydayz bc7bef857f Fix r_action_count not reset in player_buildVanilla exit 2016-08-22 16:54:14 -04:00
oiad 89a43cb2d8 Advanced trading fix
This fixes the issue that @ndavalos found:
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-241289082
2016-08-22 21:10:46 +12:00
icomrade c4aa469e41 Don't send to original player 2016-08-21 18:36:20 -04:00
oiad 6bdc3956fb Plot / door management userlist sorting (#1747)
* Plot / door management userlist sorting

This correctly sorts the nearby humans list in both mods, I have this
running on my 1051 server with no issues, @ebaydayz please advise if
this is not right, I've tested it pretty well and it is indeed selecting
the right person/UID

* Door/plot management fixes

As per @ebaydayz
2016-08-21 17:19:52 -04:00
ebaydayz 8ef349e2bb Make minor adjustment to push stuck plane action 2016-08-21 17:03:47 -04:00
ebaydayz 745e287202 Add option to push stuck planes
Also changed flip vehicle back to 1051 default which allowed players to
flip non-ATVs with help.
2016-08-21 16:45:32 -04:00
icomrade 9aa1784f23 Globally remove wrecked objects
using PVEH PVDZE_obj_Remove. Wrecks only exist for the players currently
in the server when the parent object is destroyed. Passing the object
through the PVEH does not work.
2016-08-21 15:46:33 -04:00
icomrade 2ef433dc93 Server_monitor fixes
revert _serverVehicleCounter to array, since I didn't notice it was
referenced in another file. Don't attempt to load objectData dump if the
vehicle count is 0 since the file won't be created.
2016-08-21 14:36:11 -04:00
icomrade f50666190b accidentally removed _hiveLoaded 2016-08-21 14:20:45 -04:00
ebaydayz f8334c8315 Update dynamic_vehicle.sqf with new Cessna and AN2 2016-08-21 14:09:05 -04:00
ebaydayz df67a35bc7 Add new AN2 skins to trader 2016-08-21 13:48:23 -04:00