Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,724 Commits 73 Branches 88 Tags 752 MiB
a658cafb4e
Commit Graph

1590 Commits

Author SHA1 Message Date
PabstMirror
3febb1e770 WindDef - Convert to use FiredBIS 2015-03-12 00:28:33 -05:00
PabstMirror
86441ce6c5 WindDef - Enable Eventhandler 2015-03-12 00:18:18 -05:00
PabstMirror
f64abcd583 Respawn - Module icon filenames 2015-03-12 00:12:19 -05:00
PabstMirror
aaeb5a3392 Parachute - Move unused p3d back to TOMERGE 2015-03-12 00:07:28 -05:00
PabstMirror
82ea87d1de Parachute - Config Division/Formating 2015-03-12 00:05:28 -05:00
PabstMirror
dd026cea0f Medical - add tourniquet p3d and other missing tex 
Ported tourniquet from cse
add missing textures for other items
fix paths in rvmats
 2015-03-11 23:52:58 -05:00
PabstMirror
bed312dcee Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
Nicolás Badano
d02b5d2125 Ensure the class actions are compiled from config before adding them from the API 2015-03-11 16:26:58 -03:00
PabstMirror
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00
PabstMirror
3a7c7f7cee Fix interactMenuClosed event 2015-03-11 12:48:17 -05:00
PabstMirror
858e5def5a Interact menu event consistant 
"interactMenuOpened",  to match event from #191
 2015-03-11 12:45:01 -05:00
KoffeinFlummi
fabecdd0d3 Merge branch 'master' into medical-basic 2015-03-11 18:20:16 +01:00
KoffeinFlummi
a641a5db8b Make use of fnc_setUnconscious 2015-03-11 18:08:29 +01:00
KoffeinFlummi
8d22b61a2d Assign structural damage to torso 2015-03-11 18:08:00 +01:00
PabstMirror
95d59a1b3a Headers 2015-03-11 02:06:07 -05:00
Nicolás Badano
8c7a51eac7 Added addClassAction and removeClassAction functions 2015-03-11 01:43:37 -03:00
Nicolás Badano
3dfef439e5 Delay the interactMenuClosed event until after the statement is executed, just in case it's needed to clean up afterwards. 2015-03-11 00:49:46 -03:00
Nicolás Badano
28929df32d Avoid submenus running statements when they open. Instead just check if the hovering action should runOnHover 2015-03-11 00:39:23 -03:00
Nicolás Badano
c573b1048d Made medical diagnosis statements run on hover 2015-03-11 00:38:31 -03:00
Nicolás Badano
f12e4ab751 Add the runOnHover parameter 2015-03-11 00:37:59 -03:00
Nicolás Badano
7138fadd71 Support additional parameters for addAction API 2015-03-11 00:25:45 -03:00
Nicolás Badano
722f49acc4 Execute statement when hovering over actions that open submenus 2015-03-11 00:21:05 -03:00
PabstMirror
d6e7775cac Can Show: Hide when gun up 2015-03-10 22:11:25 -05:00
PabstMirror
13e6ae60b2 Settings Menu, Mils, Localization 2015-03-10 21:48:57 -05:00
Nicolás Badano
b33127d3b0 Renamed variable 2015-03-10 23:45:46 -03:00
Nicolás Badano
e97467b3e3 Throw an event when the interact menu is closed 2015-03-10 23:36:28 -03:00
Nicolás Badano
14b97de930 Cache the generation of active action trees for action points. This sensibly cuts down the execution of action conditions. 2015-03-10 23:23:13 -03:00
Nicolás Badano
fab81c8701 Added helper function to cache generic function calls for a given time 2015-03-10 23:20:05 -03:00
commy2
cad5456010 function to check if an object is alive 2015-03-10 23:35:05 +01:00
PabstMirror
794a1f9922 Wirecutter handles interact event 
adds helper objects to all fences that have actions
 2015-03-10 16:01:46 -05:00
