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,208 Commits 8 Branches 78 Tags 202 MiB
a993d5bb7b
Commit Graph

722 Commits

Author SHA1 Message Date
vbawol
ea1e96d807 0.5 b707 2017-03-23 16:11:25 -05:00
vbawol
70f91f6041 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-03-23 15:53:44 -05:00
vbawol
2c75d87869 revert, makes variable out of scope 2017-03-23 15:51:44 -05:00
vbawol
d2948dfc7e Merge pull request #712 from Ignatz-HeMan/patch-3 
Dyna Buildmode also persistent without Energy
 2017-03-23 15:51:31 -05:00
vbawol
b5b54bd513 more fixes and cleanup 2017-03-23 15:38:19 -05:00
He-Man
b3647282e2 Dyna Buildmode also persistent without Energy 
Players often are confused, why Build mode is not in DynaMenu
 2017-03-23 21:08:18 +01:00
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