Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 12:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ddadabc661383bf01a137fb35763d89bf391b0f7
ACE3/addons
History
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
..
ai
rename agm burst mode to ace burst mode (ai)
2015-02-03 19:38:49 +01:00
aircraft
clean up aircraft weapons config
2015-02-14 12:47:33 +01:00
attach
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
ballistics
Add README for ballistics
2015-01-26 07:36:45 +01:00
captives
Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
2015-02-23 14:24:43 -03:00
common
Merge pull request #145 from KoffeinFlummi/standardize_ui
2015-02-23 18:11:11 +01:00
difficulties
Create README.md
2015-01-26 13:37:41 +01:00
disposable
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
explosives
Fixed isNull check not working. Fixed audio not being found.
2015-02-19 15:59:14 +02:00
fcs
oops
2015-02-14 23:13:43 +01:00
flashsuppressors
add macros for transport cargo config
2015-02-14 08:26:30 +01:00
frag
Create README.md
2015-01-26 13:46:21 +01:00
gforces
g-forces: updated headers
2015-02-08 19:58:41 -03:00
goggles
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings
2015-02-03 17:48:24 -03:00
grenades
Grenades Cleanup
2015-02-14 00:39:09 -06:00
hearing
Fixes
2015-02-02 21:13:31 -03:00
interact_menu
interact_menu: add headers
2015-02-21 17:11:03 -03:00
interaction
Tap on either shoulder. "Tap" animation
2015-02-19 19:45:46 -03:00
inventory
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
kestrel
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
laser
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
laser_selfdesignate
replace tabs with spaces
2015-02-14 09:50:26 +01:00
laserpointer
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
lockbackpacks
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
logistics_uavbattery
Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
2015-02-23 14:24:43 -03:00
logistics_wirecutter
Fix bad STR_ACE_Common_ACETeam
2015-02-14 00:39:09 -06:00
magazinerepack
Code cleanup
2015-02-11 15:43:08 -06:00
magazines
add macros for transport cargo config
2015-02-14 08:26:30 +01:00
main
add macros for transport cargo config
2015-02-14 08:26:30 +01:00
map
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
markers
Fix CurrentChannel
2015-02-21 21:19:54 -06:00
medical
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
2015-02-24 22:35:05 +01:00
missileguidance
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
missionmodules
Fixed forgotten missionModules.
2015-02-19 19:07:19 +01:00
movement
no left hand - weapon IK when swag walking (combat pace)
2015-02-12 14:18:34 +01:00
nametags
nametags: slightly changed module options to use the new ACE_Settings
2015-02-03 15:47:17 -03:00
nightvision
comments
2015-02-17 22:24:37 -06:00
noradio
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
optionsmenu
ACE_Settings: various fixes
2015-02-03 02:37:13 -03:00
overheating
overheating: updated headers
2015-02-08 19:54:12 -03:00
overpressure
mm
2015-02-15 16:25:09 -03:00
parachute
Added a event handler for player vehicle changing. As well as covered the canInteract in key handler.
2015-02-03 11:51:16 +02:00
protection
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
ragdolls
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
realisticnames
fix inheritance, new little bird unarmed base class in 1.38
2015-02-14 10:04:50 +01:00
recoil
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
reload
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
respawn
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
resting
Added weapon resting state icon
2015-02-22 13:58:51 +01:00
safemode
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
scopes
scopes: switch throttledPublicVariable by setVariablePublic
2015-02-12 12:21:46 -03:00
smallarms
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
switchunits
Merge branch 'PFH_SwitchUnits' of github.com:KoffeinFlummi/ACE3 into PFH_SwitchUnits
2015-02-08 19:17:07 -03:00
thermals
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
vector
no holding key with fcs
2015-02-11 14:51:21 +01:00
vehiclelock
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
vehicles
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
weaponselect
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
weather
ACE_Settings: replace all ACE_Parameters
2015-01-30 19:06:25 -03:00
wep_dragon
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
wep_javelin
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
winddeflection
Fix bad STR_ACE_Common_ACETeam
2015-02-14 00:39:09 -06:00