PabstMirror
49cef030d5 Add "interact_keyDown" local event to interactMenu 2015-03-10 15:48:08 -05:00
Glowbal
1da67d7b48 First draft of triage card 2015-03-10 21:12:35 +01:00
jaynus
59db61e192 Performance counter macros 2015-03-10 12:59:40 -07:00
Glowbal
45dbb0524c Merge pull request #181 from KoffeinFlummi/Additional_UI_Client_settings 
Additional ui client settings #177
 2015-03-10 19:55:44 +01:00
Glowbal
a4d73e1b01 DEFUNC -> DFUNC 2015-03-10 19:51:51 +01:00
PabstMirror
1dd270812d Finish keybind conversion for old interact 2015-03-10 12:47:58 -05:00
PabstMirror
7173037cb0 Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
commy2
b2e8ca5dbc zipper sounds for opening backpacks 2015-03-10 17:48:24 +01:00
commy2
025c45dccc remove lockbackpacks code, add sound and camshake, ref #178 2015-03-10 17:18:21 +01:00
PabstMirror
3f32627d61 Implement Unconc Event Handler 2015-03-10 11:08:15 -05:00
PabstMirror
93a1cdaab6 setCaptivityStatus in setUnconsicous 2015-03-10 10:35:00 -05:00
commy2
eeb07f2bf6 rename lockbackpacks to backpacks 2015-03-10 15:58:29 +01:00
PabstMirror
6ac83b7702 Cleanup 2015-03-09 18:53:19 -05:00
PabstMirror
35f72e0fda Dynamic Inventory Size 2015-03-09 18:46:51 -05:00
Glowbal
e741c8a12b Config stuff 2015-03-09 22:36:25 +01:00
PabstMirror
1cf8843cae Show Waypoints on map 2015-03-09 16:28:29 -05:00
Glowbal
4b171f9507 Indentation 2015-03-09 22:27:01 +01:00
Glowbal
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
PabstMirror
ce5595e107 BIS_fnc_gridToPos 2015-03-09 16:09:00 -05:00
Glowbal
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
Glowbal
8a3eac2aa0 Added medical actions to sub menu 
Added statements
 2015-03-09 22:08:32 +01:00
Glowbal
f62335f71c Fixed custom conditions 2015-03-09 21:42:09 +01:00
Glowbal
5afc651519 fixed incorrect tourniquet classname 2015-03-09 21:41:58 +01:00
Glowbal
6aae11944b config fixes 2015-03-09 21:41:43 +01:00
Glowbal
a37afec70e fixed inheritance of treatment classes 2015-03-09 21:14:39 +01:00
Glowbal
9b856ea38b Merge branch 'master' into Medical_Improvements 2015-03-09 21:08:18 +01:00
Glowbal
f7159084c3 Made the menu slightly wider 2015-03-09 21:05:11 +01:00
Glowbal
aeb4c91792 Added interaction menu actions for advanced medical 2015-03-09 21:05:01 +01:00
Glowbal
f6fbef980a Added support for bandaging a specific injury class on a selection 2015-03-09 20:03:17 +01:00
PabstMirror
0fd49d179d doh 2015-03-09 13:55:07 -05:00
PabstMirror
29bd613445 canShow base 2015-03-09 13:53:49 -05:00
PabstMirror
1d6cfbf6b7 Various Changes 2015-03-09 13:52:15 -05:00
Glowbal
c7ede12b99 Removed weapon select, is now just grenade throw 2015-03-09 19:03:55 +01:00
PabstMirror
f387da1475 Working Base MicroDAGR 2015-03-09 10:46:59 -05:00
commy2
107fec4245 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-08 19:52:12 +01:00
commy2
55f49eaa1c fix shitty initSpeed definitions breaking SD mags, fix #182 2015-03-08 19:51:52 +01:00
Glowbal
fc1a52d48b Added events for unconscious 2015-03-08 17:52:40 +01:00
Glowbal
85cbe5eb5f Added support for locality switch and killed units 2015-03-08 17:50:06 +01:00
Glowbal
445ee87067 Merge branch 'master' into Additional_UI_Client_settings 2015-03-08 17:13:40 +01:00
Glowbal
252663fd81 Readded checkBloodPressure and checkPulse actions. 2015-03-08 17:13:17 +01:00
Glowbal
f08f8beeff Merge branch 'master' into Additional_UI_Client_settings 
Conflicts:
	addons/reload/CfgEventHandlers.hpp
	addons/reload/functions/fnc_checkAmmo.sqf
 2015-03-08 17:03:25 +01:00
