Nicolás Badano
618c021f7e
Tab to space plus comments for the spawns
2015-03-14 17:15:28 -03:00
Nicolás Badano
518010be36
Reordered the map, mapfx and pbos:
...
- mapfx moved inside map
- everything related to map tools and drawing moved to it's own pbo called ace_maptools
Also fixed a couple of bugs in BFT
- Only a single marker was being drawn
- The BFT_HideAi parameter had the opposite effect
2015-03-14 16:58:05 -03:00
PabstMirror
bab1984782
Merge pull request #194 from KoffeinFlummi/captivesMedicalInegration
...
Captives medical inegration
2015-03-14 13:11:31 -05:00
PabstMirror
ebbebea6f2
Merge pull request #187 from KoffeinFlummi/wirecuttersInerationTest
...
Wirecutters Interaction
2015-03-14 13:11:17 -05:00
PabstMirror
da337fff3e
Merge pull request #184 from KoffeinFlummi/InventoryResize
...
Dynamic Inventory Resize
2015-03-14 13:10:56 -05:00
PabstMirror
a92389f450
optMenu - remove 'fix anim' button and add headers
2015-03-14 13:10:25 -05:00
commy2
b79978116d
some functions
2015-03-14 18:38:44 +01:00
Nicolás Badano
c03115b564
Refactored mapfx code, make the three features optional
2015-03-14 13:46:10 -03:00
commy2
f3f20439c8
config stuff, functions to make objects dragable
2015-03-14 13:51:23 +01:00
commy2
58212f5ce0
add PBO to drag objects
2015-03-14 12:05:43 +01:00
Glowbal
2bee533a8c
Added AGM stringtables for drag, carry, load & unload
2015-03-14 09:51:08 +01:00
Glowbal
dcf3a73518
Added copyDeadBody function
2015-03-14 09:48:16 +01:00
Glowbal
99b1986059
Added setting for allowing movement of dead bodies
2015-03-14 09:37:19 +01:00
Nicolás Badano
69fa51cfeb
Calculate map illumination based on ambientBrightness
2015-03-13 22:27:38 -03:00
Nicolás Badano
80e7117ead
Tweak ambientBrightness to take into acount the cloud coverage
2015-03-13 22:27:14 -03:00
Nicolás Badano
7e2e6999bd
Ported from ACE2:
...
- Bring scale legend to ingame map
- Tweak map colors to make them exactly the same as ACE2 (had to import road colors directly from Arma 2, cause ACE just used defaults).
- Hide bushes and trees from the ingame map (they remain visible on the editor)
- Keep sattelite texture toogable, but with a opacity of 50%.
2015-03-13 19:34:56 -03:00
commy2
db6e0fe99b
hpps for realistic names
2015-03-13 19:10:24 +01:00
commy2
25fc24a419
fix cfgPatches in laserpointer
2015-03-13 18:52:30 +01:00
commy2
1e731ee425
fix vector cfg patches
2015-03-13 18:34:13 +01:00
PabstMirror
93262f3b92
Use ace_isUnconscious in anim changed EH
2015-03-13 00:45:12 -05:00
Nicolás Badano
86c16953ea
Refactor and tweak map illumination to:
...
- add tint depending on time of day.
- make it slightly less dark at night, so it's usable under any condition.
Temporarily remove light creation.
2015-03-13 01:35:45 -03:00
Nicolás Badano
a4ea5fb724
Cache the call to determineMapLight
2015-03-13 01:01:00 -03:00
PabstMirror
55fcc60453
Merge branch 'master' into captivesMedicalInegration
2015-03-12 22:44:24 -05:00
Nicolás Badano
8d0cc787b0
Initial port/reimplementation of ace_mapfx, providing:
...
- dynamic map illumination
- shacking maps when on the move
- optional max zoom
2015-03-12 21:04:10 -03:00
Glowbal
4ce524ed3c
First draft of carry and drop unit
2015-03-12 21:16:49 +01:00
KoffeinFlummi
82f73117f4
Merge branch 'master' into medical-basic
2015-03-12 07:35:57 +01:00
KoffeinFlummi
a3069e3356
Fix wrong pain variable in patient information
2015-03-12 07:35:29 +01:00
KoffeinFlummi
ef491a7c76
Add basic information to dialog
2015-03-12 07:34:29 +01:00
KoffeinFlummi
809f6754cc
Add pain & painkiller reduction over time
2015-03-12 07:33:44 +01:00
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
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
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
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
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
Glowbal
c7ede12b99
Removed weapon select, is now just grenade throw
2015-03-09 19:03:55 +01: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
