SilentSpike 159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
..
2015-01-14 03:19:25 -06:00
2015-01-14 03:19:25 -06:00
2015-01-17 12:12:02 -06:00
2015-01-14 01:55:23 -06:00
2015-06-02 14:02:46 +02:00
2015-02-14 00:39:09 -06:00
2015-02-14 00:39:09 -06:00
2015-02-14 00:39:09 -06:00
2015-01-14 14:40:37 -06:00
2015-05-28 21:59:04 +02:00
2015-02-14 00:39:09 -06:00

ace_grenades

Introduces different throwing modes for grenades, as well as a flashbang and hand flares.

Maintainers

The people responsible for merging changes to this component or answering potential questions.