Glowbal
2250255d65 Clientside display text option for weapon jamming 2015-03-08 16:57:06 +01:00
Glowbal
d919c2436d Clientside display text option for weapon reload 2015-03-08 16:56:57 +01:00
Glowbal
358a95381b Clientside display text option for weapon grenades 2015-03-08 16:56:47 +01:00
Glowbal
c7edd83296 Improvements made for airway implementation 2015-03-08 15:58:35 +01:00
Glowbal
cf82966d57 fixed pain with advanced medical 2015-03-08 15:13:44 +01:00
Glowbal
4ed19dce75 Fixed injured sounds 2015-03-08 15:13:32 +01:00
Glowbal
784a5e9fcb Synchronizing of vital values across the net every 10-25 seconds 2015-03-08 13:56:24 +01:00
Glowbal
2e07aabd41 wrong function name 2015-03-08 12:28:17 +01:00
Glowbal
e6042ca04f Added revive state / prevent death and unconscious conditions 2015-03-08 12:27:52 +01:00
Glowbal
d016874583 Expanded the medical settings 2015-03-08 12:05:52 +01:00
PabstMirror
81a944457b Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding 
Key Bind Redo (switch to new CBA 150306)
 2015-03-07 14:09:52 -06:00
PabstMirror
7ed682a849 Fix Parachutes 2015-03-07 13:48:39 -06:00
Felix Wiegand
8f9ced3f8e Merge pull request #154 from KoffeinFlummi/fcs-improvements 
Refine bullet tracing in FCS extension
 2015-03-07 19:31:33 +01:00
Nicolás Badano
8962ee5d51 Fix the FCS reset action 2015-03-07 14:56:20 -03:00
Nicolás Badano
bcf533292a Remove weapon initVelocities for guns with FCS 2015-03-07 14:12:00 -03:00
PabstMirror
3940ba9a62 opps 2015-03-07 10:58:34 -06:00
PabstMirror
e191105200 Merge Changes 2015-03-07 10:36:01 -06:00
PabstMirror
3690f1a733 Pull reload changes from master 2015-03-07 10:32:31 -06:00
Nicolás Badano
31a50ee7aa Merge pull request #158 from KoffeinFlummi/linkBelt 
Link belt
 2015-03-07 13:00:26 -03:00
