Commit Graph

19 Commits

Author SHA1 Message Date
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
2015-04-13 21:35:53 +02:00
commy2
5ff1d9863d remove +2 offset for check temperature, also fix the shade of grey, #431 2015-04-10 17:48:21 +02:00
esteldunedain
038c871356 Make overheating use bullet mass in grains introduced by ab 2015-04-05 20:11:42 -03:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Glowbal
2250255d65 Clientside display text option for weapon jamming 2015-03-08 16:57:06 +01:00
Nicolás Badano
80778cf8db overheating: updated headers 2015-02-08 19:54:12 -03:00
Glowbal
3f0b6650e0 Added weapon resting & weapon jam sounds 2015-02-01 11:11:51 +01:00
PabstMirror
5e932f8c71 Replace calls to progressBar
Mag repack
Defuse
Swap Barrel
2015-01-26 00:24:33 -06:00
Nicolás Badano
a7e016fa8f overheating: change addPerFrameHandler to waitAndExecute 2015-01-17 03:13:05 -03:00
Nicolás Badano
886ffacb35 overheating: replace last spawn by a PFH 2015-01-15 23:36:58 -03:00
Nicolás Badano
c8811552c8 overheating: add function headers 2015-01-15 23:36:31 -03:00
Nicolás Badano
9bd5758e40 overheating: replace a spawn by a PFH 2015-01-15 22:00:01 -03:00
Nicolás Badano
d0f56f44ab overheating: final fixes 2015-01-13 22:26:55 -03:00
Nicolás Badano
a97b767283 overheating: ironing out bugs 2015-01-13 21:07:32 -03:00
Nicolás Badano
2a2eb38de7 overheating: hard code path to parent script_components 2015-01-13 00:37:53 -03:00
Nicolás Badano
a53a265117 overheating: Replace calls to core for calls to common 2015-01-13 00:30:39 -03:00
Nicolás Badano
1db298722b CBAfy AGM_Overheating 2015-01-13 00:23:14 -03:00
Nicolás Badano
c0df8b7f54 Pre CBA AGM_Overheating 2015-01-12 23:43:38 -03:00