8432 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
esteldunedain	41f8628917	Change cache location type to ACE_HashLocation	2016-01-20 22:20:16 -03:00
esteldunedain	f7cfbebc49	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX	2016-01-20 22:19:11 -03:00
PabstMirror	3dac426bc6	Merge pull request #3132 from acemod/interactionMenuCleanup ... Cleanup Interaction Menu	2016-01-20 17:04:10 -06:00
PabstMirror	abb01e0653	Merge pull request #3129 from acemod/frag-cacheIfWillFrag ... Frag - only run addPfhRound on ammo that will frag (for master)	2016-01-20 17:03:55 -06:00
Thomas Kooi	232fe62d8d	Merge pull request #3195 from acemod/fix3194 ... Fix typo in ACE_hearing config	2016-01-20 22:26:13 +01: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
PabstMirror	a140f29784	Remove inherited classes that were not used	2016-01-20 09:45:03 -06: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	1a115e7f9c	Fix #3194	2016-01-20 11:48:12 -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	5b90fd8b81	Set default particle effect on for the local player, as per current and historic behaviour.	2016-01-19 17:25:14 -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
SilentSpike	ca5f6df3d0	Merge pull request #3147 from acemod/spectatorBandAid ... Restart specatator display if player in unitList	2016-01-19 20:15:24 +00:00
esteldunedain	8b7ed38990	Add a PFH to cool down all player weapons at (infrequent) regular intervals	2016-01-19 17:04:51 -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
esteldunedain	782934c4b2	Add the setApproximateVariablePublic function to common	2016-01-19 16:58:07 -03:00
esteldunedain	3792acd7f7	Merge branch 'master' into deterministicOverheatingX	2016-01-19 15:57:38 -03:00
Thomas Kooi	b99be6122b	Merge pull request #3187 from acemod/fixFCS ... Add missing FUNC to FCS key (Rangefinders)	2016-01-19 16:05:56 +01:00
PabstMirror	6d6cbec5ef	Add missing FUNC to FCS key (Rangefinders) ... #3160	2016-01-19 09:02:51 -06:00
PabstMirror	69771d531d	Merge pull request #3173 from acemod/fixInvintoryLock ... Fix Vehicle inventory is not locked	2016-01-19 08:37:58 -06:00
PabstMirror	0ea1c0c03f	Cleanup non-working code, and documentation	2016-01-19 08:31:52 -06:00
Thomas Kooi	e083e60e8c	Merge pull request #3142 from acemod/switchUnitsCleanup ... Cleanup SwitchUnits, Possible fix for #3122	2016-01-19 09:40:24 +01:00
Thomas Kooi	33479ffcae	Merge pull request #3146 from acemod/Explosives_DetonateTrigger ... Function to detonate explosives via script	2016-01-19 09:38:43 +01:00
Thomas Kooi	aa535c9167	Merge pull request #3177 from acemod/fixJavelinZeus ... Javelin - Fix zeus RC after switchCamera	2016-01-19 09:36:08 +01:00
Thomas Kooi	6bbf48177b	Merge pull request #3179 from acemod/rhs_compat_pso1m21 ... RHS Compat: Add PSO-1M2-1 windage adjust	2016-01-19 09:35:20 +01:00
Thomas Kooi	4ee338c57e	Merge pull request #3178 from acemod/scopes_hideNonAdjustments ... Scopes: Don't show adjustment or play click sound if the adjustment doesn't happen	2016-01-19 09:35:01 +01:00
Thomas Kooi	5c1f55a0f1	Merge pull request #3181 from acemod/leaveMyPlugsAlone ... Do not add or remove earplugs if gear should be preserved	2016-01-19 09:34:38 +01:00
Thomas Kooi	46f832379a	Merge pull request #3120 from acemod/explosives_actionmenu_cleanup ... Clean up explosive interaction menu	2016-01-19 09:32:26 +01:00
Thomas Kooi	f5d71ca03c	Merge pull request #3183 from acemod/codeCleanupGforces ... Code cleanup of Gforces module V2	2016-01-19 09:31:16 +01:00
Thomas Kooi	fbb358233b	Merge pull request #3172 from acemod/overpressureCleanup ... Overpressure cleanup and fix distance check	2016-01-19 09:30:43 +01:00
esteldunedain	f599542b8e	gforces cleanup. Close #2130	2016-01-19 00:18:01 -03:00
commy2	8731e8e338	Merge pull request #3133 from acemod/gottaCacheEmAll ... Use Function Caching in CBA	2016-01-18 20:27:39 +01:00
esteldunedain	0a91dfa7b2	Do not add or remove earplugs if gear should be preserved. Fix #3180.	2016-01-18 13:23:55 -03:00
VKing	2af3d9e769	Don't show adjustment or click sound if the adjustment doesn't happen	2016-01-18 16:16:53 +01:00
VKing	569179e0bf	Add the PSO-1M2-1 windage adjust	2016-01-18 14:59:38 +01:00
PabstMirror	67087d7c88	Capitalization	2016-01-18 00:27:19 -06:00
PabstMirror	a5c6c5579f	#3175 - Javelin - Fix zeus RC after switchCamera	2016-01-17 12:12:05 -06:00
PabstMirror	48a1ddd401	#3166 - Fix Vehicle inventory is not locked	2016-01-16 21:58:59 -06:00
PabstMirror	35e6a181b5	opps	2016-01-16 17:48:58 -06:00
PabstMirror	893c6658a5	Fix debug msg order, re-add local check on eh	2016-01-16 17:29:57 -06:00
PabstMirror	cea2b55d56	Merge pull request #3143 from acemod/pyConfigValidator ... Python tool to validate configs (using MakePbo)	2016-01-16 16:05:42 -06:00
PabstMirror	a875d6a870	Overpressure cleanup and fix distance check	2016-01-16 15:53:28 -06:00
Thomas Kooi	c8c91d2af7	Merge pull request #3138 from acemod/increaseTrainingInLocations ... Medical Locations Boost Training	2016-01-16 21:59:45 +01:00