Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
847 Commits 8 Branches 78 Tags 202 MiB
7913ee0ea7
Commit Graph

847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vbawol
f8b1f7e734 Merge pull request #577 from EpochModTeam/experimental 
0.3.9 b565
 2016-07-09 11:11:57 -05:00
vbawol
071a49aa51 0.3.9 b565 
fixed typo from b563
 2016-07-09 11:10:53 -05:00
vbawol
d3b0d80005 fixed more typos 2016-07-09 11:07:10 -05:00
vbawol
0cdb6034ff Merge pull request #576 from EpochModTeam/release 
merge from release
 2016-07-09 11:06:32 -05:00
vbawol
bad9153304 Merge pull request #575 from Ignatz-HeMan/patch-3 
Update CfgEpochClient.hpp
 2016-07-09 11:05:44 -05:00
He-Man
76eace8252 Update CfgEpochClient.hpp 2016-07-09 17:45:41 +02:00
vbawol
dd3d86a51b Merge pull request #574 from EpochModTeam/experimental 
0.3.9 b564
 2016-07-09 10:30:18 -05:00
vbawol
2df932cda6 fixed typo pt2 2016-07-09 10:29:23 -05:00
vbawol
88ba4b9e6b 0.3.9 b564 
fixed error in load vehicles function
 2016-07-09 10:26:35 -05:00
vbawol
c6e5bad2ff fixed error in load vehicles 2016-07-09 10:24:33 -05:00
vbawol
67033bf9af Merge pull request #573 from EpochModTeam/experimental 
0.3.9 b563
 2016-07-09 09:41:58 -05:00
vbawol
ffad14348b repack 2016-07-09 09:13:59 -05:00
vbawol
35b28e94f9 fix comment 2016-07-09 09:08:51 -05:00
vbawol
7f23f761ca 0.3.9 b563 pt2 2016-07-09 09:05:07 -05:00
vbawol
8dcb38d655 0.3.9 b563 2016-07-09 09:04:08 -05:00
vbawol
57930c84a4 add configs for revenge dialog 2016-07-09 09:01:40 -05:00
vbawol
59934bae10 Merge pull request #572 from EpochModTeam/release 
merge base building changes
 2016-07-09 08:42:26 -05:00
vbawol
dd42401de2 Merge pull request #568 from Ignatz-HeMan/patch-1 
Building Configs
 2016-07-09 08:40:54 -05:00
vbawol
0b2ab11370 Merge pull request #570 from EpochModTeam/experimental 
0.3.9 b562
 2016-07-08 17:35:26 -05:00
vbawol
5728c29baa 0.3.9 b562 
simplify new load vehicle, (realized sleep was not needed as allowDamage
does not effect scripted damage (per the wiki)
[added] old load vehicle script and epochconfig,hpp flag. (default is
false = use new load vehicles, true use old one from 0.3.8
 2016-07-08 17:34:13 -05:00
vbawol
afb3ce6023 Merge pull request #569 from EpochModTeam/experimental 
0.3.9 b561
 2016-07-08 10:34:23 -05:00
vbawol
e94971867b 0.3.9 b561 2016-07-08 10:26:27 -05:00
vbawol
1310098264 disable vehicle simulation handler 
changed var name to force change, new variable is: simulationHandlerOld
 2016-07-08 09:51:47 -05:00
vbawol
1f17430e2c Revert "move simulation handler to main loop" 
This reverts commit 19a0252278.
 2016-07-08 09:46:09 -05:00
vbawol
52e8008f16 fixed be kick # 39 2016-07-08 09:06:32 -05:00
vbawol
19a0252278 move simulation handler to main loop 2016-07-08 09:06:15 -05:00
He-Man
4532219923 Update EPOCH_isBuildAllowed.sqf 2016-07-08 01:58:09 +02:00
He-Man
b2fd0e4c67 Update EPOCH_isBuildAllowed.sqf 2016-07-08 01:54:50 +02:00
He-Man
f7ad2e1754 Update CfgEpochClient.hpp 2016-07-08 01:51:53 +02:00
He-Man
b86c3e7436 Update EPOCH_isBuildAllowed.sqf 2016-07-08 01:48:34 +02:00
vbawol
dbd959a3a0 remove extra comma 2016-07-07 17:29:02 -05:00
vbawol
055995e795 not needed to setface again 2016-07-07 16:00:21 -05:00
vbawol
5e9860f4e9 Merge pull request #567 from EpochModTeam/experimental 
Release 0.3.9 b560
 2016-07-07 15:56:23 -05:00
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