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,095 Commits 8 Branches 78 Tags 202 MiB
0b6f149fdd
Commit Graph

663 Commits

Author SHA1 Message Date
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
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