W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 16:51:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,539 Commits 20 Branches 18 Tags
3d0c5b13cf367c1fb9309b18be8dbe79918aa3e0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz 3d0c5b13cf Fix playerSync error from 5f0c2fc 
@icomrade There are cases where playerSync will receive > 3 params if
achievements are passed. Example:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/system/player_spawn_2.sqf#L305
 2016-09-17 17:43:41 -04:00
ebaydayz 29d9ed9211 Set unit posATL in switchModel if respawn is in water 
Reverts:

https://github.com/EpochModTeam/DayZ-Epoch/commit/bcc16a013520dcc243c306b178d3864dc4fec456

See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452
 2016-09-17 15:41:49 -04:00
ebaydayz 5f0c2fcc49 Speed up onPlayerDisconnect some more 
Moved combat log setVariables to playerSync. Now the player object is no
longer needed for any of the code at the bottom of playerSync or
onPlayerDisconnected.

Update objects is already performed at the bottom of playerSync. There
is no reason to do it again in playerDisconnect since it calls
playerSync.
 2016-09-17 15:02:00 -04:00
ebaydayz da70306291 Speed up playerSync a little 
Removed unused variables and redundant checks.

_Force was always true so any condition with an OR _force in it was the
same as (true) i.e. redundant.
 2016-09-17 14:03:05 -04:00
ebaydayz 9c2f15159a Correct Air relocate in server_playerSync 
@icomrade you forgot to change the _playerObj variable to _character
when you moved this.

Also if BIS_fnc_findSafePos was successful on the first attempt the way
you had it would use the original _charPos instead of the successful
return because you never set _charPos = _newPos;

https://github.com/EpochModTeam/DayZ-Epoch/commit/ed3227fa7a3dd879083f43558a402a651afd56ce
 2016-09-17 13:07:27 -04:00
ebaydayz bc4cb49463 Remove redundant characterID check in server_playerSync 
I made no changes apart from removing the (_characterID != "0") check
and the corresponding spacing/tabs.

If _characterID == "0" the script would have already exited on line 30.
 2016-09-17 12:18:54 -04:00
ebaydayz a63da4606d Speed up onPlayerDisconnect a little 
Removed redundant diag_log since it is already done in dayz_recordLogin.

Removed noatlf4 variable because we use inCombat instead. Noatlf4 is
only set if the player is hit in the damage handler, while inCombat is
set any time the player is in combat.
 2016-09-17 12:05:32 -04:00
ebaydayz b9507b2eb4 Don't hideObject on debug floor 
https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452#commitcomment-19060242
 2016-09-16 17:17:02 -04:00
ebaydayz bcc16a0135 Roll back to old swimming in ground fix 
See
https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452#commitcomment-19053648
comments
 2016-09-16 13:26:27 -04:00
ebaydayz b4ad50bf8f Add comment about grass height 2016-09-16 12:27:32 -04:00
ebaydayz 0ab46abd52 Don't spawn epoch dynamic debris if town generator is on 
Vanilla town generator debris can end up spawning inside of epoch
dynamic debris if both are enabled.
 2016-09-15 17:07:11 -04:00
ebaydayz 6e57bc6f6f Revert fix invisible primary stance glitch 
Partial revert from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452

Can't seem to reproduce this one now with this commit reverted. If
anyone has working repro steps let me know.
 2016-09-15 16:49:19 -04:00
ebaydayz 7415c21c2b Small update to object_build 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a10173443b4d47d4f9739a50759d68c27b6340df
 2016-09-15 12:48:31 -04:00
ebaydayz b2dfa058b0 Simplify double negative in fn_unconscious 
Simpler than:

https://github.com/EpochModTeam/DayZ-Epoch/commit/b609dcf5190293d6cd6bfe741b968889749042fe
 2016-09-15 12:44:47 -04:00
ebaydayz 815b54ec44 Fix gut dog 
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
 2016-09-14 16:42:25 -04:00
ebaydayz b349150548 Don't auto disable sound mute when exiting vehicle 
Let the player choose when to disable so there aren't any unexpected
drastic volume changes.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/60f4968f2317bdb79f8d7d158f2e787d81d6b639
 2016-09-14 15:36:35 -04:00
