Commit Graph

764 Commits

Author SHA1 Message Date
vbawol
1a99015935 Merge branch 'release' into experimental
# Conflicts:
#	Server_Install_Pack/@epochhive/addons/epoch_server.pbo
#	Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
#	Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
#	Server_Install_Pack/mpmissions/epoch.Altis.pbo
#	Server_Install_Pack/mpmissions/epoch.Australia.pbo
#	Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
#	Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
#	Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
#	Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
#	Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
#	Server_Install_Pack/mpmissions/epoch.Esseker.pbo
#	Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
#	Server_Install_Pack/mpmissions/epoch.Napf.pbo
#	Server_Install_Pack/mpmissions/epoch.Porto.pbo
#	Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
#	Server_Install_Pack/mpmissions/epoch.Sara.pbo
#	Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
#	Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
#	Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
#	Server_Install_Pack/mpmissions/epoch.Stratis.pbo
#	Server_Install_Pack/mpmissions/epoch.Takistan.pbo
#	Server_Install_Pack/mpmissions/epoch.VR.pbo
#	Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
#	Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
#	Server_Install_Pack/mpmissions/epoch.utes.pbo
#	Sources/epoch_config/build.hpp
#	Sources/epoch_server/build.hpp

#	Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf
#	Sources/epoch_server_core/build.hpp
#	Sources/epoch_server_settings/build.hpp
#	build.txt
2016-07-07 15:55:33 -05:00
vbawol
dee3394024 0.3.9 b559 2016-07-07 15:25:03 -05:00
vbawol
de065ea3a7 0.3.9 b558
allow disable of ryan zombies support
suppressed zombies and more ai from jammers and traders
2016-07-07 14:50:35 -05:00
vbawol
7d3b44cd10 Merge pull request #566 from Ignatz-HeMan/experimental
Changes from He-Man
2016-07-07 12:13:38 -05:00
He-Man
5ea76ecbff Update server_monitor.fsm 2016-07-07 17:49:59 +02:00
He-Man
1b2aac3bdd Update EPOCH_server_lockVehicle.sqf
Allow Locking, if driver is dead.
Allow locking, if lockOwner already is lockedOwner
2016-07-07 17:47:30 +02:00
He-Man
389afe61ff Update EPOCH_server_save_storage.sqf
Unpack Backpacks / Vests / Uniforms. Otherwise Inventory will get lost
2016-07-07 17:46:02 +02:00
He-Man
c411e7ac40 Update EPOCH_server_save_vehicle.sqf
Unpack Backpacks / Vests / Uniforms. Otherwise the Inventory will get lost
2016-07-07 17:44:58 +02:00
He-Man
760d2c2c2a Update server_init.sqf
Add 50 reserved slots to prevent despawning Vehicles, if spawned in by scripts
2016-07-07 17:43:39 +02:00
He-Man
d6bc7a5e10 Update Epoch_dynamicMenu.sqf
Allows to create a tooltip by a code inside the config
2016-07-07 17:36:49 +02:00
vbawol
76785e1694 0.3.9 b557 2016-07-07 09:50:27 -05:00
vbawol
e9958bc5d8 add god mode enabled variable flag
for #525
2016-07-06 23:56:48 -05:00
vbawol
872b90fa99 loosen snap checks
this should allow for easier snapping, and should fix: #429
2016-07-06 23:41:30 -05:00
vbawol
bb94bb429e reworked trader spawn
fixes #489
traders now only spawn in traderBlds classes for work and traderHomes
for homes and only if the building has AI positions.
traders now also use traderUniforms config array for what uniforms they
randomly use.
2016-07-06 23:30:23 -05:00
vbawol
1da15073d8 0.3.9 b556
fixed unneeded message when suppressing forced AI spawn.
fixed no message if player does not have energy for NVG.
2016-07-06 20:48:53 -05:00
vbawol
415d9d7157 Merge pull request #565 from Nullimeyer/patch-1
Update EPOCH_server_loadTraders.sqf
2016-07-06 16:24:08 -05:00
He-Man
759223c59d Update EPOCH_server_loadTraders.sqf
Stored Vehicles was only counted for Static Traders.
2016-07-06 23:01:57 +02:00
vbawol
8dc77ec853 0.3.9 b555 2016-07-06 14:35:20 -05:00
vbawol
d1854aaaa3 0.3.9 b554
fixed missing var in biteplayer
2016-07-05 14:15:42 -05:00
vbawol
8f3b06f0f4 0.3.9.0 b553
Zombies: fixed issue with multiple targets
moved CfgSounds and CfgSay3Dhandler to mission file
added new mission config (CfgSwitchMovehandler) for
EPOCH_server_handle_switchMove function
minor cleanup to EPOCH_server_handle_say3D usages.
2016-07-05 13:22:14 -05:00
Andrew Gregory
66c49bc440 Fix multiple target issue.
Quick and dirty fix.
2016-07-05 17:33:39 +01:00
Andrew Gregory
8946390a21 Update Server Remove Marker Call - Not a function any more. 2016-07-04 20:34:35 +01:00
Andrew Gregory
e5bbe2ec74 Update Server Make Marker Call - Not a Function any more. 2016-07-04 20:33:57 +01:00
Andrew Gregory
274d5fb33f Update EPOCH_removeMarker.sqf 2016-07-04 20:32:57 +01:00
Andrew Gregory
e88179fecc Update EPOCH_makeMarker.sqf 2016-07-04 20:32:31 +01:00
vbawol
547af0785a fixed incorrect cooked class returned 2016-06-30 18:11:18 -05:00
vbawol
eaf23d4e31 0.3.9.0 b552
zombie fixes
removed armed vtol
prices for APEX vehicles
message when NVG disabed due to lack of energy
2016-06-30 17:43:28 -05:00
vbawol
02761bb4cf 0.3.9.0 b547 2016-06-30 12:06:07 -05:00
Raymix
a21ca947f2 Dynamic HUD feature - http://pastebin.com/XPLwqRgd 2016-06-29 23:32:57 +01:00
vbawol
e04f4d2e69 Merge pull request #561 from RC-Robio/patch-2
Update sc.arma3profile
2016-06-29 15:52:28 -05:00
vbawol
6a01291440 0.3.9.0546
add server invoked looting text based feedback
2016-06-29 13:35:37 -05:00
Robio
16ab1e6132 Update sc.arma3profile 2016-06-29 13:06:53 -05:00
vbawol
b84e97a71a change config.cfg to server.cfg, install note updates
Thanks @RC-Robio for the heads up!
2016-06-29 08:22:47 -05:00
vbawol
4405c12680 fix for #554 2016-06-29 08:08:38 -05:00
vbawol
1ec9d344be 0.3.9.0545
new function EPOCH_swapBuilding
2016-06-28 21:37:11 -05:00
vbawol
086102c63e changelog updates 2016-06-27 16:17:26 -05:00
vbawol
f8f776c659 0.3.9.0544
only use nearestTerrainObjects [player, ["SHIPWRECK"], 40000]; postions
for containerpos array
change gamemode to survival, (might show as unknown gamemode pre 1.62)
2016-06-27 15:56:35 -05:00
vbawol
926ad37a06 0.3.9.0543
Tanoa container positions thanks to Sparky
Tanoa Apex vehicles added
give attributes should not return anything if data is 0 even if random
is used
2016-06-27 11:51:31 -05:00
vbawol
9e548a1c04 0.3.9.0542
fixes to a few typos
2016-06-25 10:12:26 -05:00
vbawol
ed75234adb 0.3.9.0541
revert setVectorDirAndUp after setpos and use [0,0,0]
2016-06-25 08:35:36 -05:00
vbawol
05bbb9a14e 0.3.9.0539
add loot class override variable epochLootClass, to allow all zed
classes to return
BE filter updates for extra zombie classes
added loot table for zombies.
added looting of Dogs for meat with negative karma.
cooking of dog meat.
loot configs for shark
interactAttributes format changed to an array ["Hunger",100,1] //
CustomVarName, value, make value randomized.
BE updates and fixes
new function EPOCH_giveAttributes
2016-06-23 20:43:22 -05:00
vbawol
fd0ca662c7 0.3.9.0538 2016-06-23 06:44:37 -05:00
vbawol
8f5867b450 fix for shipwreck containers disappearing
http://epochmod.com/forum/topic/42270-boxes-disappearing/
2016-06-23 06:43:59 -05:00
vbawol
620e335e1d 0.3.9.0537
Tanoa building loots v1 done
2016-06-20 16:49:51 -05:00
vbawol
72fe4b324e more tanoa positions
and added loot table to sharks
2016-06-20 10:59:01 -05:00
vbawol
8b3dc768d2 merge 2016-06-20 10:58:31 -05:00
vbawol
66924ce57d Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
# Conflicts:
#	Server_Install_Pack/sc/BattlEye/remoteexec.txt
2016-06-20 10:58:02 -05:00
vbawol
729995b0d4 BE filter for makeMarker 2016-06-20 10:53:37 -05:00
Andrew Gregory
264881de7c MIssion BE Filters 2016-06-19 23:07:35 +01:00
Andrew Gregory
f9eacd4a15 MIssions / Markers BE Filters 2016-06-19 23:07:03 +01:00