GodofMonkeys
60131ee589
Add Chinese Traditional & Simplified Localization ( #5295 )
...
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
Glowbal
1144490ef3
Merge branch 'release'
2017-06-22 16:06:57 +02:00
PabstMirror
7b91629fa3
Add malden to getMapData ( #5297 )
...
* Add malden to getMapData
* Merge with CWR2 malden
2017-06-21 19:40:53 +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
jonpas
1d355b43db
Prepare release 3.10.1
2017-06-21 15:41:02 +02:00
PabstMirror
c4dd71412b
Fix isFeatureCameraActive ( #5291 )
2017-06-21 15:36:23 +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
Arcanum
fe16b72837
Fix AI can get to CA from injured
2017-06-18 12:43:39 +02:00
Arcanum
f86420c0d7
Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite-kill-ai
2017-06-18 12:30:03 +02:00
Zakant
bdea0fcdba
[Medical Rewrite] Adding respawn compatibility ( #5020 )
...
* Added respawn transition
* Removed respawn transition from statemachine and added manual transition comment
* Changed transiton to manual. Added easy way to get current status as well
* Updated event reference
* Fixed manualTransition call
* Minor headers changes
2017-06-17 18:28:16 -05:00
Zakant
b5f6169341
Remove legacy code ( #4960 )
2017-06-17 14:01:59 -05: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
classic
a92b6a753d
Jpn translate feee7f5 ( #5280 )
...
* Add the Jpn translation for quickmount
Add the Japanese translation for quickmount
* Update the Jpn translation for repair
Update the Japanese translation for repair
2017-06-14 12:37:42 -05:00
PabstMirror
feee7f5e1e
Make array of cargo holders dynamic ( #5274 )
2017-06-14 15:36:23 +02:00
PabstMirror
183eaaecdc
Cleanup heli pod actions ( #5271 )
...
Close #4783
- Make taru pods non loadable
- Make taru pods non draggable
- Increase interaction range for huron pods
2017-06-14 15:35:17 +02:00
jonpas
2d95bb1aad
Count untraced errors in make.py ( #5265 )
...
* Count untraced errors (any errors besides failed PBO builds and missinf files) in make.py
* Fix error count and prettify printing
2017-06-14 15:34:35 +02:00
Laid3acK
3034212701
gos ndjenahoud latitude ( #5275 )
2017-06-13 23:15:34 -05:00
classic
a78c42f49e
Jpn translate 73bd37 ( #5277 )
...
* Update the Jpn translation for cargo
Update the Japanese translation for cargo
* Add the Jpn translation for hellfire
Add the Japanese translation for hellfire
* Add the Jpn translation for nlaw
Add the Japanese translation for nlaw
* Add the Jpn translation for rearm
Add the Japanese translation for rearm
* Update the Jpn translation for refuel
Update the Japanese translation for refuel
* Update the Jpn translation for repair
Update the Japanese translation for repair
* Update the Jpn translation for zeus
Update the Japanese translation for zeus
2017-06-13 22:00:38 -05:00
Laid3acK
199eb849fc
fix video link ( #5276 )
2017-06-13 08:09:26 -05:00
jonpas
9d9edc46c7
Prepare release 3.10.0 (build 2)
2017-06-13 14:03:37 +02: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
jonpas
6eaba8ddaf
Update homepage version numbers #4692
...
[ci skip]
2017-06-12 16:25:19 +02:00
jonpas
6a4a3d4ce1
Merge branch 'master' into release-3.10.0
2017-06-10 22:35:22 +02:00
Andrea Verano
73bdb37d99
Italian translation updated and fixed ( #5268 )
...
Added newest lines for:
-Rearm
-Repair
2017-06-10 22:19:13 +02:00
SilentSpike
08d8cf71d7
Update cargo docs with new public functions ( #5266 )
...
* Update cargo docs with new public functions
* Add myself to squad.xml
2017-06-10 17:34:42 +01: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
jonpas
e0887b3839
Prepare version 3.10.0
2017-06-10 15:27:14 +02:00
jonpas
1027fb5d30
Merge branch 'master' into release-3.10.0
2017-06-10 15:25:27 +02:00
jonpas
f7d63336f5
Increase required CBA version to 3.3.1
2017-06-10 15:24:19 +02:00
SilentSpike
a53f68a347
Use getUnitTrait for medics, engineers and EOD ( #5246 )
2017-06-10 11:41:01 +01:00
Phyma
48b9a61497
Fix Large IED defuse distance ( #5261 )
...
* Fix for large-ied bug because underwater thing have changed
* Added size of IED in config and determine defuse range
* Added typo
* Added help text to wiki about defusing
* Better English
* Increased the defusal range on large bombs make it similar to small ieds
* Add wiki doc
2017-06-09 12:52:55 -05:00
PabstMirror
9c3cca3c56
Add repair feature to wiki ( #5247 )
...
* Add repair feature to wiki
* Add blank lines, use adv engineer
* Add repair framework page
2017-06-09 09:11:00 -05:00
Laid3acK
6facb9008b
Update kestrel4500.md ( #5228 )
2017-06-09 15:23:30 +02:00
jonpas
33e4e6cd11
Remove maximum distance of attach to vehicle action ( #5262 )
...
* Remove maximum distance of attachi to vehicle action
* Readd max distance, 10 meters to allow usage with big vehicles but also end placement system if too far
2017-06-09 14:54:58 +02:00
PabstMirror
847832c118
Fix some event names on wiki ( #5254 )
...
* Fix some event names on wiki
* Switch callable events to functions
2017-06-08 14:31:27 -05:00
PabstMirror
382028e662
Fix updating body part visuals ( #5141 )
2017-06-08 13:50:38 -05:00
Ozan Eğitmen
225d15dcca
Add Ability to Change Repair Times of Vehicles ( #5205 )
...
* Add ability to change repair time based on vehicle
* Much better
* Unary command not function
* Allow changing of track or wheel object per vehicle
* Lot more complicated than I thought
2017-06-08 13:31:25 -05:00
Phyma
55df8bca53
Repair specialist rename, fixes #3186 ( #5248 )
...
* Changed name
* Fixed Enginner only german and removed big letters
* Added docs + PR fixes #3186
* Removed other languages
* Fixed request and added comment
* Replace all usage of term "Specialist"
2017-06-08 12:10:35 -05: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
Moritz Schmidt
4f90d4da80
note required PboProject version ( #5256 )
...
* note required PboProject version
* Update setting-up-the-development-environment.md
2017-06-06 19:25:51 -05:00
PabstMirror
b3fa074c38
Disable dragging on big AA Turrets ( #5251 )
2017-06-06 01:39:49 -05:00
Ľuboš Lendáč
b91e892710
Merge branch 'medical-rewrite' into medical-rewrite-kill-ai
2017-06-05 22:54:03 +02:00
PabstMirror
f715edabc9
Fix debug
2017-06-05 12:30:54 -05:00
PabstMirror
25a28778cb
Tweak randomness for wound bleeding and pain ( #5113 )
...
* Tweak randomness for wound bleeding and pain
* Scale damage to bodyPartDamage on multi part wounds
2017-06-05 11:51:53 -05:00
PabstMirror
f98b268419
Split setUnconscious func, add spontaneousWakeUpChance setting ( #5114 )
2017-06-05 11:42:46 -05:00
PabstMirror
f369ffaa04
Med rw handle fire damage ( #5100 )
...
* Bundle fire damage into bigger chunks
Redo #4223
* Use same values
* Decrease combine cuttoff to 0.1
2017-06-05 11:42:00 -05:00
