PabstMirror
80e5088013
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/CfgVehicles.hpp
addons/medical/XEH_PREP.hpp
addons/medical/stringtable.xml
2017-09-27 15:48:22 -05:00
KoffeinFlummi
32b2d99887
Merge remote-tracking branch 'sbng/master'
2017-09-27 18:57:24 +02:00
jonpas
430c136a61
Deprecate isUnderwater (replaced by underwater command from 1.66) ( #5560 )
2017-09-26 19:35:00 -05:00
PabstMirror
75e58a8dce
Fix unloading unconscious unit
2017-09-26 17:45:10 -05:00
PabstMirror
30fcbb66ae
Add ace_common_fnc_getPylonTurret func ( #5548 )
...
* Add getPylonTurret function
* cleanup
* debug
* Fix
2017-09-26 21:47:13 +02:00
sbng-PAPA
37dcb562a7
korean translation for 3.10
2017-09-26 00:54:27 +09:00
PabstMirror
ddf72d5878
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/ACE_Medical_SelfActions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/CfgWeapons.hpp
addons/medical/data/model.cfg
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/stringtable.xml
2017-09-23 11:25:58 -05:00
jonpas
eb6e8c0b56
Cleanup optional argument headers ( #5543 )
2017-09-22 17:33:08 +02:00
Josuan Albin
1ba330e853
Add toggle flashlight and NVG zeus modules ( #4556 )
...
* Add toggle flashlight and NVG modules
* Remove excessive spaces in moduleToggleNvg
* Fix indentation and typos to fit review
* Add an option to add gear, fix headers
* Change category to utility
* Add QOL improvement suggested by pabst
* Fix locality issues
* Remove locality check before enableFlashlight targetEvent
* Remove locality check before addWeaponItem targetEvent
* Add a player check in moduleToggleNVG, change modules category
* Add the same QOL in toggleNVG than in toggleFlashlight
2017-09-21 20:43:35 +02:00
Ozan Eğitmen
90f92db01d
Replace UI icons with vanilla/common ones ( #5532 )
...
Also removes some _very_ old paa files that belong to AGM/CSE
2017-09-21 16:22:28 +02:00
PabstMirror
30a8d2db7b
Use CBA Misc Items ( #5502 )
...
* Use CBA Misc Items
* Set required CBA to 3.4.1
2017-09-12 23:23:45 -05:00
jonpas
170cd8e5de
Remove deprecated stringRemoveWhitespace ( #5483 )
2017-09-07 20:12:47 +02:00
Vdauphin
5ca113d0ba
FIX: ace_common_fnc_loadPerson don't detect taru with place for crew ( #5464 )
...
When you load somebody inside a vehicle the ace_common_fnc_loadPerson is
used. This fonction acutually search nearestObjects of type ["Car",
"Air", "Tank", "Ship_F"] to put player inside. Infortunatly, the taru
family with crew place (exemple
:"Land_Pod_Heli_Transport_04_medevac_black_F") are not detected because
the corresponding parent class of
"Land_Pod_Heli_Transport_04_medevac_black_F" is :
["Land_Pod_Heli_Transport_04_medevac_F","Pod_Heli_Transport_04_crewed_base_F","StaticWeapon","LandVehicle","Land","AllVehicles","All"].
To avoid this, the "Pod_Heli_Transport_04_crewed_base_F" parent class
should also be search by nearestobjects.
2017-08-28 22:51:03 -05:00
PabstMirror
eb18d23181
Allow digging in malden grass ( #5453 )
2017-08-24 15:00:25 -05:00
PabstMirror
52915e1104
Common func to run config tests ( #5170 )
...
* Common func to run config tests
* Add map config testing, malden data and reverse map config's latitude
* Headers
* Simplify config levels
* Header
* fix example
2017-08-22 16:21:41 -05:00
PabstMirror
74fd0f507f
Add EH for UAV control, Add Hellfire support ( #5305 )
...
* Add EH for UAV control, Add Hellfire support
* cycle guidance keybind
* Handle broken PlayerViewChanged
* humps
* UAV Self-interactions (#5379 )
* Switch ACE_Player to uav AI on valid seat change
* Different approach to UAV interactions
* Forgot to remove a variable
* Changed param to select
2017-08-22 16:07:45 -05:00
PabstMirror
a67815d072
Disable damage on cars loaded as cargo ( #5402 )
2017-08-22 13:27:11 -05:00
PabstMirror
accaf9fd01
Compatibility with newest mikro tools ( #5442 )
...
* Compatibility with newest mikro tools
- Remove all use of `access` in configs
- Add skeleton cfg for rtms
- Remove use of `-L` in makePbo for non-bin
* Tabs in model.cfg
2017-08-22 12:53:58 -05:00
SilentSpike
d3ce75daef
Spectator overhaul ( #5171 )
...
- Overhauls the spectator module entirely to share a similar UX to BI's "End Game Spectator" while maintaining some of the extended flexibility of ACE Spectator.
- Simplifies spectator setup by reducing the number of settings. More advanced setup is still possible via the API functions provided.
2017-08-12 14:25:48 +01:00
Dystopian
dd3a66a643
Fix adv. throw key handling when reloading ( #5336 )
...
* Fix throw key handling when reloading
* Consider UGL reload to ace_common_isReloading var
* Fix if space, change private var assign
* Shorten UGL check
2017-07-10 21:44:02 +02:00
jonpas
5cf7569711
Correct new Chinese stringtable identifiers ( #5334 )
2017-07-08 09:48:39 -05:00
PabstMirror
d02dacf613
Refuel - change nozzle position calc ( #5279 )
2017-06-22 22:58:57 -05:00
GodofMonkeys
60131ee589
Add Chinese Traditional & Simplified Localization ( #5295 )
...
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
PabstMirror
c6e70a4e88
Add malden to getMapData ( #5297 )
...
* Add malden to getMapData
* Merge with CWR2 malden
2017-06-21 19:40:17 +02:00
PabstMirror
ffe31d9759
Fix isFeatureCameraActive ( #5291 )
2017-06-21 15:34:10 +02:00
Glowbal
ba05b74fd2
Merge branch 'release'
2017-06-20 20:19:29 +02:00
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
Laid3acK
3034212701
gos ndjenahoud latitude ( #5275 )
2017-06-13 23:15:34 -05:00
Moritz Schmidt
e770f669b6
Fix isFeatureCameraActive for Spectator enhacements ( #5269 )
...
* fix isFeatureCameraActive for spec
ace_spectator_camera was removed in 77c2b99ee5
2017-06-13 13:53:41 +02: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
