Commit Graph

8320 Commits

Author SHA1 Message Date
PabstMirror
6ac83b7702 Cleanup 2015-03-09 18:53:19 -05:00
PabstMirror
35f72e0fda Dynamic Inventory Size 2015-03-09 18:46:51 -05:00
Glowbal
9709fa17c0 Merge pull request #172 from KoffeinFlummi/Medical_Improvements
Medical improvements
2015-03-09 23:29:55 +01:00
Glowbal
e741c8a12b Config stuff 2015-03-09 22:36:25 +01:00
PabstMirror
1cf8843cae Show Waypoints on map 2015-03-09 16:28:29 -05:00
Glowbal
4b171f9507 Indentation 2015-03-09 22:27:01 +01:00
Glowbal
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
PabstMirror
ce5595e107 BIS_fnc_gridToPos 2015-03-09 16:09:00 -05:00
Glowbal
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
Glowbal
8a3eac2aa0 Added medical actions to sub menu
Added statements
2015-03-09 22:08:32 +01:00
Glowbal
f62335f71c Fixed custom conditions 2015-03-09 21:42:09 +01:00
Glowbal
5afc651519 fixed incorrect tourniquet classname 2015-03-09 21:41:58 +01:00
Glowbal
6aae11944b config fixes 2015-03-09 21:41:43 +01:00
Glowbal
a37afec70e fixed inheritance of treatment classes 2015-03-09 21:14:39 +01:00
Glowbal
9b856ea38b Merge branch 'master' into Medical_Improvements 2015-03-09 21:08:18 +01:00
Glowbal
f7159084c3 Made the menu slightly wider 2015-03-09 21:05:11 +01:00
Glowbal
aeb4c91792 Added interaction menu actions for advanced medical 2015-03-09 21:05:01 +01:00
Glowbal
f6fbef980a Added support for bandaging a specific injury class on a selection 2015-03-09 20:03:17 +01:00
PabstMirror
0fd49d179d doh 2015-03-09 13:55:07 -05:00
PabstMirror
29bd613445 canShow base 2015-03-09 13:53:49 -05:00
PabstMirror
1d6cfbf6b7 Various Changes 2015-03-09 13:52:15 -05:00
Garth L-H de Wet
ece4c8e0bc Merge branch 'master' into explosiveInteraction 2015-03-09 20:07:42 +02:00
Glowbal
c7ede12b99 Removed weapon select, is now just grenade throw 2015-03-09 19:03:55 +01:00
PabstMirror
f387da1475 Working Base MicroDAGR 2015-03-09 10:46:59 -05:00
commy2
107fec4245 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-08 19:52:12 +01:00
commy2
55f49eaa1c fix shitty initSpeed definitions breaking SD mags, fix #182 2015-03-08 19:51:52 +01:00
Glowbal
fc1a52d48b Added events for unconscious 2015-03-08 17:52:40 +01:00
Glowbal
85cbe5eb5f Added support for locality switch and killed units 2015-03-08 17:50:06 +01:00
Glowbal
445ee87067 Merge branch 'master' into Additional_UI_Client_settings 2015-03-08 17:13:40 +01:00
Glowbal
252663fd81 Readded checkBloodPressure and checkPulse actions. 2015-03-08 17:13:17 +01:00
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
2250255d65 Clientside display text option for weapon jamming 2015-03-08 16:57:06 +01:00
Glowbal
d919c2436d Clientside display text option for weapon reload 2015-03-08 16:56:57 +01:00
Glowbal
358a95381b Clientside display text option for weapon grenades 2015-03-08 16:56:47 +01:00
Glowbal
c7edd83296 Improvements made for airway implementation 2015-03-08 15:58:35 +01:00
Glowbal
cf82966d57 fixed pain with advanced medical 2015-03-08 15:13:44 +01:00
Glowbal
4ed19dce75 Fixed injured sounds 2015-03-08 15:13:32 +01:00
Glowbal
784a5e9fcb Synchronizing of vital values across the net every 10-25 seconds 2015-03-08 13:56:24 +01:00
Glowbal
2e07aabd41 wrong function name 2015-03-08 12:28:17 +01:00
Glowbal
e6042ca04f Added revive state / prevent death and unconscious conditions 2015-03-08 12:27:52 +01:00
Glowbal
d016874583 Expanded the medical settings 2015-03-08 12:05:52 +01:00
Nicolás Badano
1b81a23da2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-07 18:04:28 -03:00
Nicolás Badano
26b7c13631 Let me fix that 2015-03-07 18:03:55 -03:00
PabstMirror
81a944457b Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding
Key Bind Redo (switch to new CBA 150306)
2015-03-07 14:09:52 -06:00
PabstMirror
7ed682a849 Fix Parachutes 2015-03-07 13:48:39 -06:00
Felix Wiegand
8f9ced3f8e Merge pull request #154 from KoffeinFlummi/fcs-improvements
Refine bullet tracing in FCS extension
2015-03-07 19:31:33 +01:00
Nicolás Badano
8962ee5d51 Fix the FCS reset action 2015-03-07 14:56:20 -03:00
Nicolás Badano
bcf533292a Remove weapon initVelocities for guns with FCS 2015-03-07 14:12:00 -03:00
PabstMirror
3940ba9a62 opps 2015-03-07 10:58:34 -06:00
PabstMirror
e191105200 Merge Changes 2015-03-07 10:36:01 -06:00