W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 14:21:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,442 Commits 20 Branches 18 Tags
65593be99555c69dabfe315fbe25b7d655fab3a5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ebaydayz 509c2b17d6 Fix typo from 5d372d3 
5d372d3
 2016-08-18 13:30:19 -04:00
ebaydayz 0394c61183 Match Adv Trade blue color for compatible highlight 
Matches blue used in advancedTrading.hpp, slightly lighter and easier to
see on dark grey background. @oiad 42ebfb5
 2016-08-18 13:27:00 -04:00
ebaydayz 5d372d3351 Add UH60M_MEV #1743 
Added to traders in #1743
 2016-08-18 13:01:08 -04:00
ebaydayz 73a5f54f05 Slightly adjust some assault rifle loot chances 2016-08-17 20:46:58 -04:00
ebaydayz 2d73b13b06 Remove random empty lines in stringtable 
leftover from da21433 @oiad
 2016-08-17 20:20:49 -04:00
ebaydayz 3103195017 Fix switch weapon addAction with nothing in hands 
The addAction click was doing an animation without switching when the
player had a primary or melee on back but nothing in hands.

Probably present in vanilla too, will check later.
 2016-08-17 15:26:24 -04:00
ebaydayz a345b69a77 Swap vanilla ItemPadLock for Epoch ItemComboLock 
This greatly simplifies things over having two separate combo lock
classes.
 2016-08-17 13:27:08 -04:00
ebaydayz d62a69b9f5 ArmoredSUV transportMaxMagazines change #1588 
Fixes #1588
 2016-08-17 10:18:11 -04:00
ebaydayz f04d581b4d Cleanup Adv Trade parseText formatting 
Just added line breaks so it is easier to count the format order.
 2016-08-16 17:07:33 -04:00
ebaydayz e02f8ba8ff Use BIS_fnc_numberText for SC number displays again 
Missed some @ndavalos
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854
 2016-08-16 16:44:56 -04:00
ebaydayz 3f3f1a32ed Use BIS_fnc_numberText for SC number displays 
See:

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854

That should be all of them @ndavalos let me know if I missed any.
 2016-08-16 16:28:06 -04:00
ebaydayz 72f6dbc849 Fix can't pack tent with DZE_permanentPlot=true 
Thanks @nigeyuk and @oiad
 2016-08-16 15:09:10 -04:00
ebaydayz 263a46f5c0 Add dayz_onBack to R3F weight total 
thanks @AirwavesMan
 2016-08-16 14:23:55 -04:00
ebaydayz c66bd67f01 Remove duplicate translations again 
Missed a few @oiad  ;)
 2016-08-15 20:07:34 -04:00
ebaydayz da2143336a Remove duplicate translations from stringtable 
Submitted by @oiad
 2016-08-15 19:58:52 -04:00
ebaydayz ae8329e55b Further simplify maintain_area.sqf again 2016-08-15 18:05:42 -04:00
ebaydayz 72c9c9eb38 Further simplify maintain_area.sqf 2016-08-15 17:54:16 -04:00
ebaydayz b37445a4d5 Fix mistake from 15763f4 
#1735

https://github.com/EpochModTeam/DayZ-Epoch/commit/15763f4f2a5bbadc22fc137deae5fcff5844bc60
 2016-08-15 17:21:13 -04:00
ebaydayz 15763f4f2a Consolidate maintain scripts 
Thanks to @oiad for making this easy #1735
 2016-08-15 16:33:00 -04:00
ebaydayz c75ccbb8b3 Move _hit == "" exitWith further down in damage handler 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/837a2623b0cca32c12e9212965f05569c232d6d4
 2016-08-13 20:22:57 -04:00
ebaydayz cb3be8b547 Add minor improvement to safe diag_log 2016-08-13 13:20:36 -04:00
ebaydayz c46f55b496 Update test build 2016-08-12 22:00:58 -04:00
ebaydayz ac30e8addd Remove ctrl alt del force save 
See
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239595150
 2016-08-12 21:51:09 -04:00
