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
1,466 Commits 8 Branches 78 Tags 202 MiB
30d8107d75
Commit Graph

916 Commits

Author SHA1 Message Date
vbawol
28baecfd71 0.5 b705 2017-03-23 14:45:19 -05:00
vbawol
4b3a72f970 improve usage of Epoch_my_Group 2017-03-23 14:28:04 -05:00
vbawol
3e2148e147 reforce wind direction again 2017-03-23 13:57:57 -05:00
vbawol
768da17740 optimize and fix bugs 2017-03-23 13:57:29 -05:00
vbawol
2156309fcf MORE WIND! 2017-03-23 10:38:01 -05:00
vbawol
6e9e5ff9d3 server b703 2017-03-23 10:09:17 -05:00
vbawol
ee2cf61d83 optimize and fix recent group issue 2017-03-23 10:09:02 -05:00
vbawol
77b6ed4f18 0.5 b701 2017-03-22 17:37:02 -05:00
vbawol
dfd719e77c TEST: force nearby players to reveal new object 2017-03-22 17:32:18 -05:00
vbawol
d97d2d8360 fixed issue with group system 2017-03-22 17:11:02 -05:00
vbawol
8029c21811 same 2017-03-22 16:52:04 -05:00
vbawol
e6a4e39bb9 fixed soldier units spawning long after spotted 
if unit is forced to spawn no need to increase random spawn limit, Also
since there was no way to decrease the spawn for soldiers they would
randomly spawn forever.
get random postion around player to spawn soldier if extra data is not
sent.
set soldiers to spawn at ground level.
 2017-03-22 16:51:51 -05:00
vbawol
872d8dcb73 0.5 b700 
weather tweaks and repack for PR
 2017-03-18 00:24:02 -05:00
He-Man
15f7b0492c Removed "Inspect" & "Build Mode" from DynaMenu 
Both functions are useless inside Vehicles.
 2017-03-17 19:25:01 +01:00
vbawol
aff9d38c70 0.5 b699 2017-03-08 14:45:24 -06:00
vbawol
35f2f67d0b use another class for sapper 2017-03-08 12:26:41 -06:00
vbawol
16e70faf8e 0.5 b698 2017-03-08 08:17:06 -06:00
vbawol
cd84b51862 Merge pull request #708 from 82ndab-Bravo17/PlaceJammer 
Option to re-allow non Group Leaders to place Jammers
 2017-03-08 07:33:48 -06:00
vbawol
bb66c7b211 Merge pull request #704 from Ignatz-HeMan/patch-3 
Anti-Dupe on Revive
 2017-03-08 07:32:52 -06:00
He-Man
26d4999def deleted redundant variable 
variable "_units = []" was twice
 2017-03-07 09:33:31 +01:00
vbawol
5857f56583 0.5 b697 2017-03-06 11:46:54 -06:00
vbawol
7543950e8d give toxic sapper his own toxic bomb 2017-03-06 11:35:18 -06:00
vbawol
8b77ed0be7 add toxic sapper to spawn, give loot, etc. 
also give feedback to player when Spawnpoint set
 2017-03-06 11:19:20 -06:00
vbawol
dcd0954786 0.5 b696 2017-03-05 13:35:03 -06:00
vbawol
7714c62e96 test fix issue with joining a dead players groups 
optimize reduce number of allPlayer calls
 2017-03-05 11:04:43 -06:00
vbawol
c477b9bf58 prevent crash on dynamic menu loading upgrades 2017-03-05 11:02:00 -06:00
vbawol
4f5d0baf8d 0.5 b695 2017-03-04 16:46:03 -06:00
vbawol
308f1eb875 fixed issue that could cause spawning at old position 
if jammer owner checks failed
 2017-03-04 13:00:31 -06:00
vbawol
f5d51c4127 fixed typo in load player 2017-03-04 11:35:39 -06:00
vbawol
b695f29577 example Epoch Event: Payday 
Give all connected players 100 Crypto every 30 minutes
 2017-03-04 10:57:14 -06:00
vbawol
4cd7fdd5c6 0.5 b691 2017-03-04 00:53:05 -06:00
vbawol
b2629ca10f allow respawn in base 2017-03-04 00:52:45 -06:00
vbawol
4a08ccf033 fixed missing semicolons 2017-03-04 00:21:59 -06:00
82ndab-Bravo17
39c7ff9ac7 Option to re-allow non Group Leaders to place Jammers 2017-03-02 19:37:20 -05:00
He-Man
4a72867eac SupportCopter v2 2017-03-02 18:23:38 +01:00
He-Man
0d35af5052 SupportCopter v2 2017-03-02 18:22:35 +01:00
He-Man
965ff047e9 SupportCopter v2 2017-03-02 18:12:35 +01:00
He-Man
a0c1648a0c SupportCopter v2 2017-03-02 18:04:17 +01:00
He-Man
3cc5a7df4d SupportCopter v2 2017-03-02 17:58:48 +01:00
He-Man
d3a5799808 SupportCopter v2 2017-03-02 17:58:12 +01:00
He-Man
180cd363f4 SupportCopter v2 2017-03-02 17:57:41 +01:00
vbawol
4a95679713 Toxic Sapper pt1 2017-03-01 17:17:58 -06:00
vbawol
4ce94718ab add function EPOCH_fnc_addItemToX 
reduce redundant code
rebuild private arrays
 2017-03-01 17:17:30 -06:00