Glowbal
657cf14515 Indentation 2015-03-07 13:57:36 +01:00
Glowbal
239ffdc4d2 headers 2015-03-07 13:47:28 +01:00
Glowbal
9590661cc5 Removed left overs 2015-03-07 13:39:09 +01:00
Glowbal
79b3df9815 fixed bodybag classname 2015-03-07 13:37:31 +01:00
Glowbal
dc29cad4cd Added items for curator and medical supply crate 2015-03-07 13:36:56 +01:00
Glowbal
5718649639 Added medic, medical vehicle and medical facility modules 2015-03-07 13:25:28 +01:00
Glowbal
bf8c9dc6f9 Implemented support for different medic roles 2015-03-07 13:16:32 +01:00
Glowbal
d780592629 Fixed issue with addToInjuredCollection 2015-03-07 13:06:50 +01:00
Glowbal
1c05f3578c Added moduleMedicalSettings 2015-03-07 13:06:33 +01:00
Glowbal
f322884176 Added medical settings module 2015-03-06 22:54:44 +01:00
Glowbal
e2acb2385b Support for a max damage value for wounds 2015-03-06 22:41:20 +01:00
Glowbal
fc0d6e8e1c Updated author information in the config 2015-03-06 20:04:48 +01:00
Glowbal
fd44f7bca6 Indentation 2015-03-06 19:57:45 +01:00
Glowbal
8687f8d073 Changed font sizes and removed animation button. 2015-03-06 19:56:43 +01:00
Glowbal
50bdc1d4c7 Disable unused buttons 2015-03-06 19:56:15 +01:00
Glowbal
8064253a4d Formatting, indentation, minor refactoring + fix for opening settings menu 2015-03-06 18:15:32 +01:00
KoffeinFlummi
a45486cfc8 Remove superfluous todos 2015-03-06 07:36:13 +01:00
KoffeinFlummi
8b11759fe4 Fix faulty interaction config 2015-03-06 07:32:23 +01:00
Nicolás Badano
9010f7a926 Change main action point for static weapons to the gunnerview selection 2015-03-06 01:35:12 -03:00
Nicolás Badano
5d68969b63 Added action for checking ammo on others MG's belts and on Static Weapons 2015-03-06 01:34:38 -03:00
Nicolás Badano
7b4487e8fc Split checkammo function 2015-03-06 01:32:47 -03:00
Nicolás Badano
342b3c3a4c Make reload require ace_interaction 2015-03-06 01:30:51 -03:00
Nicolás Badano
5b4fa6b503 Remove debug stuff 2015-03-05 22:52:37 -03:00
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
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
PabstMirror
9935ac57bd Base Cleanup 
Headers
Formating
Small optimizations
 2015-02-19 19:32:41 -06: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
commy2
0ae41609c2 no fcs for ais 2015-02-14 20:20:03 +01:00
Glowbal
155503d4a1 Merged GUI into common. 
Removed unnecessary GUI functions.
Updated displayIcon function to be more dynamic
Added client side settings for displaying icons.
 2015-02-14 20:06:55 +01:00
commy2
57f8595e9c clean up aircraft weapons config 2015-02-14 12:47:33 +01:00
commy2
075556c233 author aircraft 2015-02-14 11:36:54 +01:00
commy2
f358d099e6 aircraft config cleanup 2015-02-14 10:58:10 +01:00
commy2
8a348b0024 aircraft, remove old/redundant mag configs 2015-02-14 10:26:52 +01:00
commy2
06efab0082 fix inheritance, new little bird unarmed base class in 1.38 2015-02-14 10:04:50 +01:00
commy2
3d4c43c613 replace tabs with spaces 2015-02-14 09:50:26 +01:00
commy2
b1a1c855d9 fix wrong class inheritance in laser selfdesignate 2015-02-14 09:47:03 +01:00
commy2
20f161a9da aircraft, remove redundant config entries, documentation 2015-02-14 09:36:35 +01:00
commy2
e72742da31 add macros for transport cargo config 2015-02-14 08:26:30 +01:00
commy2
19cf05314e fcs reset was still broken 2015-02-14 08:09:52 +01:00
commy2
b2945c34d7 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-14 07:51:30 +01:00
commy2
983b44c02a air burst ammo PFH 2015-02-14 07:51:13 +01:00
PabstMirror
1a61148053 Grenades Cleanup 
Shouldn't be any change to functionality
Headers
Formating
simplifying (waitAndExecute)
exceptions/canInteract for keybind
 2015-02-14 00:39:09 -06:00
PabstMirror
fb3a610649 Fix bad STR_ACE_Common_ACETeam 2015-02-14 00:39:09 -06:00
commy2
ec29bf37a8 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-14 06:38:33 +01:00
commy2
60a7d1d1e6 fix, fcs reset was broken 2015-02-14 06:38:01 +01:00
PabstMirror
f83d83a820 Fix from AGM FFV-holster bug 2015-02-13 22:09:37 -06:00
commy2
d4163223a9 fcs in MP 2015-02-14 05:05:02 +01:00
PabstMirror
ba2ee53804 Nametag changes 
Adds user options for showing soundwaves and default nametag color
Before nametags would show effectiveCommander for cursorTarget vehicles,
moved this to a module option (default off).
 2015-02-13 21:23:40 -06:00
