Commit Graph

2052 Commits

Author SHA1 Message Date
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
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
e3aaac7005 Only select primary weapon if no current weapon is selected 2015-04-04 20:49:30 +02:00
a7edd00420 removed useless doAnimation call when animation is not "unconscious" in unconscious state 2015-04-04 20:41:49 +02:00
1ee698179c Merge pull request #298 from KoffeinFlummi/authors-update
Update AUTHORS file
2015-04-04 20:41:37 +02:00
2b9afcbb6c Now supports unconscious state fully 2015-04-04 20:37:25 +02:00
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu
Close interact menu when knocked out
2015-04-04 15:35:00 -03:00
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
ddb01e7865 Improved unconscious wakeup animations 2015-04-04 20:21:06 +02:00
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
55d7c0f0e6 remove scripted recoil 2015-04-04 20:02:02 +02:00
8d0ee2d578 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 142resting 2015-04-04 19:56:43 +02:00
efe810ae4e Private Variables for localEvent 2015-04-04 12:08:59 -05:00
9d06d7c7ca readme/author updates. 2015-04-04 09:09:42 -07:00
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
d090b3328c - Close interact_menu when the player falls unconscious
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
48758ff0e3 fixed incorrect typeNames 2015-04-04 16:59:52 +02:00
443d0c5586 Add setup script and CBA includes 2015-04-04 16:33:53 +02:00
b54179696a fixed basic revive 2 2015-04-04 16:28:09 +02:00
18900cb82c fixed revive for basic 2015-04-04 16:27:44 +02:00
3a117e9b4d fixed incorrect unit used for fullheal (was healing caller) 2015-04-04 16:26:49 +02:00
e27c91710c Revert "Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events."
This reverts commit 6864529d9c.
2015-04-04 16:26:32 +02:00
1dea63067a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics 2015-04-04 16:14:19 +02:00
b78b93f2cd Merge pull request #303 from KoffeinFlummi/strongerTextShadow
Stronger shadow for the interact_menu text
2015-04-04 10:25:27 -03:00
d496cabbbb remove obsolete folder from TO_MERGE folder 2015-04-04 14:38:49 +02:00
a5b071912f CfgPreloadtextures for optics 2015-04-04 13:15:27 +02:00
914c5ffd0f fixed bandage optional parameter 2015-04-04 12:14:21 +02:00
7c296c413d Litter has a more random spread 2015-04-04 12:13:55 +02:00
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
b7fa2bd8b3 disable pip scopes in arsenal 2015-04-04 12:06:20 +02:00
5fdd93587c localization 2015-04-04 09:16:41 +02:00
ea275b1e52 2d with and without PIP 2015-04-04 08:51:22 +02:00
98d217d97e handle 2d optics recoil 2015-04-04 06:19:19 +02:00
2e6a9c4967 Placeholder sounds for jav/titan locking. accurate fire tweaks 2015-04-03 21:07:04 -07:00
06f6039dca Stronger shadow for the interact_menu text 2015-04-04 01:04:32 -03:00
6cd7ab2f7d Fix getChildren - condition/only show inv mags 2015-04-03 22:37:48 -05:00
8710bee3b8 Titan Work. 2015-04-03 20:27:52 -07:00
99a90bf539 Remove ace_recoil (#271) 2015-04-04 00:25:44 -03:00
583347aaab tab cleanup, javelin work. 2015-04-03 17:28:33 -07:00
2645b102f0 Replaced waitAndExec for single PFH with 30s delay 2015-04-04 02:28:14 +02:00
07dfe52133 Remove Duplicate Mortar Code (inherit from statics)
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
2015-04-03 19:07:13 -05:00
a5ff34e1d8 Keep cursored menus always centered. Fix #299. 2015-04-03 20:49:40 -03:00
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
65388e1146 Added: Image Assets
Added: ACE_AIR_SAFETY weapon for all aircraft
Changed: ACE'ified Kimi code
2015-04-03 16:46:37 -07:00
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00