vbawol
a24130d517 allow for more than one type of UAV response 2017-03-01 17:16:06 -06:00
He-Man
53c02fe16a Anti-Dupe on Revive 
Prevent simultaneous reviving
 2017-03-01 19:09:26 +01:00
vbawol
55a7a0190d 0.5 b684 2017-02-28 13:31:00 -06:00
vbawol
556506acbe fixed inventory opened script not returning bool 
also block totally if both linked containers are locked
 2017-02-28 13:30:08 -06:00
vbawol
d2515e2039 license updates > APL-SA 2017-02-28 12:33:58 -06:00
vbawol
b477f4ffc3 moved air drop trigger server side Epoch Events 2017-02-28 12:33:28 -06:00
vbawol
40f2c98f0c 0.5 b684 pt1 
[Added] Customizability of units spawned by UAV alert via CfgEpochClient
> uavAlertUnitSpawnTemplate. (Default: I_Soldier_EPOCH)
[Changed] Great White Sharks will now spawn if player is deep enough in
the ocean.
[Changed] Objects or Players that have been given "Crypto" variable can
be accessed via the dynamic menu (Space Bar) for a "Take Crypto" action.
changed zombieRndChance to zombieRngChance and added default entry into
CfgEpochClient
 2017-02-28 10:34:24 -06:00
vbawol
51cddfa424 0.5 b683 2017-02-27 07:52:47 -06:00
vbawol
e1111430c2 fixed custom inventory opened script blocking main 2017-02-27 07:33:34 -06:00
vbawol
9d6b5a6ae5 0.5 b682 2017-02-26 09:19:51 -06:00
vbawol
19d05a9f17 add toxic grenade to loots and prices 2017-02-26 08:38:23 -06:00
vbawol
246cc9670f 0.5 b681 repack 2017-02-26 08:17:12 -06:00
He-Man
83263f5c99 Inventory not opened fixed 
Inventory not opened without the "false" as return
 2017-02-26 09:32:26 +01:00
vbawol
f31aeff613 0.5 b680 2017-02-25 16:37:07 -06:00
vbawol
3ab94871a3 fixed incorrect usage for setFSMvar on sappers 
set local var on unit to get FSM ref
 2017-02-25 16:36:14 -06:00
vbawol
3d4a5cf80a Merge pull request #701 from Ignatz-HeMan/experimental 
Faster feedback from Targets
 2017-02-24 11:30:54 -06:00
vbawol
2afb92e52e b678 
see changelog
 2017-02-24 11:31:33 -06:00
He-Man
fb9882185d Faster feedback from Targets 
reaveal player to all near objects on Epoch-ActionKey pressed.
Whithout this, upgraded Buildings need up to 10 seconds to get in Target.
 2017-02-16 23:34:48 +01:00
He-Man
fa05a9d9eb Fixed forcewalk stucks 2017-02-15 23:46:16 +01:00
He-Man
2467875a80 Update EPOCH_NpcTrade_return.sqf 2017-02-10 21:34:45 +01:00
He-Man
a18819d984 Update EPOCH_server_makeNPCTrade.sqf 2017-02-10 21:30:41 +01:00
He-Man
69a3b8b5d7 Reworked NPC Trade Script 
- no longer use PubVar for Trade
- "Purchase Failed" not abort the complete trade
- Added an option, that Players with to much Bank-debit can not sell,
but can purchase. The Money for Purchasing goes directly to the Bank
then.
 2017-02-10 21:28:00 +01:00
He-Man
1816c9755f Update EPOCH_isBuildAllowed.sqf 
Only the Group Leader can place a Jammer
 2017-02-10 20:25:36 +01:00
He-Man
6c08d6835f Only Group Leader can place a Jammer 2017-02-10 20:21:32 +01:00
He-Man
061270b5a2 Update EPOCH_custom_EH_InventoryOpened.sqf 2017-02-06 19:50:15 +01:00
He-Man
3c3772f3f6 Update EPOCH_custom_EH_InventoryClosed.sqf 2017-02-06 19:49:23 +01:00
He-Man
ea2cb1b250 Update CfgEpochClient.hpp 2017-02-05 19:00:38 +01:00
He-Man
b70f05e023 Update CfgClientFunctions.hpp 2017-02-05 18:57:40 +01:00
He-Man
2f7216d63c Update EPOCH_onEachFrame.sqf 2017-02-05 18:55:20 +01:00
He-Man
de36d8225c Update EPOCH_KeyUp.sqf 2017-02-05 18:54:44 +01:00
He-Man
3c5d112463 Update EPOCH_KeyDown.sqf 2017-02-05 18:54:06 +01:00
He-Man
ee3224f14a Add files via upload 2017-02-05 18:51:57 +01:00
He-Man
d067b9662a Add files via upload 2017-02-05 18:50:59 +01:00
vbawol
40949a09b9 Fixed: Repack Energy Pack not possible #698 2017-01-23 17:12:50 -06:00
vbawol
a990bc7eb1 add back comments and one recipe 
added crafting mortar with 12 Rocks 2 dirty water Fire + Workbench
nearby. #647
 2017-01-15 14:22:19 -06:00
MGT
7ee9fe36b3 Update player_login.fsm 
Typo "PLAYER_REJECT_InvaildSetup" changed to "PLAYER_REJECT_InvalidSetup"
 2017-01-14 20:32:56 +00:00