Glowbal
cd5b06da78 Added _returnDamage parameter to damageCaching. 2015-02-13 23:00:23 +01:00
Glowbal
4441b7d0a5 Added missing include 2015-02-13 22:58:48 +01:00
Glowbal
4896198ec2 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-13 22:57:43 +01:00
Glowbal
5b507ed9f5 Combined medium and advanced into one, with options to turn on other features. 
Changed wounds for a more diverse variation.
Added handleDamage caching for advanced.
 2015-02-13 22:55:13 +01:00
PabstMirror
dbd33d5230 Missing fnc define 
Why doesn't calling a nil function throw an error?
 2015-02-12 22:13:51 -06:00
PabstMirror
19f3154104 CSE Soundwaves 2015-02-12 21:53:15 -06:00
PabstMirror
d0b0a0e066 Missing = 2015-02-12 20:43:50 -06:00
commy2
a41299b05a Merge pull request #135 from KoffeinFlummi/syncedScopeAdjustment 
Synced scope adjustment
 2015-02-12 16:24:41 +01:00
Nicolás Badano
4a70d16f95 scopes: switch throttledPublicVariable by setVariablePublic 2015-02-12 12:21:46 -03:00
commy2
8b8abd640c Merge pull request #141 from KoffeinFlummi/setVarPub 
add common_fnc_setVariablePublic
 2015-02-12 16:04:11 +01:00
Nicolás Badano
a3dc1df109 scopes: moved getWeaponIndex to common 2015-02-12 11:57:55 -03:00
commy2
7c8840df56 transfer value even if it changed 2015-02-12 15:56:57 +01:00
Nicolás Badano
a4815cb8ac scopes: reduce control numbers 2015-02-12 11:51:17 -03:00
commy2
b32849a68e no left hand - weapon IK when swag walking (combat pace) 2015-02-12 14:18:34 +01:00
commy2
ff0348a169 add common_fnc_setVariablePublic 2015-02-12 13:23:38 +01:00
commy2
ba80eb63eb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-11 23:49:58 +01:00
commy2
67b3442d17 getting the fcs to work in MP 2015-02-11 23:49:41 +01:00
Nicolás Badano
e9892f4f7b Merge pull request #131 from KoffeinFlummi/MagRepackRedo 
Rewrite: Magazine Repack
 2015-02-11 19:42:47 -03:00
PabstMirror
7545a6c3d8 Code cleanup 2015-02-11 15:43:08 -06:00
commy2
93927ac77d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-11 22:39:51 +01:00
commy2
d18f470394 allow rangefinder while the fcs is active 2015-02-11 22:39:31 +01:00
Nicolás Badano
681d83f922 Merge pull request #129 from KoffeinFlummi/agmCaptivesPort 
Port: AGM Captives
 2015-02-11 18:09:33 -03:00
commy2
0d3e103de1 fcs work around for weaponDirection with commander turrets 2015-02-11 20:59:41 +01:00
commy2
4695376f55 fix eventhandler name 2015-02-11 18:49:14 +01:00
commy2
3568d0d72e fix in fcs vehicleInit 2015-02-11 16:35:42 +01:00
commy2
7360277d09 fix error in canUseFCS 2015-02-11 15:29:42 +01:00
commy2
3f8f08cc8b no holding key with fcs 2015-02-11 14:51:21 +01:00
KoffeinFlummi
89a505ea44 Remove old effects code 2015-02-10 23:14:56 +01:00
KoffeinFlummi
675b89f360 Add blinding effect to wakeup 2015-02-10 23:14:39 +01:00
KoffeinFlummi
28dbd857c2 Fix generic error 2015-02-10 23:14:11 +01:00
KoffeinFlummi
faa7e1fb63 Merge alive and Zeus conditions 2015-02-10 23:13:52 +01:00
KoffeinFlummi
4ec19429ae Fix initial value of bloodVolume 2015-02-10 23:13:14 +01:00
bux578
5ef729ee80 small fix 2015-02-10 19:11:58 +01:00
bux578
40e422f95a added PM's solution 2015-02-10 18:57:23 +01:00
bux578
e14d49393a Revert "remove file and comments" 
This reverts commit 58b557bd99.
 2015-02-10 18:40:06 +01:00
