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,061 Commits 8 Branches 78 Tags 202 MiB
086c97f20f
Commit Graph

1061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vbawol
0c73e39045 update credits 2016-12-21 09:13:04 -06:00
vbawol
c7fece626f add some apex backpacks to BE filter 2016-12-18 13:22:19 -06: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
vbawol
92d849e5c5 Merge pull request #686 from Ignatz-HeMan/patch-12 
Skip saving already killed Vehicles
 2016-12-14 10:13:14 -06:00
vbawol
d8f52243dd Merge pull request #685 from Ignatz-HeMan/patch-11 
Added Filter for TraderMenu
 2016-12-13 17:00:43 -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
241a247c08 Merge pull request #684 from EpochModTeam/experimental 
release 0.4 b672
 2016-12-13 07:53:09 -06:00
vbawol
fa834cebe4 revert scripts change for 1.66 hotfix 2016-12-13 07:44:51 -06:00
vbawol
dc93ccdbf4 b672 2016-12-12 13:25:00 -06:00
vbawol
5f95340c7f Merge pull request #683 from Ignatz-HeMan/patch-10 
Removed workaround for PlayerDisconnected
 2016-12-12 12:40:24 -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
vbawol
b5b947d278 Merge pull request #681 from Ignatz-HeMan/patch-9 
Option to make BaseParts indestructible
 2016-12-12 09:52:37 -06:00
He-Man
77f58457cf Update epochconfig.hpp 2016-12-11 16:23:13 +01:00
He-Man
69b2bb401a Option to make BaseParts indestructible 2016-12-11 16:20:39 +01: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
vbawol
b4d675ad71 Merge pull request #680 from Ignatz-HeMan/patch-7 
Update Building Script + PlayerDeath
 2016-12-10 23:15:54 -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
461af9b864 Merge pull request #669 from EpochModTeam/experimental 
release 0.4 b668
 2016-12-02 10:25:51 -06: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