vbawol
a40dfadde6 use internal EH reference to sapper agent 2017-01-10 14:15:33 -06:00
He-Man
9eb8557107 wrong var name 2017-01-10 19:31:05 +01:00
vbawol
cae78a7f20 readd missing comments to epoch config 2017-01-09 12:18:49 -06:00
vbawol
c0b6a0a1be bump for next version 2017-01-06 08:14:55 -06:00
vbawol
2eefc2e343 typo 2017-01-02 17:28:07 -06:00
vbawol
a417dc9070 0.4 b675 2017-01-02 12:25:49 -06:00
vbawol
bc314ca5f8 use isEqualto 2017-01-01 12:33:53 -06:00
vbawol
468deeb252 test making player revive work similar to load #693 
on revive, use reveal against new player object.
send loadABS value from server and wait client side for a match before
using selectPlayer.
Note: may need some form of code lock to prevent duplicate calls
Todo: Look into changing revive system to A3's own.
 2017-01-01 12:33:04 -06:00
vbawol
de95260a3e 0.4 b674 2016-12-29 13:57:50 -06:00
vbawol
1db988095e booleans in configs 
- change bools in config files to string or a number.
- EPOCH_fnc_returnConfigEntry(V2) now also supports 0/1 via config when
default input is a bool.
Note: this commit may address issue with Bad conversion: bool rpt spam.

It is suggested to use the following format for storing booleans in
config:
1 = true
"true"=true
0 = false
"false"=false
 2016-12-29 12:18:09 -06:00
vbawol
03bd6cc796 Merge pull request #688 from Ignatz-HeMan/patch-13 
Safe/Load all Vehicle Magazines correctly
 2016-12-29 11:42:00 -06:00
He-Man
a7b8f7afae Update CfgEpochClient.hpp 
true / false must be a string!!!
 2016-12-25 17:52:05 +01:00
vbawol
abf690fc11 fix typo on helper scripts 2016-12-18 13:21:42 -06:00
He-Man
5859bf2356 Safe/Load all Vehicle Magazines correctly 2016-12-14 21:58:08 +01:00
He-Man
3f4517f109 Safe/Load all Vehicle Magazines correctly 2016-12-14 21:53:24 +01:00
He-Man
113efd874b Safe/Load all Vehicle Magazines correctly 2016-12-14 21:52:48 +01:00
He-Man
4b88db0279 Safe/Load all Vehicle Magazines correctly 2016-12-14 21:51:35 +01:00
He-Man
532df074f2 Safe/Load all Vehicle Magazines correctly 2016-12-14 21:49:55 +01:00
vbawol
81f3452bd9 b673 2016-12-14 14:11:36 -06:00
vbawol
46e9e557be Merge pull request #687 from EpochModTeam/release 
merge trader menu changes to experimental
 2016-12-14 10:21:59 -06:00
He-Man
236651caa7 Skip saving already killed Vehicles 
Server was deleting the Vehicle from DB and after hit is triggered, saved it again into DB with damage 1
 2016-12-13 19:56:13 +01:00
He-Man
fb9356d804 Added Filter for TraderMenu 2016-12-13 17:19:54 +01:00
He-Man
55351e891c Added Filter for TraderMenu 2016-12-13 17:18:59 +01:00
He-Man
b1d5c173b0 Added Filter for TraderMenu 2016-12-13 17:15:01 +01:00
He-Man
3009c82a24 Added Filter for TraderMenu 2016-12-13 17:14:51 +01:00
He-Man
e265031d60 Added Filter for TraderMenu 2016-12-13 17:13:35 +01:00
He-Man
5412c6cd6f Update sandbox_config.hpp 2016-12-13 17:12:51 +01:00
He-Man
13f27ba56f Update EPOCH_startNPCTraderMenu.sqf 2016-12-13 17:12:11 +01:00
He-Man
7a30a439c1 Added Filter for TraderMenu 2016-12-13 17:11:18 +01:00
vbawol
dc93ccdbf4 b672 2016-12-12 13:25:00 -06:00
He-Man
6cb5de71b5 Removed workaround for PlayerDisconnected 
Tested and working again.
Should be better then searching (foreach allunits)
 2016-12-12 19:36:00 +01:00
vbawol
31371482c8 b671 2016-12-12 11:29:46 -06:00
He-Man
62917bfc40 Option to make BaseParts indestructible 2016-12-11 16:19:22 +01:00
He-Man
7afb41d0d8 Option to make BaseParts indestructible 2016-12-11 16:18:16 +01:00
He-Man
0bbb00dcb5 Option to make BaseParts indestructible 2016-12-11 16:16:46 +01:00
vbawol
f86c49fe86 b670 2016-12-11 00:34:07 -06:00
He-Man
24f57dd9a5 Update EPOCH_isBuildAllowed.sqf 2016-12-10 20:53:52 +01:00
He-Man
2418d08ee5 Update EPOCH_simulSwap.sqf 
Throw _object instead of _objtype to EPOCH_isBuildAllowed, so it can be ignored by counting elements
 2016-12-10 20:30:50 +01:00
He-Man
51f4564550 Update EPOCH_staticMove.sqf 
Throw _object to EPOCH_isBuildAllowed, so it can be ignored in element counting
 2016-12-10 20:26:32 +01:00
He-Man
4a6e6b006f Update EPOCH_consumeItem.sqf 
- removed _buildingCountLimit, because it is not needed in this script
- moved "Press 1" message, so it only comes up, if building a Part
 2016-12-10 20:24:35 +01:00
