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
14c45afd99
Sync holder gvar
2015-02-27 18:56:15 -06:00
PabstMirror
af1544ebb9
fix name
2015-02-27 18:50:08 -06:00
PabstMirror
641cbb7f64
Dialog Stuff
2015-02-27 18:43:42 -06:00
PabstMirror
d31c19c3eb
Seems like it's working
2015-02-27 18:38:23 -06:00
PabstMirror
32f67487b5
More Work
2015-02-27 16:16:35 -06: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
PabstMirror
d55aed0813
Inv Screen Rough WIP
2015-02-27 15:23:46 -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
e94d7e33dc
Merge branch 'master' into disarmingTest
2015-02-26 15:01:37 -06: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
PabstMirror
744f37d18a
DragandDrop Frisking WIP
2015-02-22 18:44:33 -06: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
Glowbal
8393645df9
Changed position to be inline with the weapon selector UI element by default
2015-02-22 11:19:32 +01:00
Glowbal
a574487166
Added localization support for displayText
2015-02-22 11:19:10 +01:00
Glowbal
9f3a0fe8d4
Removed displayInfo and displayMessage functions.
2015-02-22 11:18:37 +01:00
Glowbal
9dc33c659d
Now takes selections into account
2015-02-22 10:56:46 +01:00
Glowbal
bdaec01112
Added medication overdose and wearoff.
2015-02-22 10:27:57 +01:00
Glowbal
fa2d0c6b06
Specified bleeding rate more accurately for subclasses
2015-02-22 09:40:36 +01:00
Glowbal
8e539bfb56
Added ability to use subclasses for injuries.
...
Allows for usage of minor, medium and large injury variants.
2015-02-22 09:27:01 +01:00
PabstMirror
8945f99be1
Fix CurrentChannel
...
GVAR -> FUNC
onEachFrame exits when channel control is closed
2015-02-21 21:19:54 -06:00
PabstMirror
11be8f6f8f
Merge pull request #156 from KoffeinFlummi/nightVisionCleanup
...
Night vision cleanup
2015-02-21 20:21:04 -06:00
Glowbal
e091ba1fd1
Added hasMedicalEnabled
2015-02-22 00:49:38 +01:00
Glowbal
e21046459e
Fixed location checking in treatment call
2015-02-22 00:47:14 +01:00
Glowbal
ab045e49c8
Fixed incorrect function calls for location
2015-02-22 00:45:58 +01:00
Glowbal
1781629c13
Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions.
2015-02-22 00:44:11 +01:00
Glowbal
b9213e8abc
Added use and has item functions for medical
2015-02-22 00:34:16 +01:00
Glowbal
c2b8e9031f
Increased the type and causes of injuries for advanced medical.
2015-02-22 00:25:07 +01:00
Glowbal
73c91af533
Added separate config parsing for basic and advanced
2015-02-22 00:24:50 +01:00
Glowbal
3f12af8b21
Added onTreatmentCompleted event calls
2015-02-21 23:17:20 +01:00
Glowbal
e5941e55fc
Added reactionToDamage and onTreatmentCompleted event
2015-02-21 23:14:21 +01:00
Glowbal
925aa094c7
Added place in bodybag function
2015-02-21 21:53:07 +01:00
Glowbal
46f28763b6
Added triage card and activity log
2015-02-21 21:47:10 +01:00
Glowbal
0d24ad5c0a
Removed outdated injury defines file
2015-02-21 21:33:07 +01:00
Glowbal
95ff4b151c
Added addHeartRateAdjustment function
2015-02-21 21:32:25 +01:00
Glowbal
72e2690b81
Fixed incorrect animation function call
2015-02-21 21:28:59 +01:00
Glowbal
909a87fdd3
Added tourniquet treatment functions
2015-02-21 21:26:39 +01:00
Glowbal
308e165cb6
Fixed headers
2015-02-21 21:25:37 +01:00
Nicolás Badano
6b7f649244
interact_menu: add headers
2015-02-21 17:11:03 -03:00
Glowbal
ead5f2ee79
Added new injury and treatment systems for advanced medical
2015-02-21 21:10:57 +01:00
Glowbal
b3e7431e67
Added new treatment framework
2015-02-21 21:09:57 +01:00
KoffeinFlummi
3482633fb1
Basic treatment structure
2015-02-20 22:04:01 +01:00
Nicolás Badano
96abddc31b
Ability to link a belt of ammo to an AR's machinegun while he's firing. Non stop suppresion!
2015-02-20 02:45:17 -03:00
Nicolás Badano
2c05db3ffb
Create an interaction point for the current weapon
2015-02-20 02:04:00 -03:00
Nicolás Badano
908f23a78f
Removed filtering actions
2015-02-19 20:10:07 -03:00
PabstMirror
3511a74ef9
Don't show sound if not enabled
2015-02-19 16:59:21 -06:00
Nicolás Badano
dd92c5e845
Tap on either shoulder. "Tap" animation
2015-02-19 19:45:46 -03:00
PabstMirror
3ade628d87
Handle 3 Soundwave options
2015-02-19 16:42:28 -06:00
Nicolás Badano
bc3a226c64
Text under the icon
2015-02-19 18:56:43 -03:00
Nicolás Badano
41145e5731
reduce size of the menu
2015-02-19 18:03:25 -03:00
Nicolás Badano
0dfeb22ec8
tidy up
2015-02-19 18:03:14 -03:00
Glowbal
b58abaa2c0
Added a transparant background
2015-02-19 22:01:09 +01:00
Glowbal
ab6879845c
Merge branch 'master' into standardize_ui
2015-02-19 21:42:47 +01:00
Glowbal
a81c1fbef5
Overhauled AGM hint.
2015-02-19 21:38:51 +01:00
PabstMirror
a8e269bc18
Cleanup Escort Logic
...
No more ERROR spam
2015-02-19 14:34:14 -06:00
Glowbal
2cf0ceff2a
Merge pull request #147 from KoffeinFlummi/common_cleanup
...
Clean up of CSE code
2015-02-19 21:33:57 +01:00
PabstMirror
ae61dff44e
Move draw to function (wip)
2015-02-19 14:29:38 -06:00
Garth "L-H" de Wet
455d682706
Merge pull request #128 from KoffeinFlummi/IEDSupport
...
IED support
2015-02-19 21:44:00 +02:00
Nicolás Badano
861a6b1775
avoid all submenus opening simultaneously by switching menu paths to use uids
2015-02-19 15:47:59 -03:00
Nicolás Badano
f7d5d615ee
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
Glowbal
21199a4ee6
Now uses BIS_fnc_rscLayer
2015-02-19 19:32:49 +01:00
Glowbal
c8d4acfc81
Refactored displayText to no longer use spawn.
2015-02-19 19:29:54 +01:00
Glowbal
b0373de576
Tabs to spaces
2015-02-19 19:14:52 +01:00
Glowbal
612fa69c1c
Renamed string_removeWhiteSpace to stringRemoveWhiteSpace.
2015-02-19 19:12:14 +01:00
Glowbal
8488f10b92
Merge pull request #149 from KoffeinFlummi/cseMissionModules
...
Port: CSE Ambiance sound module
2015-02-19 19:07:38 +01:00
Glowbal
af3709f481
Fixed forgotten missionModules.
2015-02-19 19:07:19 +01:00
Glowbal
1ea35548e0
Fixed ambiance sounds module.
2015-02-19 18:40:40 +01:00
Nicolás Badano
30943cbfd4
move the main menu actions to the right cuadrant
2015-02-19 12:03:20 -03:00
Nicolás Badano
a8797fe45a
Fix for the angular spacing of submenus
2015-02-19 12:02:48 -03:00
Nicolás Badano
db5e8bcc34
Modify the opacity of icons along with that of the text
2015-02-19 12:01:47 -03:00
Garth L-H de Wet
96404bc42a
Fixed isNull check not working. Fixed audio not being found.
2015-02-19 15:59:14 +02:00
Nicolás Badano
d055315661
interact_menu: tab to space
2015-02-19 10:49:36 -03:00
Nicolás Badano
53f632c716
Merge branch 'selfInteractionMenu' of github.com:KoffeinFlummi/ACE3 into selfInteractionMenu
2015-02-19 10:39:28 -03:00
Nicolás Badano
3b35d9d109
Make interact sub menus open as circle sectors instead of full circles
2015-02-19 10:38:09 -03:00
Nicolás Badano
8e6600d5ec
Tweak distances
2015-02-19 10:36:59 -03:00
Garth L-H de Wet
f5a6f6f404
Fixed various points raised in the PR.
2015-02-19 15:30:01 +02:00
Garth L-H de Wet
89a81dbed1
Forgotten function added.
2015-02-19 12:40:21 +02:00
Garth L-H de Wet
00643c3c83
Ensured actual fuse time is used instead of simply 1.
2015-02-19 12:39:13 +02:00
Garth L-H de Wet
8c83320675
Separated dialing phone code into separate function to neaten up the original function.
2015-02-19 12:32:41 +02:00
Garth L-H de Wet
e592f233f3
Merge branch 'master' into IEDSupport
2015-02-19 12:26:38 +02:00
PabstMirror
244d7a5572
Fix opacity fading on other render levels
2015-02-19 03:02:58 -06:00
Nicolás Badano
043987fc93
basic self actions
2015-02-18 18:58:06 -03:00
KoffeinFlummi
7e9a02089f
Merge branch 'medical-visuals' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
2015-02-18 19:26:30 +01:00
KoffeinFlummi
3aae72aa70
Cleanup
2015-02-18 19:22:35 +01:00
KoffeinFlummi
58873e1c97
Pain Effect
2015-02-18 19:01:25 +01:00
PabstMirror
b86869d7a1
UAV-Recharge Headers
2015-02-17 22:37:04 -06:00
PabstMirror
c6c200a684
comments
2015-02-17 22:24:37 -06:00
PabstMirror
e649c8e853
Headers and formating
2015-02-17 22:07:29 -06:00
PabstMirror
c291f29702
Move model to folder
2015-02-17 22:06:37 -06:00
PabstMirror
c3b5430bc4
NVG KeyBinds
2015-02-17 22:05:52 -06:00
PabstMirror
37216d5144
Remove HandCuff animEH
2015-02-17 17:05:07 -06:00
Glowbal
bfc748fbbe
Added missionmodules.
2015-02-17 07:51:51 +01:00
Glowbal
d86e2464b3
Removed missionModules
2015-02-17 07:51:35 +01:00
Glowbal
d60081a9c3
Renamed missionModules to missionmodules.
2015-02-17 07:49:37 +01:00
PabstMirror
9cdf06383d
Back to getIn
2015-02-16 19:20:55 -06:00
PabstMirror
dc82e50d72
fix
2015-02-16 18:30:35 -06:00
PabstMirror
eee4b256cd
More Changes and add EH
2015-02-16 18:03:09 -06:00
PabstMirror
d3f4f2883f
Merge pull request #150 from KoffeinFlummi/moduleSounds
...
Added UAV exchange battery sound
2015-02-16 11:58:11 -06:00
Glowbal
da19a89be8
Replaced _targetUnit for ObjNull
...
Replaced _targetUnit for objNull.
2015-02-16 15:56:36 +01:00
PabstMirror
e0d1d08913
Change AnimChange EH
2015-02-15 18:19:01 -06:00
PabstMirror
a0c2a00777
Cleanup
2015-02-15 16:45:13 -06:00
PabstMirror
3c65c422b1
More Surrender Fixes
...
Increase "drop hands" animation speed (now just 1/2 of normal)
Use "AnimChanged" EH to watch for animation breaks while surrendering
Only "crack" the hands up animation if we are in the right animation
state
2015-02-15 16:42:00 -06:00
Nicolás Badano
d743006566
make vector keybinds return false so they don't block fcs keyup EH
2015-02-15 18:38:08 -03:00
Nicolás Badano
a1e5931f4e
avoid having to compute distance when it's already passed as a parameter
2015-02-15 18:06:17 -03:00
PabstMirror
dec34b4b30
Surrender Fixes
...
Remove XEH GetIn and use vehicleChanged Event
Handle Zeus (showHUD)
Attempt to handle failed animation change
2015-02-15 14:55:17 -06:00
Nicolás Badano
2105bc18db
Fixes for the FCS; it was missing a lot of calls before FUNCs.
...
That made the rangefinder only work once. The flag for preventing holding is not needed becase GVAR(enabled) serving the same purpose.
2015-02-15 17:43:57 -03:00
Nicolás Badano
08af51c4a7
Allow overpressure for static weapons
2015-02-15 17:29:54 -03:00
Nicolás Badano
cb15a7106c
Allow adding FCS to static weapons
2015-02-15 17:26:08 -03:00
Nicolás Badano
b74175ec9e
Don't allow adjusting range if only rangefinder is available
2015-02-15 17:24:24 -03:00
Nicolás Badano
25645c2ae9
mm
2015-02-15 16:25:09 -03:00
Nicolás Badano
be42738881
macros
2015-02-15 15:56:37 -03:00
Nicolás Badano
e8933d69c8
overpressure: renamed more config entries; avoid handheld launchers producing overpressure in addition to backblast.
2015-02-15 15:42:54 -03:00
commy2
618ac2f8f6
change overpressure readme.md
2015-02-15 18:44:10 +01:00
commy2
2252f82de7
rename backblast to overpressure
2015-02-15 18:11:50 +01:00
commy2
f3aa0e58aa
clean up backblast
2015-02-15 17:55:20 +01:00
commy2
3f98d1485e
author name
2015-02-15 17:17:20 +01:00
commy2
f3a94f03ed
clean up backblast
2015-02-15 17:14:09 +01:00
commy2
f460f7fce0
manual merge backblast - master
2015-02-15 15:55:00 +01:00
commy2
0d650f2fad
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-02-15 15:48:58 +01:00
commy2
44aaf3955b
some backblast cleanup
2015-02-15 15:48:40 +01:00
Nicolás Badano
7c95e33322
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-02-15 11:42:54 -03:00
Nicolás Badano
c094c10e46
visible ir strobes
2015-02-15 11:42:20 -03:00
commy2
4f5ab1f8e5
removed common as required addon for attach
2015-02-15 15:34:19 +01:00
commy2
baf9396459
cleanup attach
2015-02-15 15:31:09 +01:00
Glowbal
ac54e8dfd7
Added UAV exchange battery sound
2015-02-15 12:44:34 +01:00
Glowbal
6540158ce1
Removed left over CSE prefix
2015-02-15 10:05:48 +01:00
Glowbal
827ef91fce
Ported CSE Ambiance sound module
2015-02-15 10:03:58 +01:00
commy2
df23b44df5
oops
2015-02-14 23:13:43 +01:00
PabstMirror
1a2a9dd584
Remove support for Anthropomorphism
2015-02-14 15:51:08 -06:00
Glowbal
c3cd9d281d
Removed isHC function. #139
2015-02-14 20:31:44 +01:00
Glowbal
13c2127574
Clean up of old CSE code
...
Removed all _F suffixes
Reorganized the RPEP list.
Removed unnecessary functions.
2015-02-14 20:29:07 +01:00
