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
13,252 Commits 73 Branches 88 Tags 752 MiB
e3bedbbfc3
Commit Graph

13252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 .
spectator module initializes three separate cameras instead, of which for example ace_spectator_freeCamera can be used to check if spec mode is active

* use ace_spectator_isSet to check for spec mode
 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
Phyma
606c6d18a6 Added Pylon weapon as a valid weapon (#5250) 2017-06-05 11:15:55 -05:00
Phyma
7141bbc4b4 Added more info about indentations, tabs and EditorConfig (#5249) 
* Added more info about indentations, tabs and EditorConfig

* Fixed original misspelling "Every"
 2017-06-05 12:44:10 +02:00
Phyma
cec82be93b Raise lower carry object (#5234) 
* Fix to move items up and down

* Fixed private

* Fixed public bug

* Inserted Pabst solution

* Remove extra space

* Fixed request + added author

* Fixed to correct comment

* Tweeked comment again
 2017-06-04 12:46:49 -05:00
PabstMirror
8bb92cee6f Fix weapon select grenade count wehn using advThrow (#5244) 2017-06-04 10:07:35 -05:00
PabstMirror
48680d1123 Cleanup unused hellfire vic stringtable (#5245) 2017-06-03 23:39:03 -05: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
c9b26fa3e5 Fix being unable to throw last mag (#5242) 2017-06-03 21:39:52 -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
SilentSpike
b3889d9d7e Fix accidental numerical change (#5235) 2017-06-02 19:56:24 -05:00
Rebel
bf4b49a213 Fix spectator icons and camera jitter (#5067) 
* Use `Visual` commands for icons and external camera position
 2017-06-03 01:38:29 +01:00
ace3mod
1b516bb4fa [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2017-06-02 23:52:51 +02:00
ace3mod
feaa50a002 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2017-06-02 23:52:46 +02:00
ace3mod
1545b5c45c [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2017-06-02 23:52:32 +02:00
PabstMirror
3898202091 Hellfire missiles (#4679) 
* Hellfire

* Cleanup dev macros

* Cleanup some debug

* Add base interaction node for firemode actions

* Handle bad data in attack profile variable

* Skip ammo checks (returns bad data on added weaps)

* Add mags sizes for apache

* Add Hellfire Wiki Doc

* Cleanup doc

* Add pylon support

* Add support for pilot controlled weapons

* Add label to pylon mags

* Cleanup vehicle configs, autoAdd laser des, fix ineractions for driver
 2017-06-02 16:51:38 -05:00
PabstMirror
49374feb2a NLAW - Predicted Line Of Sight Guidance and Overfly Attack Mode (#4791) 
* NLAW Prototype

* Make AI Compatible

* Add Overfly Top Attack Mode

* Limit Max Deflection

* Base prediction on AI skill

* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Configure for attack cycle key

* Finish OTA ammo effects

* Cleanup

* Arm at 20m

* Disable Debug

* No models for short lived sub-ammos

* Fix Korean strings

* Change AI randomization to use skillFinal

* Add wiki doc for nlaw

* Cleanup

* Cleanup

* Cleanup
 2017-06-02 16:51:20 -05:00
James Kingsley
4872e186cd Vehicle quick mount (#4931) 
* Add quickmount files from ACEX

* Rename to ACE3, Streamline, Use clientInit

* Rename functions to ACE3, Fix crew getting

* Fix enabled text

* Fix texts

* Remove spaces

* Rework seat search
 2017-06-02 16:51:07 -05:00