He-Man
f02a3ecf1b Some Bugfixes in Building Script 
- Added Ghost Classes for Biulding-Count
- Added SIM Classes for Storage-Count
- 2nd Storage outsinde PlotPole range can not be set fixed
- Cleanup the whole Script a bit
 2016-12-10 20:20:40 +01:00
He-Man
51a6ff3e31 Changed back Epoch EPOCH_fnc_playerDeath 
Changed back Epoch EPOCH_fnc_playerDeath since setPlayerRespawnTime to prevent respawning before timer ends and display close.
 2016-12-10 20:13:15 +01:00
vbawol
0d058e0371 added cfgpricing for apex items and weapons #677 
thanks to @Ghostrider-DbD- for the contrubution!
 2016-12-10 08:50:13 -06:00
vbawol
4f86c913d8 fixed Generic error in expression 
when player object was null the function would throw an error. Thanks to
@ReDBaroN1 for the report!
 2016-12-10 08:10:31 -06:00
vbawol
9856601229 0.4 b669 
Workaround for playerRespawnTime always returning -1 when the player is
killed, that also prevented player time to be revived. Thanks goes to
@Ignatz-HeMan and @SPKcoding for the fix!
 2016-12-03 11:22:55 -06:00
vbawol
cbc6012eb1 Merge pull request #673 from SPKcoding/experimental 
fixed player death screen
 2016-12-03 10:33:29 -06:00
Sp4rkY
2830f50be7 FIXED playerDeath function 2016-12-03 16:58:21 +01:00
Sp4rkY
b88113eb96 FIXED playerDeath function 2016-12-03 16:47:18 +01:00
Sp4rkY
e1e2dde224 temp fixed player death screen 2016-12-03 03:23:43 +01:00
vbawol
1660e7f484 0.4 b668 
fixed crash when opening crafting menu since A3 1.66.
workaround for HandleDisconnect not firing since A3 1.66.
b660
changed playableUnits to allPlayers
improved Epoch_selectInventoryItem function
improved inventory locked check with arma 1.66 features.
 2016-12-02 10:24:25 -06:00
vbawol
84eb6fc8a8 fixed crash with crafting load since 1.66 2016-12-02 09:59:01 -06:00
vbawol
a4f0ab80ec workaround for HandleDisconnect not working 2016-12-02 09:46:59 -06:00
vbawol
350554b7f1 0.4 b660 
fixes and improvments
 2016-12-01 23:26:34 -06:00
vbawol
98741939e1 fixes part 2 2016-12-01 23:25:50 -06:00
vbawol
8e614b0b78 Arma 3 1.66 fixes part1 
playableUnits changed to allPlayers
improved Epoch_selectInventoryItem function
mproved inventory locked check
 2016-12-01 17:44:43 -06:00
vbawol
3d1f958839 b657 2016-11-28 00:17:28 -06:00
vbawol
c86d4577e4 fix for vehicles that are spawned with Zeus 2016-11-28 00:10:33 -06:00
vbawol
c2a09465a9 move to top OCD 💯 2016-11-26 10:54:25 -06:00
vbawol
fb7d733c41 b656 2016-11-26 10:26:16 -06:00
vbawol
7c7f8a4aa0 Item interaction support for ConfigFile fallback 
Experimental EPOCH_returnConfigV2 function that allows falling back to
configFile if specific config class does not exist in missionConfig.
 2016-11-26 10:21:37 -06:00
vbawol
8e1d960496 simply prevent display EH loading after revive. 
Thanks to @Ignatz-HeMan for the report.
 2016-11-26 10:18:06 -06:00
vbawol
f972e6a6e0 b655 
repack for changes since
b07c74f80d
remove json files as they can be regenerated as needed
 2016-11-13 23:49:53 -06:00
vbawol
b07c74f80d Merge pull request #660 from SPKcoding/experimental 
more custom options
 2016-11-13 23:41:47 -06:00
vbawol
9fa278e04a Epoch Survival 0.4 build:654 
increased anti teleport distance limit to 30 and configureable via
epochah.hpp antihack_maxTravelDistance
 2016-11-13 20:25:53 -06:00
Sp4rkY
b624641f32 more custom options 2016-11-14 02:04:08 +01:00
Raymix
bf4de960dc Fixed links in headers 2016-11-12 17:27:03 +00:00
vbawol
57327acef3 Epoch Survival 0.4 b653 2016-11-11 16:50:26 -06:00
vbawol
ba6f19e7bb b653 pt1 
- fixed a typo in takeCrypto and updated private array
- moved epoch_2DCtrlHeartbeat to is Critical logic so it only beats when
critical (todo make slower faster based on high or low status)
 2016-11-11 16:43:48 -06:00
Raymix
77f3ca71ff Changed: Replaced _scaleUI with heartbeat animations for "topRight" dynamicHUD when critical 2016-11-09 23:47:14 +00:00
vbawol
9e66f8e03a 0.4 b652 
- Fixed ryan zed not detected.
 2016-11-09 17:23:27 -06:00
Raymix
82a34a6db5 New: GUI Animation - Heartbeat 2016-11-09 23:12:52 +00:00
vbawol
a0b078a683 Epoch Survival 0.4 b650 
- experiment with using dynamic UI (HOLD down Space Bar) for base
building: enable, disable, free mode, and snap alignment options. build
mode can still be disabled with "1" key only if already enabled.
- Replace the use of 1,2,3 keys for base building to free them up to be
used for Arma 3 weapon switching.
 2016-11-09 17:04:15 -06:00