KoffeinFlummi
fe0eac7896 First port of AGM's visual loop. 2015-02-10 18:17:26 +01:00
KoffeinFlummi
fba44f490d First draft of death prevention 2015-02-10 13:33:40 +01:00
PabstMirror
b3f68467bb Wrong Actions in CfgMoves 2015-02-09 23:33:50 -06:00
Nicolás Badano
ff5c5a5bac scopes: Code cleaned up, removed spawns, added standard headers. 2015-02-10 01:22:10 -03:00
Nicolás Badano
eadcd82366 scopes: fixed errors, throttled sync of scope adjustment to all client and local calculation of deflections. 2015-02-09 23:00:40 -03:00
Nicolás Badano
f163e307c8 ace_common: throttledPublicVariable function 2015-02-09 22:59:43 -03:00
bux578
58b557bd99 remove file and comments 2015-02-09 19:07:58 +01:00
bux578
b8fb1cb86d SwitchUnits: remove PFH and code cleanup 2015-02-09 19:06:28 +01:00
PabstMirror
24bd515814 Commenting and some stringtables 2015-02-08 22:44:23 -06:00
PabstMirror
45c9b65bad Merge pull request #123 from KoffeinFlummi/attachToVehicles 
Attach to vehicles
 2015-02-08 22:21:38 -06:00
PabstMirror
da9fc39103 Headers and Finish Notice 2015-02-08 17:35:21 -06:00
Nicolás Badano
a2b1cf1259 g-forces: updated headers 2015-02-08 19:58:41 -03:00
Nicolás Badano
80778cf8db overheating: updated headers 2015-02-08 19:54:12 -03:00
PabstMirror
e770a74630 Headers 2015-02-08 16:36:58 -06:00
Nicolás Badano
bedf059af5 Merge branch 'PFH_SwitchUnits' of github.com:KoffeinFlummi/ACE3 into PFH_SwitchUnits 
Conflicts:
	addons/switchunits/functions/fnc_module.sqf
 2015-02-08 19:17:07 -03:00
Nicolás Badano
8a26fbc957 ace_settings: remove debug stuff 2015-02-08 18:36:00 -03:00
Nicolás Badano
1b9d0aa635 ACE_Settings: do not load client settings on dedi servers or HC 2015-02-08 18:29:49 -03:00
PabstMirror
3f6ffa6ac2 Mag Repack - Keep Progress prototype 
Ideas from AGM and CSE
Keeps Progress While Repacking if interrupted
Added sounds from CSE
 2015-02-08 13:48:53 -06:00
Glowbal
a609d00730 Implemented a setDead function. Allows for interception of all kills and using a revive script instead. 
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
 2015-02-08 13:18:08 +01:00
Glowbal
a3c4c60b7f Added possibility to add unconscious conditions. 2015-02-08 13:06:44 +01:00
Glowbal
633037c1b4 Replaced injuredCollection array for separate PFH for each unit. 2015-02-08 11:34:20 +01:00
Glowbal
3be442c31a Added initial draft of new player effects handling. 2015-02-08 11:24:36 +01:00
Glowbal
0a161319d2 Added initial draft of setUnconscious 2015-02-08 10:25:03 +01:00
Glowbal
bf762bbdf1 Updated headers to correct format 
Reorganized function names.
Added unit vitals loop
 2015-02-08 10:01:32 +01:00
