Commit Graph

7363 Commits

Author SHA1 Message Date
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 0e3e352491 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-22 21:30:07 -04:00
icomrade 3dc7f21de6 Adjust toneMaping
A little less gloom by default
2016-08-22 21:29:59 -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
icomrade a70501cf59 Use GetOut
Doesn't create a parachute with air vehicles
2016-08-22 19:28:50 -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 61ebe75601 Merge pull request #1748 from oiad/master
Advanced trading fix
2016-08-22 12:25:13 -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
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 19dd6f26ab Add setVariable exception for Merlin hit part 2016-08-21 12:41:00 -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
A Man 49c6e0c318 Adding many new vehicles to configs (#1746)
* Adding display name for UH60M_MEV_EP1_DZ

* Adding 6 new Mi17 variants to config

Armed:
Mi17_TK_EP1
Mi17_UN_CDF_EP1
Mi17_CDF

Unarmed:
Mi17_medevac_CDF
Mi17_medevac_Ins
Mi17_medevac_RU

* Adding new line for Cessna.hpp

* Adding Cessna to the configs

That removes the radar function from the cessans.

* Adding 1 new An2 version to the config

* Adding 2 more HMMWVs to the config

Ive lowered the maxspeed from the HMMVW_DZ because all HMMWVs have a maxspeed of 100.

New classes:

HMMWV_Armored
HMMWV_M2

* Adding BRDM2 to configs

* Adding line for BRDM2_DZ.hpp

* Update after comments

* Update again

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update HMMWV.hpp

80 is the same as the other high tier armored HMMWV above. 40 is the same as the low tier ones.

* Update HMMWV.hpp

* Update HMMWV.hpp

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update CHANGE LOG 1.0.6.txt

* Update UH60.hpp

* Update Cessna_DZ.hpp

* Update Cessna_DZ.hpp

* Update NeutralAirplanes.hpp

* Update MI17.hpp

* Update AN2_DZ.hpp
2016-08-21 09:19:34 -04:00
icomrade 43275aa8e6 Update server and DLL 2016-08-20 19:25:47 -04:00
icomrade 00fa89d08f Server_monitor.sqf with new object stream method
Allows server to use either legacy loading method by itterating
callExtension (using  _legacyStreamingMethod = true). Otherwise, the
hive will dump objects to a file, write the filename to the server's
profile and it is deleted next restart, each filename is unique every
startup.

Associated hive commit:
https://github.com/icomrade/DayZhiveEpoch/commit/bc5d5c56a8cb19ab947c85dbd68e5330aa0bbffe
2016-08-20 19:24:24 -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 461424ff41 Merge pull request #1745 from oiad/master
Advanced trading selling upgraded vehicles.
2016-08-19 14:10:32 -04:00
oiad d987fb290c Advanced trading selling upgraded vehicles.
These changes allow the player to sell upgraded vehicles with them not
being added to the trader (as to not polute the lists). This basically
refers to an upgraded vehicle as a child of the base vehicle so it will
get the same sell price as the base vehicle.

This still follows the original trading convention, the vehicle base
needs to be in the trader category, i.e you cant sell an armored SUV at
stary vehicle trader.
2016-08-19 22:15:47 +12: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 0475e0fcb2 Merge pull request #1744 from oiad/master
Advanced trading buyable list changes
2016-08-18 12:11:48 -04:00
oiad 42ebfb54d7 Advanced trading buyable list changes
Further changes Advanced trading buyable list to show the item as blue
if it's compatible attachment wise and ammo wise.

This will get overwritten if the player has the item in their inventory
by staying green.

Also fixes a small bug I put into my last commit by not showing up for
boats/bikes etc.
2016-08-18 22:02:51 +12: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
A Man 9cce8910c2 Adding many new weapons (#1743)
* Update stringtable.xml

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

Lowering DMR spawnrate
2016-08-17 20:05:46 -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
icomrade 879ed7d479 re-add sim enable 2016-08-17 15:25:59 -04:00