98 Commits

Author	SHA1	Message	Date
jonpas	26fbc36cab	Merge branch 'master' into cbaEventSystem	2016-05-31 22:36:08 +02:00
commy2	fd26e2e44e	Merge pull request #3516 from acemod/cbamissiontime ... replace timePFH with CBA_missionTime	2016-05-30 21:23:57 +02:00
commy2	7512c4e52e	manual merge	2016-05-30 21:14:34 +02:00
jonpas	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
jonpas	5d36f84eb1	qGVAR overheating and reloadlaunchers	2016-05-25 20:13:36 +02:00
SilentSpike	c4b75160a4	Run event renaming script	2016-05-24 14:13:11 +01:00
SilentSpike	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
jonpas	e7dbcd7b58	Replace delayed execution functions with new CBA counterparts	2016-05-22 15:29:01 +02:00
commy2	d93132dac8	more replacing	2016-05-18 11:57:40 +02:00
commy2	da70854568	manual merge	2016-05-18 11:48:27 +02:00
PabstMirror	cf92ba9c46	Overheating - Add Master Enabled Setting (barrelPR)	2016-05-04 14:59:04 -05:00
PabstMirror	bc584b4c95	Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation	2016-05-04 13:00:34 -05:00
James McCartney	153cd28f94	Change event name to weaponJammed	2016-04-11 23:09:45 +01:00
James McCartney	121c45eb84	Raise a local event when a weapon is jammed	2016-04-11 22:29:33 +01:00
jonpas	85b4366368	Use new QPATHTOF and QPATHTOEF macros	2016-04-08 20:34:50 +02:00
esteldunedain	ae8cbb4834	Add "check temperature" and "swap barrel" actions for AARs	2016-03-05 23:33:30 -03:00
esteldunedain	ebfd76107e	The function name was changed in CBA	2016-03-05 13:15:56 -03:00
esteldunedain	62f598b2a6	Use the correct CBA function name, defining it in ACE as long as it doesn't exist already.	2016-03-05 13:11:20 -03:00
commy2	467075ad67	replace timePFH with CBA_missionTime	2016-03-02 11:01:39 +01:00
esteldunedain	d886289716	Display the new weapon temperature right after swapping barrels	2016-03-01 19:27:39 -03:00
esteldunedain	850a499c0e	Localize spare barrel's displayName	2016-03-01 19:26:20 -03:00
esteldunedain	e6a2ca7102	Fix typos	2016-03-01 19:25:45 -03:00
esteldunedain	a041555381	Add an animation and progressbar to the "Check spare barrels temperatures" action	2016-03-01 18:16:14 -03:00
esteldunedain	46a96dd5da	Move spare barrel event handlers out of postInit	2016-03-01 18:14:36 -03:00
esteldunedain	e950552345	Track temperatures of spare barrels	2016-02-27 00:29:30 -03:00
PabstMirror	37eb353edf	Cleanup Merge	2016-02-22 15:03:40 -06:00
PabstMirror	6dc0d7d4f5	Merge branch 'master' into moreSevereJamming	2016-02-22 14:57:40 -06:00
commy2	9712f9c1a4	manual merge	2016-02-22 16:24:10 +01:00
esteldunedain	e4e2f0d661	Add a 10% chance for the unjam action to fail (like in ACE2)	2016-02-20 21:09:52 -03:00
esteldunedain	dc7c4ff4fd	Increase the jam chance of all weapons at high temperatures	2016-02-20 20:26:30 -03:00
esteldunedain	11f3189306	Add an unjam action to the interact menu when the weapon is jammed	2016-02-20 20:19:56 -03:00
esteldunedain	2dbf979ec6	By default, prevent reloading from automatically clearing a weapon jam (like in ACE2)	2016-02-20 20:05:59 -03:00
commy2	73d5b3c77b	relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon	2016-02-20 22:41:24 +01:00
esteldunedain	d00587f367	Minor fixes	2016-02-20 17:40:19 -03:00
esteldunedain	2dd835b56b	Substantially increase overheating when using silencers or flash suppresors. Optimize overheating calculations for the player through caching.	2016-02-18 15:58:44 -03:00
esteldunedain	5aa763f0c6	Apply the ufeh to ACE_Overheating	2016-02-06 17:59:54 -03:00
esteldunedain	758611d230	Restrict temp update to current weapon, and only primary or handgun	2016-01-23 11:48:23 -03:00
esteldunedain	91b7c7de61	Change the varname of the weapon data cache to be consistent with other modules	2016-01-20 22:22:53 -03:00
esteldunedain	9d13cc6f60	Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments.	2016-01-20 15:19:46 -03:00
esteldunedain	851615a234	Inherit custom gesture classes.	2016-01-20 13:44:51 -03:00
esteldunedain	7860f375c2	Better func description	2016-01-20 13:07:51 -03:00
esteldunedain	89106f6953	Replace addPerFrameHandler for waitAndExecute	2016-01-20 13:05:47 -03:00
esteldunedain	80b9a8961a	Improve reload animations	2016-01-20 12:48:39 -03:00
esteldunedain	bce572e1df	Derp	2016-01-20 12:15:25 -03:00
esteldunedain	19ccf52425	MRBS to mrbs	2016-01-20 12:05:35 -03:00
esteldunedain	6b4b8b707c	Prefix new configs for consistency	2016-01-20 11:42:05 -03:00
esteldunedain	2f7cac68a5	Small fixes	2016-01-20 10:59:58 -03:00
esteldunedain	c78f2f8479	Gotcha travis	2016-01-19 17:29:58 -03:00
esteldunedain	9bcabd081b	Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).	2016-01-19 17:24:01 -03:00
esteldunedain	0313e7b322	Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately	2016-01-19 17:03:47 -03:00