ebaydayz ce6dffde3d Add A2OA translations for open and close door 2016-09-14 14:46:58 -04:00
ebaydayz e8e5d24e80 Fix swimming in ground glitch 
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
https://github.com/EpochModTeam/DayZ-Epoch/commit/e85f6ad1b598afb07327b81a50d853e76cbb7f2c
 2016-09-13 18:36:06 -04:00
ebaydayz e85f6ad1b5 Consolidate transfusion scripts 
Consolidated transfusion and transfusion_noBloodTypes to one script.

Selfbloodbag.sqf will never run if DZE_selftransfuse = false; because
the right click action is hidden.

Total blood quantity is now added in 1/4 increments during self bloodbag
as intended instead of all at once.
 2016-09-13 15:02:16 -04:00
ebaydayz a8e5aba517 Remove some redundant createVehicle filters part 2 
These are covered by the first line now.

Vanilla commit:

https://github.com/DayZMod/Battleye-Filters/commit/cd52730484ae095c26618b2a40052514b69fe463
 2016-09-13 11:45:36 -04:00
ebaydayz 4a2bf1c006 Remove redundant createVehicle filters 
These are covered by the first line now
 2016-09-13 11:20:47 -04:00
ebaydayz c7a6c71330 Disable vanilla base building actions for now 
Since we are not going to use vanilla base building.
 2016-09-12 16:11:29 -04:00
ebaydayz 29c16dc59f Consolidate duplicate sell distance variables 2016-09-12 14:14:38 -04:00
ebaydayz 2bb5c5942c Retire cone and pole plot previews in favor of dome 
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
 2016-09-12 13:39:00 -04:00
ebaydayz d98025c8d9 Fix random spawned vehicle loot saving 
Dynamic vehicle loot will save to database now even if no players
interact with the vehicle before restart.
 2016-09-12 12:23:23 -04:00
ebaydayz 66ac72ea9d Add setPos.txt BE exception for WoodenArrowF 
https://github.com/DayZMod/Battleye-Filters/commit/4214d99bb1014112af944c459e948f9bfa335571
 2016-09-11 18:12:34 -04:00
ebaydayz 8bcd3a44e6 Keep Epoch strings in the dayz_epoch package of stringtable 
@oiad Please keep Epoch specific strings in the dayz_epoch package.
Vanilla does not have any of these items.
 2016-09-11 15:40:16 -04:00
ebaydayz 16e4dc7b30 Move HeliCrash and CarePackage area variables to markers 
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

Also removed some hardcoded checks for Chernarus, since
dayz_townGenerator should always be off on other maps for now. Someone
may add town generator coordinates for other maps later.

Related vanilla commits:

https://github.com/DayZMod/DayZ/commit/b20b402bf030769350cf662b985efba9e83ebe55

https://github.com/DayZMod/DayZ/commit/7c8b69eb82a8c741d01251b2552d009abe2687c4

https://github.com/DayZMod/DayZ/commit/7dfd3ef9cf3cf1751759fd76f8eae10c0b1740dc
 2016-09-11 14:45:49 -04:00
ebaydayz bbe6be6c31 Rename Multiplayer Setup to Lobby 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/fd90a380a7bad41fd71a8d9654d08e0ee69a88c0
 2016-09-10 13:19:31 -04:00
ebaydayz 3b8f89f18d Add version number in mission briefingDescription 
Provide some useful info here instead of just repeating the
briefingName.
 2016-09-10 12:26:13 -04:00
ebaydayz f57e303355 Update vanilla fence building 
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/e88a5c42bc86f91d254104b13064f83a2dd23a76

https://github.com/DayZMod/DayZ/commit/fe9564351108ae72496592b3bd741a5064b84ccd

https://github.com/DayZMod/DayZ/commit/9a82b8307c523046773b9cd3440c387c7155d70e

https://github.com/DayZMod/DayZ/commit/5a305198c70b1c3bdf7fbf055f550cf3a2d14001

https://github.com/DayZMod/DayZ/commit/be872601c96e526cb443b6ad47eb71fdf6618775

