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,185 Commits 73 Branches 88 Tags 752 MiB
9750e5fbc3
Commit Graph

1085 Commits

Author SHA1 Message Date
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
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
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
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