Raymix
422b3883af Shake animation - spawn support 2016-11-09 22:13:54 +00:00
Raymix
61ce251561 forgot to update private array, need to get in a habit for this lol 2016-11-09 22:00:45 +00:00
Raymix
6fbf5bdfb0 New: GUI Animation - Shake 2016-11-09 21:55:35 +00:00
vbawol
c15ea5c42b Epoch Survival 0.4 b646 
removed "wet" HUD icon for now.
reworked login fsm, thanks to some feedback on the forum.
removed most blocking of f1-12 keys and number keys via keyDown
function.
comment out some diag_log spam.
workaround for Arma 3 client crash when an admin uses F5 to delete a
vehicle.
Fixed Ryan Zombies mod detection issues.
Optimized and fixed wall state issues thanks to @Ignatz-HeMan for PR and
Xirtti for the feedback.
 2016-11-09 15:21:15 -06:00
Raymix
903bcb36b8 Correction: Misleading info in header comments 2016-11-09 20:23:41 +00:00
vbawol
149261ac83 fix using 1,2,3,4 keys for weapon switching 2016-11-09 11:17:53 -06:00
He-Man
a4c75841db Fix for "add wall" to Wooden Tower 
Add Wall on Wooden Tower was not working since 0.4. 
_x params ["_recipeItem","_recipeQty"];	 seem not work here and the paramterer was twice loaded.
This fix is already tested and works.
 2016-11-09 17:16:43 +01:00
vbawol
1aa39383cc b640 
fixed visible scrollbars on HUD UI thanks to @raymix
updated scripts.txt BE filter.
 2016-11-08 09:53:09 -06:00
Raymix
4cbad753af OCD fix: centered scaling for dynamic HUD critical animation. 2016-11-07 21:02:57 +00:00
Raymix
5a754420fc Fix for #654 - Dynamic HUD UI visible scrollbars at 16:10 aspect ratio 2016-11-07 20:33:12 +00:00
vbawol
2a9179e8fb merge junk 2016-11-03 14:36:41 -05:00
vbawol
3f3dd22f83 Epoch Survival 0.4 b639 
return empty can on drinking gas,
added option to empty out gas can
 2016-11-02 15:12:49 -05:00
vbawol
95cfc4be58 b638 2016-11-02 14:43:26 -05:00
vbawol
4f50c4513b disable TI on mission spawned UAV's 2016-11-02 14:40:26 -05:00
vbawol
b48acf626f Epoch Survival 0.4 b637 
tanoa mission file added that adds RyanZombies to the addons array
Test extended options support for double click item interaction sub
menu.
- "Drink" gas to poison your self.
- Pour our Honey "Empty" option to gain the empty jar without consuming
the honey.
 2016-11-02 14:20:58 -05:00
vbawol
12740cfafd Epoch Survival 0.4 b633 2016-11-02 10:25:49 -05:00
He-Man
91e4a80ae2 Update EPOCH_lockCheck.sqf 
Otherwise it is possible to unlock foreign Doors / Gates while controling an UAV.
If you control an UAV, cameraon will check the Plotpoles near the UAV.
 2016-11-01 17:41:03 +01:00
vbawol
0e3d163ab2 b632 
test not suppessing SPACE key press to fix
https://github.com/EpochModTeam/Epoch/issues/539
 2016-10-31 13:31:28 -05:00
vbawol
4dd055d4f3 b631 
few more loot positions and updated tool with remaining list from
https://github.com/EpochModTeam/Epoch/issues/528
 2016-10-31 11:23:52 -05:00
vbawol
25b6dd64e5 b630 
fixed two loot positions Land_d_Windmill01_F and Land_d_Windmill01_F
 2016-10-31 10:22:06 -05:00
vbawol
54269db977 Epoch Survival 0.4 b629 
more BE kick fixes
removed pcre3.dll along with other uneeded files
epochserver.dll/so version 0.5.1.8 requires update to
 2016-10-30 17:29:48 -05:00
vbawol
119bc9ac8a Epoch Survival 0.4 b628 2016-10-28 14:37:12 -05:00
vbawol
14058cb832 Epoch Survival 0.4 b626 
increased anti-teleport range
added experimental vehicle immunity if locked inside an owned base (with
jammer)
Players now start with only 30% Hunger and Thirst instead of 100%.
 2016-10-26 15:59:38 -05:00
vbawol
c5bbe34d04 fixed z and y mixup 2016-10-26 15:28:36 -05:00
vbawol
5fdb5f0a7b Epoch Survival 0.4 b621 2016-10-26 10:16:59 -05:00
vbawol
74f1bc12d9 update tanoa props and add atms 2016-10-26 10:16:14 -05:00
vbawol
260f6b031a make Sapper a little less prone to prematurely explode 2016-10-26 09:57:49 -05:00
vbawol
9ba60d5b7c Epoch Survival 0.4 b620 2016-10-24 16:23:09 -05:00
He-Man
00a626604f Update EPOCH_upgradeBUILD.sqf 2016-10-24 23:02:46 +02:00
He-Man
19c171aed1 Update EPOCH_upgradeBUILD.sqf 2016-10-24 23:01:40 +02:00
He-Man
897653f8ee Update EPOCH_upgradeBUILD.sqf 
This was missing in my Changes for Building restrictions.
With this, the Configs "maxdoors" and "maxgates" are useable.
 2016-10-24 22:53:26 +02:00