https://github.com/DayZMod/DayZ/commit/44a25b1b4a86d17ecf0780ba322513d756d1cbb1

https://github.com/DayZMod/DayZ/commit/7bfeab3c13b3835c5f134b39a15c8eae948a21b7

https://github.com/DayZMod/DayZ/commit/cc5f02a41ae7cba9d0312463caf48f46eed9cdad
 2016-09-10 11:25:10 -04:00
ebaydayz 11a3df0177 Add note about database in Test Build Readme 2016-09-09 14:55:20 -04:00
ebaydayz cb09377d26 Add GPS, Rangefinder and NVG back as sell only 
Partially reverts
https://github.com/EpochModTeam/DayZ-Epoch/commit/743554858262bc4f71686d3cf53eb09411a20eba
@AirwavesMan now that buy or sell only is available via:

https://github.com/EpochModTeam/DayZ-Epoch/commit/ffef03186313e10b2802554b8a02ca538eca0a51
 2016-09-09 14:05:06 -04:00
ebaydayz 8f25cc70db Localize sell and buy only messages 
PrimaryWeapon always returns "", never nil unless the player object
isNull (in which case this script would not be running).

Fixed cases where a nil variable would throw an error when checking the
next condition.
 2016-09-09 13:53:20 -04:00
ebaydayz e5e212bbc2 Add comment about salvage vehicle work around 2016-09-09 12:58:41 -04:00
ebaydayz eadbbb18bf Fix double tap bunny hop with no weapon glitch 
Also makes it easier to bunny hop in quick succession. Previously double
tap triggered a bunny hop immediately followed by a regular vault.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/5833c76491879677f3dc0b95b9378276e5bde205
 2016-09-09 11:41:09 -04:00
ebaydayz 32db983f34 Fix undefined amount when bloodbagging remote player 2016-09-08 20:00:38 -04:00
ebaydayz 4731780f5a Fix diag_log when vehicle spawn limit is reached 
Prevents benchmark diag_log showing negative number of vehicles spawned.
 2016-09-07 11:18:37 -04:00
ebaydayz 771284a297 Auto select main weapon after throwing 
Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/08449fdfda6a3c7d5c3522e64de9b50eedb13454
 2016-09-06 16:36:45 -04:00
ebaydayz c8b3053496 Remove unused keyboard_keys function 
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

https://github.com/DayZMod/DayZ/commit/f5780256eee23d7b6ada7acac0105737a18516c4
 2016-09-05 14:16:38 -04:00
ebaydayz cab627e3de Add note about server_timeSync name change 2016-09-04 14:40:03 -04:00
ebaydayz 530ed4b3b4 Only exit for playerNear if supply crate wreck or mine wreck 2016-09-03 20:16:21 -04:00
ebaydayz 70ebd6dbcb MISSION_ROOT variable is no longer needed 
Also @icomrade you accidentally committed the testkit code to
chernarus11 init.sqf. Removed it for you.
 2016-09-03 16:33:17 -04:00
ebaydayz 7be75c4674 Remove random unused faco code 2016-09-02 13:25:51 -04:00
ebaydayz ab6fa80697 Wait for BIS_fnc_init on login 
Fixes occassional case of undefined errors for BIS functions on client
when login completed very fast.
 2016-09-02 12:03:14 -04:00
ebaydayz b9dc98ac6f Revert move Shift +- to function 
See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/51caa509cbde7c99fd8b6bfda1396d6922f1c494#commitcomment-18834096
 2016-08-31 13:46:26 -04:00
ebaydayz 51caa509cb Comment out Gcam keys and move Shift+- to function 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/8ed8ab6b5cda0b66ce57cd86b206c5b756755854
 2016-08-30 14:18:38 -04:00
ebaydayz 16f17aafee Revert "Don't call player_forceSave when gear menu is aborted" 
This reverts commit 91e312fdc7.
 2016-08-29 12:05:50 -04:00
ebaydayz cc9ba66888 Add Anzio_20_DZ 
https://github.com/EpochModTeam/DayZ-Epoch/pull/1680#issuecomment-243150947
 2016-08-29 12:01:06 -04:00
