Commit Graph

2572 Commits

Author SHA1 Message Date
He-Man
88e8bcf667 Saisonal Trader Clothings 2018-10-25 13:35:13 +02:00
He-Man
f3030bb4d6 Some better Service Point examples for Altis 2018-10-19 17:59:23 +02:00
He-Man
fe3a1d62f2 small npctrade fixes
In very rare cases it could be, that the Server or Client do not take the nearest local vehicle for trading
2018-10-19 17:35:00 +02:00
He-Man
7ec16f978e PR from @Ghostrider-DbD
Thanks!
2018-10-11 19:12:14 +02:00
He-Man
af8e8b4564 Final pos for traders 2018-09-23 02:25:17 +02:00
He-Man
cb7619831f Displayname for Vehicle lock / unlock 2018-08-30 18:47:45 +02:00
He-Man
f493906efa Prevent group join, if already in group 2018-08-29 22:06:07 +02:00
He-Man
26e39c87e4 Usage of new SIM / Ghost Classes 2018-08-24 20:04:12 +02:00
He-Man
f65b067870 removed multiple entry 2018-08-24 18:55:45 +02:00
He-Man
b5d5640c76 E-Pad images 2018-08-24 18:02:25 +02:00
He-Man
2cfea60919 E-Pad images 2018-08-24 17:47:46 +02:00
He-Man
dc63503a43
Merge pull request #992 from Timst10/experimental
Update CfgEpochVehicles.h for additions
2018-08-23 19:20:09 +02:00
Timst10
868bd1c53f
Update CfgEpochVehicles.h 2018-08-23 07:22:38 +02:00
Timst10
24f3046271
Update CfgEpochVehicles.h for additions
+Added Colours for SUV in config
+Added Hellcat
2018-08-21 21:38:16 +02:00
He-Man
e033973deb Ability to skip loot for buildings 2018-08-20 22:23:36 +02:00
He-Man
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
He-Man
c91b182f3d
Merge pull request #991 from morgoth0/patch-16
Patch 16
2018-08-16 16:47:21 +02:00
Grahame
ad4d044d41
Update CfgActionMenu_target.hpp
Corrected spelling of crypto
2018-08-16 10:35:18 -04:00
Grahame
72f519c2f0
Update EPOCH_Group_onLoad.sqf
Corrected spelling of crypto
2018-08-16 10:34:35 -04:00
Grahame
1713516811
Update EPOCH_cGroup_BtnCreate.sqf
Corrected spelling of crypto
2018-08-16 10:34:01 -04:00
Grahame
fd14dfa214
Update EPOCH_npcTraderAdd.sqf
Corrected spelling of crypto
2018-08-16 10:33:14 -04:00
Grahame
33220bfacc
Update EPOCH_npcTraderAdd2.sqf
Corrected spelling of crypto
2018-08-16 10:32:36 -04:00
Grahame
14653c13cc
Update EPOCH_npcTraderAdd3.sqf
Corrected spelling of crypto
2018-08-16 10:31:42 -04:00
Grahame
d14cd07ad8
Update EPOCH_Group_BtnInvite.sqf
Corrected spelling of crypto
2018-08-16 10:30:58 -04:00
Grahame
278008f5fd
Update EPOCH_TradeLoop.sqf
Corrected spelling of crypto
2018-08-16 10:29:28 -04:00
Grahame
4a6cfa13b4
Update EPOCH_maintainIT.sqf
Corrected spelling of crypto
2018-08-16 10:26:55 -04:00
Grahame
be565d98b3
Update EPOCH_cGroup_onLoad.sqf
Corrected spelling of crypto
2018-08-16 10:26:18 -04:00
Grahame
ae31744203
Update EPOCH_takeCrypto.sqf
Correct the spelling of Crypto
2018-08-16 10:24:16 -04:00
He-Man
911ce3da49
Merge pull request #990 from Timst10/experimental
Rusty custom skin additions for config
2018-08-14 19:30:54 +02:00
Timst10
f656c2aaa0
Update CfgEpochVehicles.h
deleted Tribalskin for recognition of Racing Plane
2018-08-14 08:51:57 +02:00
Timst10
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
He-Man
5da8470f27 Usage of custom skins
Do not add this before Epoch 1.3 client files!
2018-08-09 17:49:35 +02:00
He-Man
403b1140bc Simplified Weather script (and config) 2018-07-11 17:23:43 +02:00
He-Man
7fe6974a50 Prevent debris from spawning inside Vehicles 2018-07-11 15:35:53 +02:00
He-Man
b2cd465fbf Make UAV's useable with DynaMenu 2018-07-11 14:50:19 +02:00
He-Man
43ae5cc72e Radsuit protect against toxic (not bites) 2018-07-11 13:30:02 +02:00
He-Man
2245c36797 Model for Charger in Crafting Menu 2018-07-11 13:20:20 +02:00
He-Man
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
He-Man
e7f8ab7bbe avoid allmissionobjects 'PlotPole_EPOCH' #2 2018-06-30 13:43:04 +02:00
He-Man
3fd9071c51 avoid allmissionobjects 'PlotPole_EPOCH' 2018-06-30 13:37:35 +02:00
He-Man
4ee52e3881 Plots in var for later improvements 2018-06-25 18:21:25 +02:00
He-Man
32d73a7fac Small Fix for AdminTools 2018-06-24 22:47:12 +02:00
He-Man
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
vbawol
8de2f07525
Merge pull request #986 from RZSenfo/patch-2
fix missing param
2018-06-23 05:21:00 -05:00
vbawol
b1f875fdb2
Merge pull request #985 from RZSenfo/patch-1
EnableDebugConsole can be an array
2018-06-23 05:20:46 -05:00
RZSenfo
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
RZSenfo
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
He-Man
6d36f5dcd3 Rope break fix 2018-06-22 19:53:47 +02:00
He-Man
abf225a68c Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2018-06-21 21:59:42 +02:00