Commit Graph

15157 Commits

Author SHA1 Message Date
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
e71378f9b3 AirResit Module Setting / Charge Display ctrl 2015-04-05 12:40:48 -05:00
26fb06f774 Now using the Arma3 tools path taking from the registry for CfgConvert 2015-04-05 10:40:37 -07:00
ae2adc17b9 changed all medical items to inherit from ACE_ItemCore 2015-04-05 19:37:07 +02:00
2c0bec2b07 disabled injury visualization for bandaged wounds 2015-04-05 19:36:40 +02:00
171ebf827a No litter created when in vehicle 2015-04-05 19:28:57 +02:00
a0bbbdb0b7 fixed place in bodybag 2015-04-05 19:27:53 +02:00
f52891436a oops 2015-04-05 19:27:40 +02:00
ecf84ae039 Updated module classname to be inline with others 2015-04-05 19:27:28 +02:00
0f52059249 Fixed CPR script error 2015-04-05 19:27:09 +02:00
dca75c5557 Implemented bandaged wounds setting (adv) 2015-04-05 19:26:33 +02:00
e3e17d8fcb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-05 15:51:42 +02:00
c210efcef0 fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle. 2015-04-05 15:51:28 +02:00
c514fde5d3 Not necessary here. Makes it only work once. 2015-04-05 15:13:34 +02:00
bae3826bdf Polished server config export 2015-04-05 14:48:23 +02:00
46dadd2fa6 Merge pull request #307 from KoffeinFlummi/setup-script
Add setup script and CBA includes
2015-04-05 14:36:49 +02:00
b6b880fba0 Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded
Add medical actions while boarded.
2015-04-05 14:36:17 +02:00
92bdae9321 Removed diag_log spam 2015-04-05 13:25:53 +02:00
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
f1a3d588ba Changed initialization order of config settings.
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.

This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
2015-04-05 12:38:10 +02:00
279641787d Added checks for enforce usage only in SP with settings enabled 2015-04-05 11:11:54 +02:00
202904f1f9 Using 1 and 0 instead of true and false for config export 2015-04-05 10:32:40 +02:00
1726b787f7 AirRestitance/Wind Effects 2015-04-05 03:02:24 -05:00
518f2077fe Disable ArtyComputer 2015-04-05 02:27:13 -05:00
dab4822876 Settings / Module 2015-04-05 02:18:51 -05:00
e6c7758d3f Prototype - Show Mils on mk6 2015-04-05 01:57:24 -05:00
6288a809f7 actually final terminal decent. woops. 2015-04-04 22:36:09 -07:00
d487092d84 formatting 2015-04-05 02:33:45 +02:00
110635df7b improved formatting 2015-04-05 02:33:11 +02:00
a0af055917 export config should force the settings 2015-04-05 02:22:24 +02:00
7928ca71a5 Server side config export 2015-04-05 02:17:43 +02:00
583acf6558 ctrlShow is not operational on ControlGroups in RscOptics. 2015-04-04 17:15:59 -07:00
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
aee7eb9406 Working save. 2015-04-04 16:55:53 -07:00
75351f2a5b TapShoulder - fix hint message 2015-04-04 17:54:15 -05:00
f417fa2285 Add medical actions while boarded. 2015-04-04 19:41:12 -03:00
e03d3ed619 Merge pull request #284 from KoffeinFlummi/beltRepacking
MagRepack - Belt Repacking / Child Actions
2015-04-04 17:18:53 -05:00
848b5133ef Remove debug chats for interact_menu 2015-04-04 19:15:29 -03:00
044d2551ce Merge branch 'master' into serverConfig 2015-04-04 23:00:47 +02:00
8e457d43ff Update serverconfig.hpp 2015-04-04 22:58:14 +02:00
b18d704686 Merge pull request #300 from KoffeinFlummi/medicalImprovements
Medical Litter & other additions
2015-04-04 22:52:05 +02:00
7f9043897c wake up by epinephrine in revive state 2015-04-04 22:50:38 +02:00
551c36d690 fixed treatment didnt work inside vehicles 2015-04-04 22:48:52 +02:00
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
d37094dc7a Work around for self treatment when cursorMenu from interact is used.
Executing it one frame later works fine, but otherwise the loading bar will fail.
2015-04-04 21:52:00 +02:00
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
6ec0859f85 MicroDAGR - Allow use in vehicles
Can't show minimap display in turret view (cameraView = "gunner"), but
can bring up the interactive dialog
2015-04-04 14:35:24 -05:00
89ec817ce3 Added setting for litter cleanup delay 2015-04-04 21:26:41 +02:00