He-Man
0ccc0c02fb Update EPOCH_Group_BtnInvite.sqf 
If two players from the same group connect at exact the same time, they can not "find" and join each others Group. So you can invite the other player again and he is doubled in the Group.
This prevents from inviting again.
Already implemented on our Server since a few weeks without problems.
 2016-10-24 22:45:14 +02:00
vbawol
4aa8c8152d Epoch Survival 0.4 b619 
[Changed] Dynamic sub menu for inventory item interaction and crafting
options. (Double click item in your inventory)
[Changed] Armor stat inventory feature now dynamic and no longer forced
via config.
[Changed] Group menu and requests are now on the self action menu.
 2016-10-23 23:52:25 -05:00
vbawol
10a6c984c3 moved cfgsounds to main mod 2016-10-18 00:03:39 -05:00
vbawol
7c1e18d6aa Merge pull request #613 from 82ndab-Bravo17/BuildingItems 
Fix for building parts not being returnrd on removal
 2016-10-18 00:01:33 -05:00
vbawol
35cc154792 0.4 b605 gamemode 
added H_105_EPOCH and halloween masks to loot table|
changed version check to check community pbo
 2016-10-14 15:31:01 -05:00
82ndab-Bravo17
8143c8f7fc Fix for building parts not being returnrd on removal 2016-10-06 22:13:25 -04:00
vbawol
d2f053d833 0.3.9 b571 2016-09-25 17:46:50 -05:00
vbawol
e35c64c69d fix for false auto ban 2016-09-25 17:05:34 -05:00
vbawol
da7e5e6d2d experiment with json config generator/parser 2016-09-25 16:33:00 -05:00
vbawol
d372ef9d95 fix for false ban since 1.64 2016-09-25 16:32:10 -05:00
vbawol
3cd165581c Merge pull request #606 from Ignatz-HeMan/patch-1 
Update EPOCH_server_loadPlayer.sqf
 2016-09-08 19:40:53 -05:00
vbawol
6cdb9633d4 0.4 b602 
new compiler with optional v2 format more like BI's
added expanded startup init logic
moved mirror setup to own function inside epoch core
moved server init code to main gamemode init logic.
 2016-09-08 12:09:58 -05:00
vbawol
e817f1e2e5 0.4.0.0 b597 2016-09-04 23:32:38 -05:00
He-Man
145f5b2286 Update EPOCH_server_loadPlayer.sqf 2016-09-02 22:16:40 +02:00
vbawol
1a77c8ee13 load spawn effects function 2016-08-31 21:22:30 -05:00
vbawol
128996724b configize pp effects 2016-08-31 21:20:07 -05:00
vbawol
67e372196c private array cleanup pt3 2016-08-31 21:19:23 -05:00
vbawol
4c25bbd3f0 private array cleanup pt2 2016-08-31 19:40:18 -05:00
vbawol
d285fe4ad0 private array cleanup p1 2016-08-31 19:29:08 -05:00
He-Man
e0962343aa Update server_securityfunctions.sqf 2016-08-31 19:46:49 +02:00
He-Man
3481042f86 Update server_securityfunctions.sqf 2016-08-31 19:45:12 +02:00
He-Man
4626c22ce1 Update EPOCH_spawn_vehicle.sqf 2016-08-31 18:17:58 +02:00
He-Man
c8c474ce34 Update EPOCH_load_vehicles_old.sqf 2016-08-31 18:17:33 +02:00
He-Man
48f109c95c Update EPOCH_load_vehicles.sqf 2016-08-31 18:16:55 +02:00
He-Man
b2203d6933 Update EPOCH_load_vehicles.sqf 2016-08-31 17:45:29 +02:00
He-Man
775ffb0417 Update EPOCH_load_vehicles_old.sqf 2016-08-31 17:44:49 +02:00
He-Man
ffce6bac64 Update EPOCH_spawn_vehicle.sqf 2016-08-31 17:36:08 +02:00
He-Man
e08dff4f6b Update EPOCH_load_vehicles.sqf 2016-08-31 17:33:37 +02:00
He-Man
67eb8bc114 Update EPOCH_spawnLoot.sqf 2016-08-26 18:33:19 +02:00
He-Man
b791137b42 Update EPOCH_worldObjectType.sqf 
Added private Variables, so external scripts calling this script can use "_return" as variable without problems

example EPOCH_lootTrash.sqf:
_return = false;
_getWorldTypes = [str(_x), _inputWorldTypes] call EPOCH_worldObjectType;
_return  <--- Is an array!!!
 2016-08-24 21:20:38 +02:00
vbawol
3cdd1049b3 use setposATL to level out debug building 2016-08-19 08:21:13 -05:00
vbawol
90f5674a74 0.4.0.0 b584 
More work on Dynamic HUD and hudConfigs are now found in CfgEpochClient.
Animal spawn table now found in CfgEpochClient.
Two new functions added to handle get(In|Out)Man Event Handlers.
moved forced disabling of build mode when getting in vehicle to getInMan
EH function.
removed a few unused files.
 2016-08-12 13:15:11 -05:00
vbawol
5fc12c058c Merge pull request #597 from Ignatz-HeMan/patch-3 
Update EPOCH_server_revivePlayer.sqf
 2016-08-11 17:54:27 -05:00
