Commit Graph

2707 Commits

Author SHA1 Message Date
2525391f22 E-Pad tweaks
- Added E-Pad to DynaMenu (can be disabled)
- Fix to not close E-Pad on space release
- Removed MapMarkers from Map-DynaMenu (moved into E-Pad)
2018-08-20 19:19:20 +02:00
c91b182f3d Merge pull request #991 from morgoth0/patch-16
Patch 16
2018-08-16 16:47:21 +02:00
ad4d044d41 Update CfgActionMenu_target.hpp
Corrected spelling of crypto
2018-08-16 10:35:18 -04:00
72f519c2f0 Update EPOCH_Group_onLoad.sqf
Corrected spelling of crypto
2018-08-16 10:34:35 -04:00
1713516811 Update EPOCH_cGroup_BtnCreate.sqf
Corrected spelling of crypto
2018-08-16 10:34:01 -04:00
fd14dfa214 Update EPOCH_npcTraderAdd.sqf
Corrected spelling of crypto
2018-08-16 10:33:14 -04:00
33220bfacc Update EPOCH_npcTraderAdd2.sqf
Corrected spelling of crypto
2018-08-16 10:32:36 -04:00
14653c13cc Update EPOCH_npcTraderAdd3.sqf
Corrected spelling of crypto
2018-08-16 10:31:42 -04:00
d14cd07ad8 Update EPOCH_Group_BtnInvite.sqf
Corrected spelling of crypto
2018-08-16 10:30:58 -04:00
278008f5fd Update EPOCH_TradeLoop.sqf
Corrected spelling of crypto
2018-08-16 10:29:28 -04:00
4a6cfa13b4 Update EPOCH_maintainIT.sqf
Corrected spelling of crypto
2018-08-16 10:26:55 -04:00
be565d98b3 Update EPOCH_cGroup_onLoad.sqf
Corrected spelling of crypto
2018-08-16 10:26:18 -04:00
ae31744203 Update EPOCH_takeCrypto.sqf
Correct the spelling of Crypto
2018-08-16 10:24:16 -04:00
911ce3da49 Merge pull request #990 from Timst10/experimental
Rusty custom skin additions for config
2018-08-14 19:30:54 +02:00
f656c2aaa0 Update CfgEpochVehicles.h
deleted Tribalskin for recognition of Racing Plane
2018-08-14 08:51:57 +02:00
70363a1a94 Rusty custom skin additions
-Added SUV: black, orange,red
-Added M900: blue, ION
-Added browngreen colour for C_Plane
-Added Tribal skin for C_Plane (racing)
2018-08-10 02:10:09 +02:00
5da8470f27 Usage of custom skins
Do not add this before Epoch 1.3 client files!
2018-08-09 17:49:35 +02:00
403b1140bc Simplified Weather script (and config) 2018-07-11 17:23:43 +02:00
7fe6974a50 Prevent debris from spawning inside Vehicles 2018-07-11 15:35:53 +02:00
b2cd465fbf Make UAV's useable with DynaMenu 2018-07-11 14:50:19 +02:00
43ae5cc72e Radsuit protect against toxic (not bites) 2018-07-11 13:30:02 +02:00
2245c36797 Model for Charger in Crafting Menu 2018-07-11 13:20:20 +02:00
77b1434a08 E-Pad Scans + Earplug Fixes
- Added wait time to E-Pad Scans
- Added needed energy to E-Pad Scans
- Smaller Earplug-fixes
2018-07-11 13:10:03 +02:00
e7f8ab7bbe avoid allmissionobjects 'PlotPole_EPOCH' #2 2018-06-30 13:43:04 +02:00
3fd9071c51 avoid allmissionobjects 'PlotPole_EPOCH' 2018-06-30 13:37:35 +02:00
4ee52e3881 Plots in var for later improvements 2018-06-25 18:21:25 +02:00
32d73a7fac Small Fix for AdminTools 2018-06-24 22:47:12 +02:00
910b3703e8 Merge pull request #988 from MGTDB/patch-4
Update EPOCH_server_save_killedBuilding.sqf
2018-06-24 16:00:51 +02:00
MGT
330017686e Update EPOCH_server_save_killedBuilding.sqf
Check if building killer is the owner and log accordingly
2018-06-24 14:26:55 +01:00
8de2f07525 Merge pull request #986 from RZSenfo/patch-2
fix missing param
2018-06-23 05:21:00 -05:00
b1f875fdb2 Merge pull request #985 from RZSenfo/patch-1
EnableDebugConsole can be an array
2018-06-23 05:20:46 -05:00
42acfb372c fix missing param
as seen here

a9dc9f044b/Sources/epoch_server/compile/epoch_player/EPOCH_fnc_updatePlayerStats.sqf (L15)

second param is _killer (object)
2018-06-23 09:34:29 +02:00
2cdac43fce EnableDebugConsole can be an array
also if set to 1, player must be host/admin to see it
2018-06-23 09:31:27 +02:00
6d36f5dcd3 Rope break fix 2018-06-22 19:53:47 +02:00
abf225a68c Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2018-06-21 21:59:42 +02:00
2f1ba9a20d E-Pad + Earplugs (WIP)
First Test of the E-Pad.
Current Apps are only examples
Everybody is welcome to add suggestions for Scripts / Apps.
2018-06-21 21:59:37 +02:00
fcef6264dd Merge pull request #984 from morgoth0/patch-15
Update epochconfig.hpp
2018-06-20 14:16:54 -05:00
66218a3ad7 Update epochconfig.hpp
Removed the suggested static weather array for a cold, foggy, rainy day due to it being a little *too* foggy. In most cases anyway people use the static weather array for a sunny, no rain and no fog environment.
2018-06-20 15:09:36 -04:00
9915cb1939 If null, try cursorobject 2018-06-18 18:04:28 +02:00
8581828479 Merge pull request #983 from RZSenfo/experimental
#982 example use of CfgDisabledCommands
2018-06-17 10:35:12 -05:00
59621fe723 example use of CfgDisabledCommands 2018-06-17 14:46:34 +02:00
f2add15ed9 lazy evaluation - thx to Senfo 2018-06-12 21:38:24 +02:00
1e64f6702a Handle Marker in Masterloop (for later E-Pad use) 2018-06-12 20:22:37 +02:00
32e1836d1e Preload often used configs in Masterloop 2018-06-12 17:57:09 +02:00
7b9ad23a76 Prepared (not used) more custom EH's 2018-06-06 19:57:22 +02:00
ea8ce419b3 change in experimental workshop IDs 2018-06-02 05:02:01 -05:00
0d06bbfba1 call EPOCH_defaultVars_SEPXVar 2018-06-01 16:32:01 +02:00
d55c654b1c AdminMenu Search All 2018-05-30 22:26:30 +02:00
92c3280f4f Admin Lock / Unlock 2018-05-28 22:57:47 +02:00
0e095b54a1 Update changelog.md 2018-05-24 13:13:54 -05:00