Commit Graph

6 Commits

Author SHA1 Message Date
Glowbal
f08f8beeff Merge branch 'master' into Additional_UI_Client_settings
Conflicts:
	addons/reload/CfgEventHandlers.hpp
	addons/reload/functions/fnc_checkAmmo.sqf
2015-03-08 17:03:25 +01:00
Glowbal
d919c2436d Clientside display text option for weapon reload 2015-03-08 16:56:57 +01:00
Nicolás Badano
7b4487e8fc Split checkammo function 2015-03-06 01:32:47 -03:00
Nicolás Badano
5a77e2c220 reload: cba keybinds 2015-01-18 17:05:32 -03:00
commy2
95f550c360 spaces 2015-01-16 02:26:59 +01:00
commy2
18c9c589c8 port reload 2015-01-16 02:25:41 +01:00