He-Man
2a02112849 Update EPOCH_server_revivePlayer.sqf 
Must be set manually (not by EPOCH_server_effectCrypto), because the Variable must be set on _newplyr !!!
 2016-08-10 18:10:12 +02:00
He-Man
97207eafe5 Update EPOCH_server_takeCrypto.sqf 2016-08-10 17:29:15 +02:00
He-Man
0e174700a1 Update EPOCH_server_takeCrypto.sqf 2016-08-10 17:24:43 +02:00
vbawol
19d36fd802 0.4.0.0 b583 
tweaks to angle and offset of HUD
 2016-08-10 10:20:23 -05:00
vbawol
810fe5d65c bump version to 0.4 
* Adds experimental test of new HUD from @raymix
* Hud elements are added and removed dynamically so that all active
icons are always right justified.
* Icons scale in size when critical levels are reached.
* added use of new A3 features to control angle and scale of hud icons.
* warning and critical levels are controlled via customVarsDefaults.

* Added larger group sizes up to 64 players and increased Krypto costs.
* reworked Finsh login in login fsm to wait for display 46 not to be
Null.
 2016-08-08 14:45:39 -05:00
vbawol
e2d621a4c8 add no Krypto found message 
changed logic of dyna_isDeadPlayer to only allow typeOf Epoch_Male_F or
Epoch_Female_F as isKindOf Man without the isplayer check would have
returned for traders incorrectly. (unless we want killing traders to
come with a Krypto payout)
 2016-08-08 14:24:47 -05:00
vbawol
4ea5404cd5 remove phone and add crypto to player body. 
now uses dynamic action menu for take option on dead player bodies.
 2016-08-08 12:12:20 -05:00
vbawol
9022e07ddc config support for epoch nite light 2016-08-06 12:54:53 -05:00
vbawol
3d13a2216c Duping of bipods pt1 #411 
see notes: https://github.com/EpochModTeam/Epoch/issues/411
 2016-08-06 12:43:03 -05:00
He-Man
11a92e2b56 Update EPOCH_maintainIT.sqf 2016-08-05 20:47:13 +02:00
He-Man
028e0e3495 Update EPOCH_server_maintBUILD.sqf 2016-08-05 20:27:11 +02:00
vbawol
de4bf3d0e9 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2016-07-28 09:57:43 -05:00
vbawol
9e43105413 added changes for #587 2016-07-28 09:57:36 -05:00
He-Man
f093723949 Update EPOCH_startNpcTrade.sqf 
Handgunweapons are 2
Secondary Weapons are 4
 2016-07-26 20:07:05 +02:00
Raymix
89dec8acd7 (placeholder) Radiation effects PP + Drunk PP fix - #834 + #690 2016-07-16 20:11:36 +01:00
Raymix
b77a091eb0 Crafting fixes: 3D Preview + Dan's error #583 2016-07-16 11:55:56 +01:00
vbawol
1688486cd1 configize isBuildAllowed 2016-07-14 16:36:24 -05:00
vbawol
dd54f07534 prevent Error Zero divisor here 2016-07-13 07:51:43 -05:00
vbawol
4420175667 tone down player detonate power 2016-07-12 16:16:03 -05:00
vbawol
792e2d90bf 0.3.9 b570 2016-07-12 15:17:22 -05:00
vbawol
e865ab218e 0.3.9 b569 2016-07-12 14:41:03 -05:00
vbawol
c1a7c977e0 remove references to unneeded player var 2016-07-12 14:38:03 -05:00
vbawol
ee7f7497c0 0.3.9 b568 
change gamemode from Survival to Survive
enabled Ryan Zombies support by default.
added random delay in revenge detonation.
added min alive time setting for player revenge options. Default 15
minutes (900 seconds).
 2016-07-12 14:19:56 -05:00
vbawol
443c6e90bc 0.3.9 b566 
fixed incorrect index in weighted array fnc when zombies not used
added 3 additional water sources
fixed BE kick when base building since b564
removed allowdamage false on player revive, that caused player immunity
to server side AI.
trade request text feedback changed
 2016-07-10 08:54:27 -05:00
vbawol
2fe61d42ca caused revived player to be immune to server side AI 2016-07-09 15:11:10 -05:00
vbawol
4ec283034d change trade request text 
http://epochmod.com/forum/topic/42379-p2p-trade-message/
 2016-07-09 15:09:44 -05:00
vbawol
e2f4410b3d add additional water source 2016-07-09 14:19:19 -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
He-Man
76eace8252 Update CfgEpochClient.hpp 2016-07-09 17:45:41 +02: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
35b28e94f9 fix comment 2016-07-09 09:08:51 -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
dd42401de2 Merge pull request #568 from Ignatz-HeMan/patch-1 
Building Configs
 2016-07-09 08:40:54 -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
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
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
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
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
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
6a01291440 0.3.9.0546 
add server invoked looting text based feedback
 2016-06-29 13:35:37 -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
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
Andrew Gregory
ee9f89f29c Added safe zone protection and fully compiled :) 2016-06-19 20:15:56 +01:00
Andrew Gregory
e0db89a7c7 MIssion fixes. 
Add remove marker, update with new create marker and create object options. Needs more work but is now functional.
 2016-06-19 20:13:23 +01:00
Andrew Gregory
b033a852a1 MIssion Updates 
Add allowed vehicle check and destroy option for missions, i.e. military crash site..
 2016-06-19 20:11:38 +01:00
