Commit Graph

36 Commits

Author SHA1 Message Date
e8ba309765 Merge pull request #3887 from gpgpgpgp/patch-2
add a line to get rid of 4 first aid kits in the invisible fast roping helper
2016-06-11 21:53:34 +02:00
0c28cd4413 add a line to get rid of 4 first aid kits in the invisible helper
The helper "ace_fastroping_helper" inherits from Helicopter_Base_F, and here's chain of inheritance.
class CfgVehicles
{
	class AllVehicles;
	class Air: AllVehicles
	{
		class TransportItems
		{
			class _xx_FirstAidKit
			{
				name = "FirstAidKit";
				count = 4;
			};
		};
	};
	class Helicopter: Air
	{
	};
	class Helicopter_Base_F: Helicopter
	{
	};
	class ace_fastroping_helper: Helicopter_Base_F
	{
		class TransportItems {};	// now overrides the first aid kits
	};
};
Was a happy and funny surprise to pick up some decent medical supplies from one end of a cut rope.
2016-06-08 17:26:23 +08:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros
Use new quoted function macros
2016-05-30 21:00:23 +02:00
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
d7b0bde1ca Fix Wildcat attach point 2016-04-12 12:28:48 -05:00
5d70db3d9b LoadPerson - Only try vehicles that have room
Fix #2965
The FRIES is a "Helicopter" so we were trying to load into it, because
it was closest.
Also disable Cargo system on it so we don't load other things into it
And remove all interactions on it as well.
2016-04-12 12:12:49 -05:00
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
a841839aa6 don't overwrite helicopter sub class self actions 2016-03-19 19:37:26 +01:00
69bd858167 Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes
Conflicts:
	addons/fastroping/CfgMoves.hpp
	addons/fastroping/CfgVehicles.hpp
2016-03-08 15:24:23 -03:00
afe835816f Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes
Conflicts:
	addons/fastroping/CfgVehicles.hpp
2016-03-08 15:07:45 -03:00
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
84af4b7676 Force open ramps on helicopters 2016-03-06 19:53:37 +01:00
8e895e8cff Added gantry hiding animation 2016-03-05 23:21:10 +01:00
303f8d93b9 simplify inheritance 2016-03-02 22:16:40 +01:00
0399335a3f Make the FRIES inherit from Helicopter_Base_F. Fix #3504 2016-03-02 14:41:41 -03:00
75c2e3d032 Added QUOTE macros to fastroping configs 2016-02-28 18:56:45 +01:00
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
b2337d7485 Config cleanup 2016-02-22 22:21:13 +01:00
b72751e693 Fixed macro 2016-02-22 21:06:26 +01:00
c2856fd8c7 Fixed scopes 2016-02-22 20:58:55 +01:00
06f8f277ac Added Eden Integration 2016-02-22 14:40:21 +01:00
671fcd90b4 Integrated new model, fixed config, added Kasatka door animation 2016-02-22 00:31:31 +01:00
c917cdab8d New FRIES model, new animations 2016-02-22 00:31:29 +01:00
c1ea6fd327 Fixed locality issues, moved rope creation and simulation to server
Fix rope cut while fastroping

Locality fix pt2 - serverside ropes
2016-02-22 00:31:28 +01:00
8f49715ae6 Cleanup function params and headers
Cleanup function params and headers

Removed unecessary param
2016-02-22 00:31:27 +01:00
b2fd7f93b5 Cleanup privates and function params 2016-02-22 00:31:24 +01:00
7d90f707c0 Improved config 2016-02-22 00:31:22 +01:00
cc1a54d900 Updated model 2016-02-22 00:31:22 +01:00
7241e703ae Code cleanup, restructured rope deployment 2016-02-22 00:31:21 +01:00
2695fc6beb Better twitching fix, failsaves and EHs 2016-02-22 00:31:20 +01:00
3ec9369a9e Added FRIES object, FRIES module, debugging code 2016-02-22 00:31:20 +01:00
890171e629 Added rope origins for all vanilla helicopters 2016-02-22 00:31:17 +01:00
eb028c0d1b Initial commit fastroping 2016-02-22 00:31:15 +01:00