ebaydayz 91e312fdc7 Don't call player_forceSave when gear menu is aborted 
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242992472
 2016-08-28 16:18:53 -04:00
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
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
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
ebaydayz 6494d0e11b Add note about x86 version of redistributable 2016-08-27 09:13:19 -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 6b101d3c2e Apply missing updates to epoch.sql 
All updates in 1.0.6_Updates.sql are now applied to epoch.sql.
 2016-08-25 13:08:46 -04:00
ebaydayz cb17d6bd06 Update test build 2016-08-24 20:26:51 -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 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
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 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
ebaydayz 2ceac68f84 Update test build 2016-08-22 20:22:49 -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
ebaydayz 2dd36bcda5 Add missing exception for PVDZ_Server_buildLock 
Vanilla commit:

https://github.com/DayZMod/Battleye-Filters/commit/00cae305598c03d1e6cd8df525a461b079f48a28
 2016-08-22 17:07:59 -04:00
ebaydayz bc7bef857f Fix r_action_count not reset in player_buildVanilla exit 2016-08-22 16:54:14 -04:00
ebaydayz 4c856e5bb1 Update test build to 1.8.8 dev addons 
Dayz_buildings was updated to enable vanilla base building again for
1.8.8 release. Also dayz_equip and some others were updated to fix minor
errors.

This allows us to test vanilla building in combination with epoch
building.
 2016-08-22 16:29:57 -04:00
ebaydayz f1430fc41b Add note about A2OA version in TestBuild ReadMe 2016-08-22 13:37:51 -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
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
ebaydayz c412287972 Fix shotgun ammo case sensitivity in SQL updates 
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-241269173
 2016-08-21 13:13:51 -04:00
ebaydayz da2faeb6d0 Add back fall damage block for local explosion cheats 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a02294421c53d34371cb6424a9ef97f2bb51e7f4
 2016-08-21 13:06:02 -04:00
ebaydayz 289b1307ff Fix speed typo in damage handler and vehicle getOut 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1f6dd9f787a75c3644efeb3849d184da80856f5e
 2016-08-21 12:06:12 -04:00
ebaydayz 92fbfdfdae Fix gunshot study body death message 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/9993400f970b6bdf0ebc71727b6a792a1c822875
 2016-08-21 12:02:10 -04:00
ebaydayz fd90eda8ae Update vanilla player build 
Vanilla development commits applied:

https://github.com/DayZMod/DayZ/commit/a2193626a0a16959c06b8a3d4986085b2e8ad232

https://github.com/DayZMod/DayZ/commit/deb7207672f33c45bfe15346ce22b52b00fe3672

https://github.com/DayZMod/DayZ/commit/2de1d90edd773883c17db80c5905e0b44a2b4ef6

https://github.com/DayZMod/DayZ/commit/8a914606cff65bb50c1b8c48178d7eab67d0285f
 2016-08-21 11:58:32 -04:00
ebaydayz f0e0f6d6e4 Temp Bypass for tents and stashes for collision checks. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/143f8e4dcb824cc0c8d1f21f8e7fbf40dbb9b9cd
 2016-08-21 11:39:19 -04:00
ebaydayz d20221caf3 Crash site spawns lowered to 1 at startup. Spawn frequency changed. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/a2040214dcd2d596dbfb0c32150ec387314807af
 2016-08-20 16:32:56 -04:00
ebaydayz 38e30d2565 Remove duplicate drink string 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/c25213fbb41e51add55c4baa950eee19d16b1823
 2016-08-19 15:41:50 -04:00
ebaydayz f3370cbc4b Give vehUpgraded a default value #1745 
@oiad No need to check _vehtrade in this case it will always be true if
_vehUpgraded != ""
 2016-08-19 14:17:13 -04:00
ebaydayz 554dad4e9e Add plot pole to setDamageOnAge SQL event include 
Like locked doors, plot poles can also have UIDs in their inventory now,
since plot for life and plot management were added.

Thanks @oiad
 2016-08-18 17:06:44 -04:00
ebaydayz bfca19bf80 Remove some unused legacy code 2016-08-18 17:00:08 -04:00