ebaydayz 21bee1899e Remove some duplicate translations 2016-08-12 21:19:24 -04:00
ebaydayz f529e5d724 Add PV value exception for SetFuel 
Fixes kick when refueling
 2016-08-12 20:16:16 -04:00
ebaydayz 74579bcf2f Allow remove with Crowbar in hands or onBack 
Now crowbar can be in your toolbelt, hands or onBack when removing
modular items, mining ore, opening supply crates, etc.
 2016-08-12 19:38:23 -04:00
ebaydayz 7b287a2a23 Send PVDZ_sec_atp messages as array 
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/6e0fd6203bd2ec2b6f07d3e44835c3f9c7fa5e7e

https://github.com/DayZMod/Battleye-Filters/commit/78ed0665fafc7eb286485f479c4b7d77442ba942
 2016-08-12 17:23:49 -04:00
ebaydayz ed47a63313 Make log more accurate in server_playerSync 
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/45ac48b5955c73b0b12fdccaed6573910170f3a7

https://github.com/DayZMod/DayZ/commit/ca23681a7d022d3ffeadfd9bf91b1942526b54ee
 2016-08-12 16:41:45 -04:00
ebaydayz 36196661ea Update arrow and quiver classnames 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/1561c3cfd85db4eee2688d76a6e5a6fdb8faddda
 2016-08-12 14:00:32 -04:00
ebaydayz b2394703f3 Update vanilla player build 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/20f992fcb74f9a8b6823ea466ea3aadb5eafd1b0
 2016-08-11 20:01:53 -04:00
ebaydayz d60600a825 Fixed missing tags. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/ed4ba17a1c3c02fee6d6fa32fa23d053c830c093
 2016-08-11 19:50:03 -04:00
ebaydayz 9aab4ddd03 Added WIP Limited fuel in Refuel points. 
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/707a591765c8a568429fd243a0f3d6f38793d8dc

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

Set to double vanilla default value since Epoch has a lot more large
vehicles with 1000+ fuel capacity.
 2016-08-11 18:08:21 -04:00
ebaydayz f985c50382 Updated Nutrition Values for refueling vehicles. (per can) 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/fac691a6145c0efb1406cca51d5523d74b691b55
 2016-08-11 16:01:16 -04:00
ebaydayz 7439b87779 Update damage handler and improve study body 
Vanilla development commits applied:

https://github.com/DayZMod/DayZ/commit/3db0fe8e7a3df0c2ab9e0f6bb220acf84e450da3

https://github.com/DayZMod/DayZ/commit/73a63898f11501c4aad83ead106c90b3e49461ac

https://github.com/DayZMod/DayZ/commit/08e18d5b526f8f8ee570fed1a3640d217f7fa83b

https://github.com/DayZMod/DayZ/commit/126da2dcd38a03d5583627607a78d37ad7f64091

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

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

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

https://github.com/DayZMod/DayZ/commit/c9c1fc934d449b33a9ef3bf14a82b5a40d93874b
 2016-08-11 15:16:53 -04:00
ebaydayz 2fdc87a86c Clarify comment 2016-08-11 11:15:51 -04:00
ebaydayz 72656ed001 Greatly optimize safe gear handling 
- Safe inventory arrays are no longer sent over network to all machines
on server startup and on each lock/unlock
- Disabled user input then closed gear dialog during safe
lock/unlock/pack to block various duping methods.
- Moved safe creation, deletion and gear handling to server. This cuts
down on add[Magazine/Weapon/Backpack]Cargo, createVehicle and
deleteVehicle BE logs.
 2016-08-10 20:34:54 -04:00
ebaydayz c62e3147c8 Do not send purchased vehicle marker arrow over network 
Only the player buying the vehicle needs to see the arrow.

Also fixed CfgMagazines error from:
https://github.com/EpochModTeam/DayZ-Epoch/commit/2c4c75c67c7b0230d5850b2a304a5b83020d3a3b#diff-fcf3df9a25b3d05402ab4e4809673194R6
@icomrade
 2016-08-09 14:52:15 -04:00
ebaydayz 1ed78cc085 Remove unused file object_updatePosition.sqf 2016-08-09 11:06:57 -04:00
ebaydayz bc7c1879a3 Store plot and door friends names as array 
Avoids setVariable value restrictions for players with special
characters in their name.

