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
11,710 Commits 73 Branches 88 Tags 752 MiB
fe16b72837
Commit Graph

1183 Commits

Author SHA1 Message Date
PabstMirror
bec55114fa Add load,unload and radial actions (#5270) 
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
 2017-06-15 14:35:33 -05:00
PabstMirror
356a8f640a Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_addHeartRateAdjustment.sqf
	addons/medical/functions/fnc_addToInjuredCollection.sqf
	addons/medical/functions/fnc_addUnconsciousCondition.sqf
	addons/medical/functions/fnc_addVitalLoop.sqf
	addons/medical/functions/fnc_canTreat.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_getBloodPressure.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getCardiacOutput.sqf
	addons/medical/functions/fnc_getHeartRateChange.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_hasMedicalEnabled.sqf
	addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
	addons/medical/functions/fnc_isInStableCondition.sqf
	addons/medical/functions/fnc_isMedicalVehicle.sqf
	addons/medical/functions/fnc_itemCheck.sqf
	addons/medical/functions/fnc_medicationEffectLoop.sqf
	addons/medical/functions/fnc_modifyMedicalAction.sqf
	addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
	addons/medical/functions/fnc_moduleReviveSettings.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_playInjuredSound.sqf
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_selectionNameToNumber.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setStructuralDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentBasic_morphine.sqf
	addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
	addons/medical/functions/fnc_treatmentTourniquet.sqf
	addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/functions/fnc_useItem.sqf
	addons/medical/functions/fnc_vitalLoop.sqf
	addons/medical_blood/functions/fnc_hit.sqf
	addons/medical_treatment/functions/fnc_hasItem.sqf
	addons/medical_treatment/functions/fnc_useItems.sqf
 2017-06-10 10:21:18 -05:00
SilentSpike
a53f68a347 Use getUnitTrait for medics, engineers and EOD (#5246) 2017-06-10 11:41:01 +01:00
PabstMirror
d1f4b90714 Fix minor debug that got left in (#5260) 2017-06-08 11:55:19 -05:00
PabstMirror
f35f80ee82 Rearm - Pylon Support and Dynamically Add Supply Actions (#5183) 
* Dynamic Add

* Support 1.70 Pylon Loadouts

* Properly handle old compat pbos - Update RHS Compat

* Re-add documentation

* cleanup headers (note from other pr)

* Cleanup

* Fix var spelling
 2017-06-08 11:47:52 -05:00
PabstMirror
1be9e7ca30 Merge pull request #5182 from acemod/GitHawk-rearm_supply 
Rearm - Limited Supply (Fix Merge Conflcits)
 2017-06-08 11:45:12 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255) 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02:00
Andrea Verano
0affa14a1b Italian Translation Update (#5243) 
Added Italian translation for:
-cargo
-hellfire
-nlaw
-quickmount
-refuel
-zeus
 2017-06-03 22:27:51 -05:00
PabstMirror
ddccfe563b Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
 2017-06-03 12:37:28 -05:00
PabstMirror
00b91bed45 Minor fixes, cleanup, add lint ignore directives (#5176) 
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
 2017-05-31 22:09:36 +01:00
SilentSpike
2ca3716277 Fix Zeus teleport players module (#5175) 
* Add dummy function to zeus UI modules

This removes the message about the module having no function when in SP.

* Fix zeus teleport module for non-local units

BI made a change to the function this module was using. So now it has to
be ran local to the player in question.
 2017-05-26 16:07:33 +01:00
PabstMirror
114f402c58 Merge branch 'master' into medical-rewrite 2017-05-23 13:44:57 -05:00
PabstMirror
d4a6caf2b1 Just warn for old compat pbos (#5177) 
* Just warn for old compat pbos

* Use CBA_fnc_error big warning box

* fix caps
 2017-05-22 13:19:43 -05:00
PabstMirror
b192be0b70 Fix merge, cbaEvents, macros, cleanup 2017-05-18 12:42:02 -05:00
PabstMirror
46c041e6bc Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply 
Conflicts:
	addons/attach/functions/fnc_getChildrenAttachActions.sqf
	addons/common/functions/fnc_dumpArray.sqf
	addons/common/functions/fnc_removeAllEventHandlers.sqf
	addons/common/functions/fnc_removeEventHandler.sqf
	addons/common/functions/fnc_serverEvent.sqf
	addons/common/functions/fnc_waitUntilAndExecute.sqf
	addons/explosives/functions/fnc_scriptedExplosive.sqf
	addons/finger/config.cpp
	addons/frag/config.cpp
	addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
	addons/laser/functions/fnc_laserOn.sqf
	addons/laser/functions/fnc_seekerFindLaserSpot.sqf
	addons/laser/functions/fnc_unitTurretCanLockLaser.sqf
	addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf
	addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf
	addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf
	addons/main/config.cpp
	addons/main/script_mod.hpp
	addons/map/functions/fnc_flashlightGlow.sqf
	addons/maptools/functions/fnc_addLineMarker.sqf
	addons/maptools/functions/fnc_canDraw.sqf
	addons/maptools/functions/fnc_cancelDrawing.sqf
	addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf
	addons/maptools/functions/fnc_copyMapRemoteSend.sqf
	addons/maptools/functions/fnc_copyMapStart.sqf
	addons/maptools/functions/fnc_handleKeyDown.sqf
	addons/maptools/functions/fnc_handleMouseZChanged.sqf
	addons/maptools/functions/fnc_removeLineMarker.sqf
	addons/maptools/functions/fnc_updateLineMarker.sqf
	addons/missileguidance/functions/fnc_checkLos.sqf
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
	addons/overheating/CfgWeapons.hpp
	addons/overheating/functions/fnc_swapBarrelCallback.sqf
	addons/rearm/XEH_postInit.sqf
	addons/rearm/XEH_respawn.sqf
	addons/rearm/functions/fnc_canRearm.sqf
	addons/rearm/functions/fnc_dropAmmo.sqf
	addons/rearm/functions/fnc_getMaxMagazines.sqf
	addons/rearm/functions/fnc_grabAmmo.sqf
	addons/rearm/functions/fnc_pickUpAmmo.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf
	addons/rearm/functions/fnc_rearmSuccess.sqf
	addons/rearm/functions/fnc_rearmSuccessLocal.sqf
	addons/rearm/functions/fnc_storeAmmo.sqf
	addons/repair/functions/fnc_useItem.sqf
	addons/tagging/CfgVehicles.hpp
	addons/ui/ACE_UI.hpp
	optionals/tracers/config.cpp
 2017-05-17 18:21:11 -05:00
PabstMirror
1aebae32c5 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
 2017-05-14 14:50:36 -05:00
PabstMirror
bfd3695868 SQF Lint Cleanup Pass (#5157) 
* SQF Lint Cleanup Pass

* Fix var in TRACE

* Add basic python tool

* Simplify

* Hit space key 6 times

* Fix error in dropNozzle

* handle error message exceptions

* Fix py
 2017-05-14 14:48:05 -05:00
Laid3acK
457461efbe AB: Lythium latitude (#5109) 
* Update fnc_getMapData.sqf

* bump1

* bump2
 2017-05-10 19:28:05 +02:00
PabstMirror
31a81c4407 Merge branch 'master' into medical-rewrite 2017-05-06 12:01:58 -05:00
classic
777d0e6fb0 Improve Japanese translation (#5133) 
* Add the Japanese translation for cargo

Add the Japanese translation for cargo, fix to html tag and few improvement

* fix the Japanese transltion

Fix the Japanese translation for attach. it was used wrong html tag.

* changed The Japanese translation

Changed the Japanese translation of azimuth angle

* fix The Japanese translation

Fix the Japanese translation for chemlights. it was used wrong html tag.

* fix The Japanese translation

Fix the Japanese translation for laserpointer. it was used wrong html tag.

* Fix the Japanese translation

Fix the Japanese translation for medical_blood. it was used wrong translation.

* Fix the Japanese translation

Fix the Japanese translation for rearm. it was used wrong translation.

* add The Japanese translation

add The Japanese translation to new words

* Improve The Japanese translation

Improve, fix and change The Japanese translation

* minor fix to Japanese translation

minor fix to Japanese translation. see b1b07c5
 2017-05-06 12:01:31 -05:00
PabstMirror
c001be5b09 Add keybind to toggle interaction menu (#5095) 2017-05-05 13:20:54 -05:00
PabstMirror
d93269304d Merge branch 'master' into medical-rewrite 2017-04-15 10:09:50 -05:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988) 
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
 2017-04-11 10:06:29 -05:00
PabstMirror
fb73286242 Tweak overheating (#4969) 
* Tweak overheating

* Add define for constant magic num
 2017-04-11 10:04:57 -05:00
jonpas
fd139abb42 Use setShotParents in Advanced Throwing (#5052) 
* Use setShotParents in Advanced Throwing - close #5034

* Execute setShotParents on server (server-only command)
 2017-04-11 16:59:32 +02:00
PabstMirror
672be73bae Merge branch 'master' into medical-rewrite 
Conflicts:
    addons/medical/XEH_preInit.sqf
 2017-03-18 09:09:45 -05:00
jonpas
b31abee4fd Sandbags surfaces update (#4971) 
* Use private keyword, move surface blacklist to script_component.hpp

* Check height above terrain

* Add Tanoa surfaces, Check if in water

* Use 'dust' config entry to determine surface, Add common canDig (checks dustyness)

* Re-enable compile cache

* Revert to surface blacklist with dust as fallback

* Move surface blacklist to script_component because SQF validator complains
 2017-03-15 10:11:37 -05:00
PabstMirror
0841c05a6d Cleanup use of ACE_HashLocation (#4975) 2017-03-08 10:15:15 +01:00
PabstMirror
8ad3571d19 Merge branch 'master' into medical-rewrite 2017-03-02 18:00:34 -06:00
J3aLeiNe
6ce9ede1b5 Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-02 14:00:18 -06:00
PabstMirror
02ea214ade Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-02-24 19:19:39 -06:00
PabstMirror
c7b60d1777 Merge branch 'master' into medical-rewrite 2017-02-18 18:17:37 -06:00
PabstMirror
159e762576 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-02-10 13:03:12 -06:00
ViperMaul
ad2e3719b4 Adding Normal to Common stringtable 2017-01-19 17:31:29 -06:00
ViperMaul
8db5d8f2ae Change Setting from Basic to Normal and Stringtable moves 2017-01-19 15:46:44 -06:00
ViperMaul
1078913d2a Stringtable changes. 2017-01-19 15:29:33 -06:00
PabstMirror
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
J3aLeiNe
2dcd79fd1d Update MapData (#4786) 
* Update Map data

 - Add IFA3LITE maps
 - Add CSA38 map
 - Add Beketov map
 - Add Winter Panthera map
 - Add Nam and Mogadishu maps
 - Add Uhao island map

* Update fnc_getMapData.sqf

 - Add X-Cam-Taunus map
 - Add Unsung 3.1 Delta maps
 2017-01-02 21:32:58 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
PabstMirror
c22fce273f Overpressure changes (#4770) 
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
 2016-12-22 13:29:05 -06:00
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
PabstMirror
b4315b6a65 Javelin overhaul (#4580) 
* Javelin overhaul

* header spelling fix
 2016-11-15 12:15:25 -06:00
PabstMirror
aeb0614e7e Cleanup map gesture sync / color mapping (#4486) 
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
 2016-10-27 19:54:58 +02:00
commy2
e03614757e fix misc. treatment actions 2016-10-13 21:08:41 +02:00
commy2
0f43829b63 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-10 14:29:50 +02:00
Nicolás Badano
ab6fc8efca Laser guidance for all designators (#3308) 
* Fix laser and missileguidance over water

* Return a normalized vector in EFUNC(common,getTurretDirection)

* Make laser dispersion simulation optional, default off

* Prototype for ace_laser_designate

* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate

* Simplify laser into one module

Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate

* Cleanup missile guidance

* Headers, fix laser over water

* Cleanup

* Test

* Change setting to scalar, more cleanup

* Add seeker debug drawing
 2016-10-08 12:55:30 +02:00
commy2
853c7db1dc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-10-06 10:20:10 +02:00
PabstMirror
dfa09d3161 Functions to perform arithmetic ops on sets (#4514) 
* Functions to perform arithmetic ops on a set

* fix spelling
 2016-10-06 10:18:14 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00