Felix Wiegand
46dadd2fa6
Merge pull request #307 from KoffeinFlummi/setup-script
...
Add setup script and CBA includes
2015-04-05 14:36:49 +02:00
Glowbal
b6b880fba0
Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded
...
Add medical actions while boarded.
2015-04-05 14:36:17 +02:00
Glowbal
92bdae9321
Removed diag_log spam
2015-04-05 13:25:53 +02:00
Glowbal
32625b446b
fixed animation being reset even when inside a vehicle
2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424
Moved selfActions to a separate hpp file
2015-04-05 13:02:55 +02:00
Glowbal
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
Glowbal
279641787d
Added checks for enforce usage only in SP with settings enabled
2015-04-05 11:11:54 +02:00
Glowbal
202904f1f9
Using 1 and 0 instead of true and false for config export
2015-04-05 10:32:40 +02:00
jaynus
6288a809f7
actually final terminal decent. woops.
2015-04-04 22:36:09 -07:00
Glowbal
d487092d84
formatting
2015-04-05 02:33:45 +02:00
Glowbal
110635df7b
improved formatting
2015-04-05 02:33:11 +02:00
Glowbal
a0af055917
export config should force the settings
2015-04-05 02:22:24 +02:00
Glowbal
7928ca71a5
Server side config export
2015-04-05 02:17:43 +02:00
jaynus
583acf6558
ctrlShow is not operational on ControlGroups in RscOptics.
2015-04-04 17:15:59 -07:00
jaynus
ab0d289762
Merge remote-tracking branch 'origin/master' into lasers
2015-04-04 16:56:03 -07:00
jaynus
aee7eb9406
Working save.
2015-04-04 16:55:53 -07:00
PabstMirror
75351f2a5b
TapShoulder - fix hint message
2015-04-04 17:54:15 -05:00
esteldunedain
f417fa2285
Add medical actions while boarded.
2015-04-04 19:41:12 -03:00
PabstMirror
e03d3ed619
Merge pull request #284 from KoffeinFlummi/beltRepacking
...
MagRepack - Belt Repacking / Child Actions
2015-04-04 17:18:53 -05:00
esteldunedain
848b5133ef
Remove debug chats for interact_menu
2015-04-04 19:15:29 -03:00
Glowbal
044d2551ce
Merge branch 'master' into serverConfig
2015-04-04 23:00:47 +02:00
Glowbal
8e457d43ff
Update serverconfig.hpp
2015-04-04 22:58:14 +02:00
Glowbal
b18d704686
Merge pull request #300 from KoffeinFlummi/medicalImprovements
...
Medical Litter & other additions
2015-04-04 22:52:05 +02:00
Glowbal
7f9043897c
wake up by epinephrine in revive state
2015-04-04 22:50:38 +02:00
Glowbal
551c36d690
fixed treatment didnt work inside vehicles
2015-04-04 22:48:52 +02:00
Glowbal
77d39877d2
Merge branch 'master' into medicalImprovements
2015-04-04 22:01:15 +02:00
Glowbal
a56e8745c3
fixed module settings
2015-04-04 21:59:18 +02:00
Glowbal
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
Glowbal
5c3ee0dd1a
Added settings to modules & fixed medicalVehicle module
2015-04-04 21:51:18 +02:00
PabstMirror
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
Glowbal
89ec817ce3
Added setting for litter cleanup delay
2015-04-04 21:26:41 +02:00
Glowbal
1d33ce52b3
added support for adjustable settings for consumeItem and medicalLevel
2015-04-04 21:20:24 +02:00
Glowbal
93d9088410
fixed cardiac arrest
2015-04-04 21:20:03 +02:00
Glowbal
e3aaac7005
Only select primary weapon if no current weapon is selected
2015-04-04 20:49:30 +02:00
Glowbal
a7edd00420
removed useless doAnimation call when animation is not "unconscious" in unconscious state
2015-04-04 20:41:49 +02:00
Felix Wiegand
1ee698179c
Merge pull request #298 from KoffeinFlummi/authors-update
...
Update AUTHORS file
2015-04-04 20:41:37 +02:00
Glowbal
2b9afcbb6c
Now supports unconscious state fully
2015-04-04 20:37:25 +02:00
Nicolás Badano
5f4030469f
Merge pull request #309 from KoffeinFlummi/closeInteractMenu
...
Close interact menu when knocked out
2015-04-04 15:35:00 -03:00
Glowbal
e78fc55b45
changed; When standing before treatment, the caller will now move into crouch instead of standing up again.
2015-04-04 20:21:52 +02:00
Glowbal
ddb01e7865
Improved unconscious wakeup animations
2015-04-04 20:21:06 +02:00
Glowbal
2420db78a1
CreateLitter now supports conditions and is selection specific.
...
Format:
litter[] = {
{"SelectionName", "Condition", {"litterClassname"} },
...
};
The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
2015-04-04 20:20:29 +02:00
commy2
55d7c0f0e6
remove scripted recoil
2015-04-04 20:02:02 +02:00
commy2
8d0ee2d578
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 142resting
2015-04-04 19:56:43 +02:00
PabstMirror
efe810ae4e
Private Variables for localEvent
2015-04-04 12:08:59 -05:00
jaynus
9d06d7c7ca
readme/author updates.
2015-04-04 09:09:42 -07:00
Glowbal
08e1949078
Improved patient unconscious animation
2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057
Support unconscious animation for patient upon treatment
2015-04-04 17:33:20 +02:00
esteldunedain
d090b3328c
- Close interact_menu when the player falls unconscious
...
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
Glowbal
48758ff0e3
fixed incorrect typeNames
2015-04-04 16:59:52 +02:00
KoffeinFlummi
443d0c5586
Add setup script and CBA includes
2015-04-04 16:33:53 +02:00
