Commit Graph

5076 Commits

Author SHA1 Message Date
Glowbal
471e8d27df Fixed clean up 2015-08-07 19:11:10 +02:00
Michael Braun
5f313c75d5 Cleanup of medical_menu 2015-08-07 05:37:41 +02:00
Glowbal
abaf43be11 Selection restrictions 2015-08-07 00:09:40 +02:00
Glowbal
9b380315e5 First working version of the medical menu 2015-08-06 23:51:17 +02:00
Glowbal
5ac2972573 Added local event upon successful treatment. 2015-08-06 23:50:44 +02:00
Glowbal
4b5632a8f6 Added categories and missing displayName entries 2015-08-06 23:50:23 +02:00
Glowbal
4dfef8025b Medical menu port from CSE 2015-08-02 16:56:27 +02:00
SilentSpike
f6d8625fcb Transfer zeus module fixes from master into hotfix 2015-08-01 12:55:33 +01:00
Glowbal
02cfbeda8c Updated version to 3.2.1 2015-08-01 12:10:42 +02:00
PabstMirror
6ea1b95179 #1939 - Fix Remove Action From Class 2015-08-01 11:53:49 +02:00
bux578
1ad1a4b561 rename fingering to pointing 2015-08-01 11:49:28 +02:00
PabstMirror
fb34efdd04 Cleanup stringtable phrasing 2015-08-01 11:48:41 +02:00
Glowbal
a2eeff53a8 Merge pull request #1960 from acemod/laserHandleWeirdData
Laser - Handle Bad Data Returns
2015-08-01 11:41:04 +02:00
Glowbal
1878d448ae Merge pull request #1968 from acemod/fixBftModule321
Fix BFT Module / Settings (for 3.2.1)
2015-08-01 11:39:01 +02:00
PabstMirror
2d051188a7 #1957 - Fix BFT Module / Settings (for 3.2.1) 2015-08-01 00:01:33 -05:00
PabstMirror
1d82a3c193 #1962 - Fix Changes in Wind Deflection s in AB 2015-07-31 23:39:05 -05:00
PabstMirror
822115214f Laser - Handle Bad Data Returns 2015-07-31 03:06:27 -05:00
Glowbal
ca2a16af02 fix #1946 2015-07-30 18:21:24 +02:00
ViperMaul
63dd19825b moveInAny seems to work better than moveInDriver. WIP 2015-07-28 13:56:22 -07:00
PabstMirror
bfd3aa71c4 Manual Fix #1931 2015-07-28 15:25:52 -05:00
ViperMaul
626a9cf5f9 Disable headBugFix if unconscious 2015-07-28 13:06:58 -07:00
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
Glowbal
6289601b4e Merge pull request #1935 from jokoho48/ParachuteFix
change form addBackpack to addBackpackGlobal
2015-07-28 20:11:42 +02:00
Glowbal
7a65af4926 Merge pull request #1928 from acemod/headbugfix
Headbugfix
2015-07-28 20:10:51 +02:00
Joko
46531b916a change form addBackpack to addBackpackGlobal 2015-07-28 20:08:38 +02:00
Joko
baa1aab257 Fix Spelling 2015-07-28 19:24:34 +02:00
Joko
b2eeaacfc1 Fix Double Config Entry 2015-07-28 18:51:17 +02:00
Joko
55cac4b6d9 posible fix for #1932 2015-07-28 18:36:13 +02:00
ViperMaul
92940ea1a9 Removed improper translations
#1738
2015-07-28 15:17:22 +01:00
ViperMaul
675996d67b Adding HeadBugFix button to the ACE Options dialog (missing file)
#1738
2015-07-28 15:17:20 +01:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
SilentSpike
c73eef28ed Pushing back ace_spectator to feature branch 2015-07-27 21:25:39 +01:00
Glowbal
5ec59045c1 Default disable sitting 2015-07-27 22:00:30 +02:00
Glowbal
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00
SilentSpike
47d96835c6 Fix arrayIntersect oversight 2015-07-27 18:32:21 +01:00
PabstMirror
ceb12662e0 Version To 3.2.0 2015-07-27 02:05:58 -05:00
ViperMaul
4f53bdefb9 Suppress debug in fnc_unloadPersonLocal.sqf 2015-07-26 23:54:42 -07:00
ViperMaul
9a98530392 Add support for loading unconscious into boats, refs #1729 2015-07-26 18:33:25 -07:00
ViperMaul
6142d99626 Add support for loading unconscious into co-pilot seat
fixes #1727
2015-07-26 18:20:36 -07:00
PabstMirror
bf4e95e750 Merge pull request #1548 from acemod/fingering
Fingering
2015-07-26 16:47:41 -05:00
PabstMirror
4f9dba61ee Mk6 - Misc cleanup 2015-07-26 16:45:34 -05:00
Glowbal
41196c15aa Merge pull request #1686 from acemod/fixFrag
Fix frag
2015-07-26 23:42:16 +02:00
ViperMaul
951afef495 Merge pull request #1911 from acemod/fixLoadUnloadUnconscious
Fix load unload unconscious
2015-07-26 14:33:46 -07:00
Glowbal
0af6c5d852 Merge pull request #1913 from acemod/improveSwitchUnits
Improve SwitchUnits
2015-07-26 21:13:21 +02:00
Glowbal
d1809e597c Removed requirement for the medical dll
Medical extension is now an optional requirement that improves performance for advanced medical when used.
2015-07-26 20:54:49 +02:00
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
SilentSpike
e6f016f195 GVAR typo 2015-07-26 13:13:46 +01:00
SilentSpike
e431365586 Spectate on death setting 2015-07-26 13:12:58 +01:00
SilentSpike
ec6a0da01c Adjust camera speed while moving 2015-07-26 12:23:01 +01:00
SilentSpike
b0adf2e2ee Fix 3D icons not rendering 2015-07-26 12:13:05 +01:00