Nicolás Badano
c8f320d501
Fix action hierarchy
2015-03-05 22:52:29 -03:00
Nicolás Badano
6b43c7bc20
Merge branch 'master' into linkBelt
...
Conflicts:
addons/common/XEH_preInit.sqf
addons/interact_menu/functions/fnc_renderMenu.sqf
2015-03-05 22:48:31 -03:00
Glowbal
a724fb406a
Added triage status
2015-03-05 20:55:38 +01:00
Glowbal
bfb6a726ca
Activity log is now used by all logs
2015-03-05 18:53:38 +01:00
Glowbal
199cd05aa0
New variant of the medical information display
2015-03-05 18:43:44 +01:00
Glowbal
3a40a21433
Improvements made to the advanced handleDamage system
2015-03-05 18:42:32 +01:00
Glowbal
10f30fa543
Improvements and fixes for injured loop and enabledFor check
2015-03-05 18:42:08 +01:00
Glowbal
8215abb69d
Fixed variable default values
2015-03-05 18:40:55 +01:00
PabstMirror
4018742f26
Return False on keyUp Code
2015-03-05 02:51:24 -06:00
PabstMirror
5d21cd6cc7
Fix Vector/FCS debounce
2015-03-05 02:46:24 -06:00
PabstMirror
e18cbbfaad
Vector Keys
2015-03-05 02:00:56 -06:00
PabstMirror
0919e59719
Key Bind Redo (except vector)
2015-03-05 01:32:26 -06:00
Glowbal
a11d6b2dff
Merge pull request #169 from KoffeinFlummi/Medical_Medication
...
Medical: Advanced medication improvements
2015-03-04 13:16:22 +01:00
PabstMirror
ebf42bb35c
Merge pull request #165 from KoffeinFlummi/arma140inhertiaceFix
...
Arma140inhertiace fix
2015-03-03 21:07:58 -06:00
Glowbal
64121c3376
Added injuries to injury list
2015-03-03 23:34:44 +01:00
Glowbal
3fc29673bb
More fixes and improvements for wounds
2015-03-03 23:26:54 +01:00
Glowbal
e4756efaa0
Optimization for new wound system
2015-03-03 22:13:22 +01:00
PabstMirror
9d4a0be0db
FCS - FCSMags could be undefined, and cause probs
...
Shooting the B_apc_tracked_01_rcws_F, veh variables aren't defined and
cause problems downstream.
14:40:58 Error in expression <ir select 1) * _r,
_l
];
_vel = _vdir
vectorMultiply _adjustSpeed + vectorMagn>
14:40:58 Error position: <vectorMultiply _adjustSpeed + vectorMagn>
14:40:58 Error Type Number,Not a Number, expected Number
14:40:58 File
z\ace\addons\common\functions\fnc_changeProjectileDirection.sqf, line 42
2015-03-03 15:09:38 -06:00
Glowbal
c5a27d3cd7
Support for unlimited dosages
2015-03-03 20:16:04 +01:00
Glowbal
7f2d41b1a8
Added onOverDose callback. Allows for medication specific side effects.
2015-03-03 20:12:57 +01:00
Glowbal
7750f2d1b2
Added support for callbacks with heart rate changes through medication
2015-03-03 20:07:09 +01:00
Glowbal
83cdef770a
Can no longer go below zero
2015-03-03 19:58:58 +01:00
Glowbal
8f76832177
Added pain killer medication class draft
2015-03-03 19:57:52 +01:00
Glowbal
f8421b2589
Added support for viscosity adjustment from medication
2015-03-03 19:56:32 +01:00
Nicolás Badano
27808847db
- Solve a number of ASL vs ATL issues
...
- Replace the way of calculating 3D positions for subactions
2015-03-03 01:37:17 -03:00
Nicolás Badano
12c0a77f86
Add functions to common for converting between "position" and ASL
2015-03-03 01:37:00 -03:00
Nicolás Badano
1c25baa404
Base interaction distance in distance to head instead of distance to camera. Works much better on third person view
2015-03-03 00:34:34 -03:00
Nicolás Badano
b675d9d180
Compensate for movement during the frame to get rid of jittering
2015-03-03 00:16:38 -03:00
Nicolás Badano
8fd13f3fe5
Activate bandaging conditions
2015-03-03 00:04:15 -03:00
Nicolás Badano
cd00eda8c0
Fix interactions with civilians
2015-03-02 23:30:11 -03:00
Nicolás Badano
83572921ae
- Modification of actions data structure to separate action parameters from children
...
- The action tree of each interaction point is parsed before drawing, pruning inactive actions
- Parent actions without statements or active children are not drawn, in order to reduce clutter
2015-03-02 23:29:57 -03:00
Nicolás Badano
094be22a19
Move collect children on a sepparate function
2015-03-02 17:53:30 -03:00
Nicolás Badano
472e2c5bff
Reduce opacity of base actions
2015-03-01 20:14:27 -03:00
Nicolás Badano
716eb72d16
Prevent ace_vehiclelock from overwritting mainaction distance
2015-03-01 19:35:18 -03:00
Nicolás Badano
71477f820a
Add displayName to vehicle main actions. Increase range to 10m
2015-03-01 18:47:49 -03:00
Nicolás Badano
a824c1266a
Create an interaction point for the current weapon
2015-03-01 18:29:54 -03:00
Nicolás Badano
8b761e3528
Bandage actions moved from base to second level
2015-03-01 18:28:05 -03:00
Nicolás Badano
8e0158209c
Merge branch 'master' into ace_interactionCleanup
2015-03-01 17:15:24 -03:00
Glowbal
f149a0825a
Merge pull request #167 from KoffeinFlummi/medical-rewrite
...
Medical rewrite
2015-03-01 18:04:04 +01:00
Glowbal
7307796e89
Fixed array
2015-03-01 18:03:24 +01:00
Glowbal
076c5abf88
Added a displayName for the wounds
2015-03-01 18:02:56 +01:00
Nicolás Badano
af2faddc70
Merge pull request #164 from KoffeinFlummi/interact_2D
...
Cursored self action menu
2015-03-01 12:53:09 -03:00
Glowbal
f690e54af3
Added displayPatientInformation draft
2015-03-01 16:04:53 +01:00
Glowbal
4b584846b4
Replaced disableUserInput by setDisableUserInputStatus
...
Makes use of the wrapper around disableUserInput, so it will play nice with others
2015-03-01 14:27:44 +01:00
Glowbal
d5e5ab24f2
Improvements made to heart rate effects
2015-03-01 14:06:44 +01:00
bux578
29459e23c9
fix events
2015-03-01 13:43:39 +01:00
bux578
f55623130d
Merge branch 'master' into switchUnits_codecleanup
2015-03-01 13:12:15 +01:00
Glowbal
91a52a4b76
Added support for JIP injury synchronizing
...
Enabled heart beat sounds
2015-03-01 12:33:05 +01:00
Glowbal
fb763a9d57
Added load and unload actions
2015-03-01 10:44:08 +01:00
Glowbal
769b855255
Added readme
2015-03-01 10:36:52 +01:00
Glowbal
bbfe84565a
Added heartbeat sounds
2015-03-01 10:33:51 +01:00
Glowbal
ba4fc66965
Fixed config mistake
2015-03-01 10:28:42 +01:00
Glowbal
8726e7f1d2
Added CMS equipment items.
2015-03-01 10:25:37 +01:00
Nicolás Badano
526e765144
Added base main actions for vehicle ancestors
2015-03-01 01:35:06 -03:00
Nicolás Badano
47eec69ebe
Removed old config entries
2015-03-01 01:33:38 -03:00
Nicolás Badano
2e0b195cba
Added base action for handheld weapons
2015-03-01 01:32:21 -03:00
Nicolás Badano
78b1d698c1
Added base actions for limbs on CAManBase
2015-03-01 00:52:08 -03:00
Nicolás Badano
2235f84408
Moved handcuffing/uncuffing to top level actions, as we apparently won't be interacting with hands for anything else for the moment
2015-03-01 00:48:29 -03:00
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
PabstMirror
44e4af2b1a
Still MainTurret probs by Heli_Transport_01_base_F
2015-02-28 19:37:35 -06:00
PabstMirror
93d889031f
1.40 Changes In Config Inhertiance (RC)
2015-02-28 19:06:17 -06: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
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
Glowbal
5b50910ef6
Fixed incorrect size
2015-02-25 11:23:35 +01:00
KoffeinFlummi
ddadabc661
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
...
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/XEH_preInit.sqf
addons/medical/config.cpp
addons/medical/equipment/Atropin-pen_used.p3d
addons/medical/equipment/Bandage-Pack.p3d
addons/medical/equipment/Bandage-elastic.p3d
addons/medical/functions/fnc_ActionCheckPulse.sqf
addons/medical/functions/fnc_ActioncheckBloodPressure.sqf
addons/medical/functions/fnc_actionCarryUnit.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
addons/medical/functions/fnc_actionCheckResponse.sqf
addons/medical/functions/fnc_actionDragUnit.sqf
addons/medical/functions/fnc_actionLoadUnit.sqf
addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
addons/medical/functions/fnc_actionUnloadUnit.sqf
addons/medical/functions/fnc_cleanUpCopyOfBody.sqf
addons/medical/functions/fnc_getBloodVolumeChange.sqf
addons/medical/functions/fnc_getUnconsciousCondition.sqf
addons/medical/functions/fnc_handleDropUnit.sqf
addons/medical/functions/fnc_handleHeal.sqf
addons/medical/functions/fnc_handleTreatment_Action_AirwayLocal.sqf
addons/medical/functions/fnc_handleTreatment_Action_BandageLocal.sqf
addons/medical/functions/fnc_handleTreatment_Action_CPR.sqf
addons/medical/functions/fnc_handleTreatment_Action_Stitching.sqf
addons/medical/functions/fnc_handleTreatment_Action_fullHeal.sqf
addons/medical/functions/fnc_handleTreatment_Action_fullHealLocal.sqf
addons/medical/functions/fnc_handleTreatment_Category_Advanced.sqf
addons/medical/functions/fnc_handleTreatment_Category_Airway.sqf
addons/medical/functions/fnc_handleTreatment_Category_Bandaging.sqf
addons/medical/functions/fnc_handleTreatment_Category_Medication.sqf
addons/medical/functions/fnc_handleUnitVitals.sqf
addons/medical/functions/fnc_initalizeModuleCMS.sqf
addons/medical/functions/fnc_makeCopyOfBody.sqf
addons/medical/functions/fnc_moduleAssignMedicalEquipment.sqf
addons/medical/functions/fnc_moduleBasicRevive.sqf
addons/medical/functions/fnc_onKilled.sqf
addons/medical/functions/fnc_onStartMovingUnit.sqf
addons/medical/functions/fnc_onTreatmentCompleted.sqf
addons/medical/functions/fnc_registerUnconsciousCondition.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/ui/define.hpp
addons/medical/ui/menu.hpp
2015-02-24 22:35:05 +01:00
KoffeinFlummi
daff184f75
More work on basic callbacks.
2015-02-24 22:09:31 +01:00
Glowbal
5883c673e4
Merge branch 'displayTextRemoteClients' of github.com:KoffeinFlummi/ACE3 into displayTextRemoteClients
2015-02-24 20:25:43 +01:00
Glowbal
e10c907454
Added missing header arguments
2015-02-24 20:25:34 +01:00
PabstMirror
80ac6d83de
Zeus Module Messages
2015-02-24 12:44:54 -06:00
PabstMirror
97d1889971
Shift Display to Right if Zeus Interface is open
2015-02-24 12:40:22 -06:00
PabstMirror
ae3de331c4
Module At Mission Start (Issue #148 )
2015-02-24 11:51:37 -06:00
PabstMirror
233647a144
Merge branch 'master' into fixSurrendering
2015-02-24 11:37:28 -06:00
PabstMirror
5364980997
Zeus Module Hints
2015-02-24 11:36:49 -06:00
Glowbal
37031b5002
Replaced execRemoteFnc by ACE event system
2015-02-24 18:10:40 +01:00
Glowbal
278f0ab889
Fixed indentation
...
Added check for AI units
2015-02-24 18:02:41 +01:00
PabstMirror
85c568a061
Comments
2015-02-24 10:27:53 -06:00
Glowbal
6fde2de40f
Improved localization support and sendDisplayText to remote client objects.
2015-02-24 17:14:19 +01:00
Glowbal
65eb69fece
Added examine actions
2015-02-23 20:35:36 +01:00
Nicolás Badano
669568cafe
Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
...
Self action menu and Action menu on selections
2015-02-23 14:24:43 -03:00
Glowbal
4a64716420
Added support for displaying a treatment icon for the action
2015-02-23 18:19:35 +01:00
Glowbal
40d98b04a4
Merge pull request #145 from KoffeinFlummi/standardize_ui
...
Standardize UI
2015-02-23 18:11:11 +01:00
Glowbal
fe0363ab48
Now dynamically collects the available damageTypes
2015-02-23 16:18:33 +01:00
Glowbal
bb89816a70
Replaced FUNC for DFUNC
2015-02-23 10:23:09 +01:00
Glowbal
df710235d5
Added useItems
...
Fixed header on hasItems
2015-02-22 19:50:14 +01:00
Glowbal
bcb5bb59f6
Basic actions can now use any of the advanced treatment items.
2015-02-22 18:46:49 +01:00
Glowbal
cbfb413f22
Changed: an array now means that it can be any of the given items
2015-02-22 18:42:30 +01:00
Glowbal
8b3e5ac8e2
Added hasItems function
2015-02-22 18:38:06 +01:00
Glowbal
2b061e8de3
Added itemConsumed attribute
2015-02-22 18:34:59 +01:00
Glowbal
b05e09ccb8
Added advanced treatment actions
2015-02-22 18:33:46 +01:00
KoffeinFlummi
ca930a5717
Add basic treatments, rename onProgress
2015-02-22 17:45:46 +01:00
Glowbal
ab6bc998c2
Added canAccessMedicalEquipment check
2015-02-22 15:01:31 +01:00
Glowbal
82c181cd7c
Fixed header
2015-02-22 14:54:54 +01:00
Glowbal
5e0eb7323a
Added option to toggle between progressbar top and bottom
2015-02-22 14:38:48 +01:00
Glowbal
77666e8097
Added weapon resting state icon
2015-02-22 13:58:51 +01:00
Glowbal
dd51037c5e
Added support for image color
2015-02-22 13:44:17 +01:00
Glowbal
9d44ec18b8
Added a default text color setting
2015-02-22 13:35:05 +01:00
Glowbal
323d673eec
Removed deprecated config entries (DisplayMessage and DisplayInformation)
2015-02-22 13:20:17 +01:00
Glowbal
7f6a647b4d
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
2015-02-22 12:26:19 +01:00
Glowbal
56dad70a9e
Removed redundant level checks
2015-02-22 12:26:08 +01:00
Kieran
c8bf9d2ce1
Changed 'impacted' to 'crushed'
...
Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate
2015-02-22 21:25:28 +10:00
Kieran
7ea31f8b05
Added causes to contusions - ace_med_treatment.hpp
...
Added vehiclecrash and falling to contusion causes.
(As those two situations commonly do result in bruising)
2015-02-22 21:21:27 +10:00
Glowbal
14411a5ef0
Fixed weird fix for getNumber for Array bug in setSettingFromConfig.
2015-02-22 11:36:21 +01:00
Glowbal
1ed50bfe3e
Fixed font size
2015-02-22 11:35:52 +01:00
Glowbal
47e27d7be3
Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui
2015-02-22 11:19:46 +01:00