Also avoids issues with storing non-ASCII characters from player names
in DB inventory field.
 2016-08-09 10:48:31 -04:00
ebaydayz d5ec0d9728 Remove duplicate PVDZ_obj_Fire exception 
https://github.com/DayZMod/Battleye-Filters/commit/407134e1a2014952388fece241da9a3278d4c3be
 2016-08-08 19:55:11 -04:00
ebaydayz 0491b32c66 Fix 106 SQL updates find and replace 
Thanks @ndavalos

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-238063917
 2016-08-07 10:57:11 -04:00
ebaydayz 2980d849bf Formatting cleanup 
- Removed random spaces
- Added back comments so it is easier to compare
- Removed redundant } else {
 2016-08-06 14:47:10 -04:00
ebaydayz 73bcb6b856 Update test build 2016-08-06 12:04:42 -04:00
ebaydayz 950ef04855 Properly separate allowed toolbelt and binocular count 
It should no longer be possible to overflow your toolbelt or binocular
slots now.
 2016-08-06 11:08:01 -04:00
ebaydayz 875b34417e Add missing HangarSmall loot group 2016-08-05 19:17:16 -04:00
ebaydayz 7a4775beea Fix needing to click lock/unlock twice from inside vehicle to take effect 
No reason to use spawn here. Spawn can have a delay. Since
fn_selfActions runs faster it can register the vehicle as still locked
or unlocked after you clicked the action.
 2016-08-05 14:38:12 -04:00
ebaydayz c51fd11511 Use better method to find player's vehicle in Advanced Trading #1725 2016-08-05 13:43:58 -04:00
ebaydayz f6e10dd71c Add gear icons to trader menu vehicle cargo space display 
- Added gear icons to vehicle cargo space display instead of
Weps/Mags/Bags text

- Decreased info text to 0.7 all around. Can be reverted to 0.8 if
preferred, but 0.7 or smaller is needed for vehicle info class, display
name and weapons list to avoid cutting off the dialog on normal and
larger interface sizes.

#1724
 2016-08-04 20:36:36 -04:00
ebaydayz 60e6b85c4d Don't show fuelCapactiy for bicycles in Advanced Trading 2016-08-04 17:37:53 -04:00
ebaydayz c52187220c Fix message when buying multiple backpacks into empty gear 2016-08-04 16:16:13 -04:00
ebaydayz c47adbbdb0 Remove CZ_VestPouch_EP1 from traders 
This backpack is pointless, since it is the same model as
DZ_Czech_Vest_Puch with half the slots. The traders already have
DZ_Czech_Vest_Puch.
 2016-08-04 15:44:58 -04:00
ebaydayz d91bde9e53 Fix return change overflow check 
Thanks @oiad

- Added compensation for money which will be removed from gear and
backpack
- Improved readability
 2016-08-04 14:22:33 -04:00
ebaydayz 5a55bcb9b0 Forbid buying >1 of any tool into gear 
Previous duplicate check only checked player's current tools and the
buying array types for >1 of the same tool (not buying array amounts).

Also added prevention of binocular slot overflow.
 2016-08-03 18:56:42 -04:00
ebaydayz de9d3feb0f Updated Some loot Locations. 
Vanilla development commit:

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

Note: does not affect buildings with Epoch loot positions. Vanilla
positions are commented out on those buildings.
 2016-08-03 14:28:23 -04:00
ebaydayz 47e6366985 Updated Vanilla Buildables collision Checks. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/8e2953ab672cec20731543267e6a6fbab6cac8cb
 2016-08-03 13:55:43 -04:00
ebaydayz 376befd613 Minor Advanced Trading string semantics changes 
#1724
 2016-08-03 13:38:09 -04:00
ebaydayz 382f3bc451 Add buying to and selling from dayz_onBack 
Also:
- Fixed typo Z_fill(e)TradeTitle
- Fixed "not enough slots to accept change" message shows when "not
enough money" should show instead
 2016-08-02 14:19:59 -04:00