Nicolás Badano
84a7c5de46
Remove config entries for AGM interaction rose
2015-03-01 00:46:59 -03:00
Nicolás Badano
2b0cfac8e4
Removed obsolote code from ace_interaction ( #109 )
2015-02-28 23:00:24 -03:00
Glowbal
437f0fbd8a
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
2015-03-01 00:13:27 +01:00
Glowbal
9d7e94ca09
Added initial UI element for displaying injuries
2015-03-01 00:13:08 +01:00
KoffeinFlummi
e7c0c78e5d
Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
2015-02-28 23:36:13 +01:00
KoffeinFlummi
eeb2f6e8bb
Fix script error in setUnconscious
2015-02-28 23:35:53 +01:00
Glowbal
69801a65b0
Removed dead code
2015-02-28 23:34:14 +01:00
Nicolás Badano
a2a9643627
Add option to always display cursor for self interaction
2015-02-28 18:56:57 -03:00
Glowbal
a29cbf6977
Fixed incorrect config variable name
2015-02-28 22:45:12 +01:00
Glowbal
6310d7b582
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
2015-02-28 22:38:54 +01:00
Glowbal
8f253620c1
Fixed handleDamage wounds
2015-02-28 22:37:39 +01:00
KoffeinFlummi
1689829f93
Get treatment callback structure working
2015-02-28 22:10:20 +01:00
Nicolás Badano
85a77150c9
- Add cursored self interaction menu (for using inside vehicles)
...
- Renamed the base menu "SelfActions" to "ACE_SelfActions"
- Limit the amount of objects the player is shown interactions with. This are the 3 nearest objects which have active action points visible on screen.
- Cull action points that are not visible, to far away, etc before checking if they are active.
2015-02-28 17:48:46 -03:00
Nicolás Badano
e44e13d1b8
Merge pull request #162 from KoffeinFlummi/interactionOptimization
...
Interaction Menu plumbing
2015-02-28 17:33:53 -03:00
Glowbal
d50466ac67
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
2015-02-28 21:09:56 +01:00
Glowbal
68626f54fc
Missing semicolon
2015-02-28 21:09:39 +01:00
KoffeinFlummi
309d42f2e6
God damnit
2015-02-28 21:02:15 +01:00
KoffeinFlummi
46cb963630
Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
...
Conflicts:
addons/medical/XEH_preInit.sqf
2015-02-28 20:58:19 +01:00
KoffeinFlummi
f5fe57232c
Derp 2: The Rederpening
2015-02-28 20:56:55 +01:00
KoffeinFlummi
aea448efe7
Derp
2015-02-28 20:54:23 +01:00
KoffeinFlummi
7f9daeb2f6
Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
...
Conflicts:
addons/medical/XEH_preInit.sqf
addons/medical/functions/fnc_init.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
2015-02-28 20:50:59 +01:00
Glowbal
15afb8846a
Fixed private array and added event listener
2015-02-28 20:50:08 +01:00
Glowbal
18998bb619
Split up the openWounds through the ACE event system
...
Based upon the suggestions from Jaynus
2015-02-28 20:48:34 +01:00
KoffeinFlummi
424f156977
Various Cleanups
2015-02-28 20:46:36 +01:00
Glowbal
d293008586
Fixed indentation
2015-02-28 19:28:05 +01:00
Glowbal
451f8b6d0b
Fixed advanced medical handleDamage chain. Now supports killing units.
2015-02-28 19:22:46 +01:00
Glowbal
f1445a4c45
Fixed script errors
2015-02-28 18:59:37 +01:00
Glowbal
9986fddf6b
Fixed undefined _bloodPressure
2015-02-28 18:46:44 +01:00
PabstMirror
dfdee62732
Movement Comments/Formating
2015-02-28 09:26:35 -06:00
Glowbal
5e65d5e9a8
Added support for displayText on treatment actions
2015-02-28 15:46:37 +01:00
KoffeinFlummi
8c6df1b00c
Fix indentation in treatment
2015-02-28 15:23:12 +01:00
KoffeinFlummi
9d7d66a025
Merge branch 'master' into medical-rewrite
2015-02-28 15:22:34 +01:00
KoffeinFlummi
114718e8ae
Fix line ending in .editorconf
2015-02-28 15:22:21 +01:00
KoffeinFlummi
bde6ec1996
Indentation in CfgVehicles
2015-02-28 15:19:49 +01:00
KoffeinFlummi
2873bdf0ed
Add basic anims; add system for prone/self anims
2015-02-28 15:10:58 +01:00
Glowbal
cff3e23d38
More work done on medical
...
Added TODOs for remoteFuncExecs to be replaced by event system
Added usage of displayTextStructed events
Fixed useItem calls instead of useItems
2015-02-28 13:17:17 +01:00
Glowbal
65137b347b
Replaced quote(func for quote(dfunc
2015-02-28 13:02:05 +01:00
Glowbal
bbc2a62476
Rewrite of unconscious. Now supports basic method of unconsciousness.
2015-02-28 12:05:22 +01:00
Glowbal
1e377d460e
now also resets used medication on init
2015-02-28 11:48:11 +01:00
Glowbal
6d01a00901
Added storage for all logs
2015-02-28 11:47:35 +01:00
Glowbal
05d2d9de6b
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
...
Conflicts:
addons/medical/XEH_preInit.sqf
2015-02-28 11:43:38 +01:00
Glowbal
49e04ae7bb
Added more treatment options and variables to init
2015-02-28 11:41:27 +01:00
PabstMirror
901a06587d
Merge pull request #144 from KoffeinFlummi/cseSoundWaves
...
CSE sound waves
2015-02-27 15:32:16 -06:00
PabstMirror
bf21a8bc91
Pull configSetting from upstream
2015-02-27 15:28:48 -06:00
Nicolás Badano
2371bc1bb0
Removed the renderDepth variables
2015-02-27 02:35:37 -03:00
Nicolás Badano
08b15315bf
Fixed removeAction; added trekkie examples
2015-02-27 02:20:28 -03:00
Nicolás Badano
3d8854f84a
Fixed opacity of icons; removed debug traces
2015-02-27 02:07:35 -03:00
Nicolás Badano
310710b6e2
Major plumbing upgrades on interact_menu:
...
- Store only one compiled menu per class
- Actions added through apis for invidual objects stored on the object separately
- Replaced the concept of uids by paths. This allows adding/removing actions inside other actions loaded from config seamlessly.
- Temporarily removed caching of nearby actions (probe). We may go back to that if needed pretty easily. This allows the player to move freely with the interaction menu opened.
2015-02-27 01:55:16 -03:00
PabstMirror
7e2283115c
Merge pull request #155 from KoffeinFlummi/fixSurrendering
...
Fix surrendering/handcuffs
2015-02-26 14:22:48 -06:00
KoffeinFlummi
fe79e624ff
Derp
2015-02-26 07:41:56 +01:00