Glowbal
35de875382 Added cardiac arrest 2015-02-08 00:08:36 +01:00
Glowbal
b8be7775bd Updated open wounds injuries to newest CMS version. 2015-02-08 00:07:49 +01:00
Glowbal
aadb289962 Added initial rewrite of CMS vitals script for medium and advanced medical. 2015-02-07 23:55:48 +01:00
Glowbal
26527489d6 Added initial medium wounds. 
Fixed merge conflict.
 2015-02-07 23:48:24 +01:00
PabstMirror
6d534e8846 #130 - Surrender Module Prototype 2015-02-07 15:20:51 -06:00
Nicolás Badano
1717d75a20 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-07 10:49:26 -03:00
PabstMirror
fcf39a3916 #118 Sound Effect from CSE 2015-02-06 23:23:33 -06:00
PabstMirror
ed3f28ec6d Minor Cleanup 2015-02-06 22:24:27 -06:00
PabstMirror
c117e9bf16 Header Examples 2015-02-06 17:03:56 -06:00
PabstMirror
98564fae68 Surrendering 2015-02-06 15:54:26 -06:00
KoffeinFlummi
35386f19d6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-06 13:48:28 +01:00
KoffeinFlummi
a2ee41f01d First draft of basic damage handling. 2015-02-06 13:47:17 +01:00
PabstMirror
7a3029b9fd replace spawns 2015-02-06 03:38:27 -06:00
PabstMirror
82a8fc8ca3 exceptions 2015-02-05 23:11:28 -06:00
PabstMirror
122a38a6aa More Refactoring 2015-02-05 16:39:45 -06:00
commy2
350741918b Merge pull request #121 from KoffeinFlummi/moduleSounds 
Module sounds
 2015-02-05 01:49:38 +01:00
PabstMirror
435b3b8b86 Move Code out of CfgVehicles 2015-02-04 13:16:19 -06:00
PabstMirror
11cd426b87 Redo XEH 2015-02-04 00:35:51 -06:00
PabstMirror
24ab11a1e2 More work 2015-02-03 23:56:51 -06:00
PabstMirror
4c727fbff5 remoteFncs -> events 2015-02-03 23:13:44 -06:00
commy2
49f0b79962 fcs for turrets 2015-02-04 03:20:55 +01:00
Garth L-H de Wet
4d38e19f8c Should avoid potential conflicts of IED codes. 2015-02-04 02:19:56 +02:00
Garth L-H de Wet
749d068d2d Added IED handling (for the player and support for AI). Can dial an IED and it will ring before exploding. 2015-02-04 02:16:47 +02:00
Garth L-H de Wet
f2ef53168b Added the cellphone as a item. 2015-02-04 02:15:31 +02:00
Garth L-H de Wet
357927902d Fixed incorrect variable getting in openPlaceUI function. 2015-02-04 02:14:55 +02:00
commy2
47d5befd12 fcs per turrets 2015-02-03 23:03:43 +01:00
Glowbal
596d018f45 Added function PREPs. 2015-02-03 21:48:53 +01:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
Glowbal
0a403ff422 Added initial advanced medical handleDamage functionality. 2015-02-03 21:48:08 +01:00
bux578
509bfefff1 fixed SwitchUnits 
needed to wait in initPlayer
 2015-02-03 21:47:48 +01:00
Glowbal
a50276ddaf Added a getTypeOfDamage function. 2015-02-03 21:47:45 +01:00
Nicolás Badano
d65a740b7a WindDeflection using ace_settings 2015-02-03 17:47:25 -03:00
Nicolás Badano
e57a135750 Missing prep 2015-02-03 16:49:40 -03:00
bux578
903c41308c works in singleplayer 2015-02-03 20:33:15 +01:00
KoffeinFlummi
79aa8d1c7a Use macros, remove var assignments 2015-02-03 20:14:34 +01:00
KoffeinFlummi
930fb51a20 Medical: First Draft 2015-02-03 20:09:25 +01:00
Nicolás Badano
146e87f02e nametags: slightly changed module options to use the new ACE_Settings 2015-02-03 15:47:17 -03:00
Nicolás Badano
b119d5246b fix in setsettings 2015-02-03 15:46:33 -03:00