Andrew Gregory
be2622abbc Handle cleanup in zombie spawn. 2016-06-19 20:10:03 +01:00
Andrew Gregory
31877ff008 Test for horde numbers when spawning. 2016-06-19 20:08:54 +01:00
vbawol
6075d598bc remove template city 2016-06-19 09:08:41 -05:00
vbawol
aa296fa9da 0.3.9.0536 
changed last few refs to EPOCH_server_createMarker >
EPOCH_server_makeMarker, was causing #40 scripts kick.
 2016-06-19 08:54:30 -05:00
vbawol
3908387306 0.3.9.0535 2016-06-18 13:56:42 -05:00
vbawol
95e8b6a2d4 re-revert change SERVER_VARS > EPOCH_playerMissionArray 2016-06-18 13:53:16 -05:00
vbawol
fa2185a27d 0.3.9.0534 
max out zombie count on spawn chance
allow variable increase to antagonist array
 2016-06-18 12:57:53 -05:00
Andrew Gregory
ecd09836e0 Remove create marker function. Add Remove marker 2016-06-18 16:39:26 +01:00
Andrew Gregory
a5319499ba Remove local marker 
Supporting Make Marker / missions.
 2016-06-18 16:38:24 +01:00
Andrew Gregory
951e52521e Create Local Marker with Options 2016-06-18 16:37:47 +01:00
Andrew Gregory
96e1468ec7 Not a function - moving process to generic 
and renaming
 2016-06-18 16:36:58 +01:00
vbawol
115acbc837 0.3.9.0533 2016-06-18 09:36:23 -05:00
Raymix
fd5e8f0c6e Small adjustment 2016-06-18 14:38:58 +01:00
Andrew Gregory
20b6d9884d Missing file reference for messaging 
Assuming these are the correct files. However, there are still no messages appearing ?
 2016-06-18 12:57:55 +01:00
Andrew Gregory
7105be4b9e Duplicate entry b_calochlaena_f_p3d 
removed from line 534
 2016-06-18 11:45:37 +01:00
vbawol
88e00323a0 0.3.9.0532 2016-06-17 21:42:50 -05:00
Raymix
43ef53312e auto-merge conflict fix 2016-06-18 02:47:36 +01:00
Raymix
8cf9965d1c Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 
Conflicts:
	Sources/epoch_code/System/task_control.fsm
 2016-06-18 02:43:28 +01:00
Raymix
b219235534 New Function: Epoch_message 2016-06-18 02:22:29 +01:00
Andrew Gregory
9803eb2f67 Updated server_vars usage. 2016-06-17 23:12:41 +01:00
vbawol
67e38a5609 0.3.9.0530 2016-06-17 17:09:25 -05:00
vbawol
08c674cbd2 revert changes to task fsm save var 2016-06-17 17:07:54 -05:00
vbawol
1fe18186c6 Tanoa cfgEpochclient config 2016-06-17 17:07:22 -05:00
vbawol
20ca7cf00d 0.3.9.0529 2016-06-17 16:57:29 -05:00
vbawol
62b5c2f760 added Tanoa world interaction configs. 2016-06-17 16:41:21 -05:00
Andrew Gregory
75c5792381 Update Marker 
And add new remove marker.
 2016-06-17 19:08:06 +01:00
Andrew Gregory
aad906168e New Marker Functions 2016-06-17 19:07:24 +01:00
Andrew Gregory
c2746d8765 Update 2016-06-17 19:06:38 +01:00
Andrew Gregory
b611145eb9 Remove Map Marker 2016-06-17 19:00:07 +01:00
Andrew Gregory
7b22f6a35a Create Marker 
Create a map marker.
 2016-06-17 18:59:46 +01:00
Andrew Gregory
0b39d0179c Replaced 
Using a name that isn't caught by BE :)
 2016-06-17 18:59:19 +01:00
Andrew Gregory
66a553c2fb Remove Duplicate Entry 
Land_Church_03_F
 2016-06-17 18:37:09 +01:00
vbawol
80f4f9a449 0.3.9.0528 
[fixed] invalid vehicle token check was not enabled if simulation
handler was disabled.
[changed] rework load vehicle script to make vehicles immune for 120
seconds and then apply damage and hitpoints.
 2016-06-16 19:27:06 -05:00
vbawol
3fcb40b56e 0.3.9.0527 2016-06-16 16:59:35 -05:00
vbawol
69e38997ae use new custom var to track mission state 
EPOCH_playerMissionArray
 2016-06-16 16:53:59 -05:00
vbawol
7218acaf5a 0.3.9.0526 2016-06-16 15:49:34 -05:00
vbawol
d5a7f3ac7d more Tanoa loot postions 2016-06-16 15:35:02 -05:00
Andrew Gregory
d698b0342f Central Trader 
Central Trader Props and Traders.
 2016-06-16 13:16:55 +01:00
vbawol
072ef02e77 add isNull check to load vehicle 2016-06-15 10:47:29 -05:00
vbawol
7c8e645169 prevent holster when moving 2016-06-15 10:47:29 -05:00
Andrew Gregory
c85507f169 MIssing SemiColons 2016-06-15 11:51:15 +01:00
vbawol
2287f4b530 0.3.9.0525 2016-06-14 20:09:53 -05:00
vbawol
1d66702e95 remove perpetual zombie respawn 2016-06-14 20:05:22 -05:00
vbawol
f253648423 0.3.9.0524 2016-06-14 19:58:22 -05:00