Commit Graph

117 Commits

Author SHA1 Message Date
Drofseh
5e396a3793
Revert "Update from acemod master (#1)" (#2)
This reverts commit 4d1a5194ea.
2018-01-17 03:36:10 -08:00
Drofseh
4d1a5194ea Update from acemod master (#1)
* Generic cycle attack profile key for missile guidance (#4787)

* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup

* Frag Superanal Cleanup (#4803)

* Minimal frag cleanup

* Why did this even happen in the first place

Conflicts:
	addons/frag/functions/fnc_frago.sqf

* New Function to Show BIS Style Curator Messages (#4844)

* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args

* Generic cycle attack profile key for missile guidance (#4787)

* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup

* Cache Nametags onDraw3D flags. (#4847)

* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header

* Fix Javelin for AI (#4857)

* Optimize Laserpointer (#4859)

* only process one unit every 0.1 seconds

* exitWith to keep indentation low

* use event to determine isIR and isTI

* correctly remove units with turned on lights from their arrays

* handle weaponAccessories command reporting nil

Conflicts:
	addons/laserpointer/XEH_postInit.sqf

* Fix RHS m113 compat (#4881)

* Fix passenger actions - Ensure order of MainActions (#4883)

* Fix getPos order (#4889)

* Use createSimpleObject to create tags (#4892)

* Update CBA required version (#4899)

* prep v3.9.0

* Update required CBA version

* Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905)

* Update medical/repair 3den away from missionNamespace

* Simplify save

* Hide earplug actions if setting disabled (#4913)

* Hide earplug actions if setting disabled

* Add lines that are new

* Pass map gestures draw by reference (#4914)

* Verify params in atragmx profile gunlist (#4917)

* Fix setVariablePublic reseting to old values (#4938)

* Fix setVariablePublic reseting to old values

* Don't drop delay time

* Reload medical configs into extension on save load (#4941)

* Fix lost magazines when restoring gunbag mags (#4942)

* Add RHS GREF compat for RKG-3 grenade (#4944)

* Fix intergrated scopes (#4945)

* Require CBA v3.2.1 (#4954)

Conflicts:
	addons/main/script_mod.hpp

* Fix gforce avg on switching to aircraft (#4955)

* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array

* 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

* Fix rangecard not showing wind/lead (#4964)

* Give options menu list focus (#4965)

* Cleanup use of ACE_HashLocation (#4975)

* Add validation on group id for map gesture color mapping (#4976)

* Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985)

* Prep 3.9.1 release

* Fix cookoff desynch, fix #4900

Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.

* also fix cooking off ammo boxes

* Fix cookoff desynch, fix #4900

Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.

* also fix cooking off ammo boxes

* Add rearm config for Nemmera (#4992)

* 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

* Fix unarmed sprint->prone + minor perf improvments (#4887)

* AB : AtragMx wiki updated (#4982)

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Add files via upload

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update publish.py for RHS Gref Compat (#4999)

* Update atragmx.md

* Delete atragmx1.jpg

* Add files via upload

* Translation: Missing 3 strings in Polish (#5008)

* update user url

* Jpn translate to v391 (#5011)

* jpn translate slideshow

Add the Japanese translation for slideshow for v3.9.1

* jpn translate for cookoff

Add the Japanese translation for cookoff of the v3.9.1

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Prep 3.9.1 release

* Update atragmx.md

* Dupplicate Polish entry (#5018)

https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png

* Update atragmx.md

* Add custom CfgUIGrids for microDagr (#5014)

* Update atragmx.md

* Add files via upload

* Update atragmx.md

* fix links and `alt` texts

* Duplicate French entry (#5032)

Removes a duplicate French entry, didn't saw it :/

* Wiki range card updated (#5029)

* Update rangecard.md

* Update rangecard.md

* Update rangecard.md

* Add files via upload

* Update rangecard.md

* fix links and `alt` texts

* Wiki Advanced Ballistics updated (#5030)

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Add files via upload

* Update advanced-ballistics.md

* fix links and `alt` texts

* Wiki Kestrel 4500 updated (#5027)

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* fix links and `alt` texts

* Wiki scope updated (#5028)

* Update scopes.md

* Update scopes.md

* Update scopes.md

* Add files via upload

* Update scopes.md

* fix links and `alt` texts

* French loc improvement (#5017)

* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time

* Wiki scope updated_1 (#5037)

* Update scopes.md

* Update scopes.md

* Update scopes.md

* Add files via upload

* Update scopes.md

* fix links and `alt` texts

* Delete scope_module.jpg

* Add files via upload

* Update scopes.md

* French additions (Cargo) (#5040)

Minor French text additions

* French loc fixes (ballistics) (#5041)

Minor French loc fixes

* Update documentation for Vector21

Add explanation on how to switch range and azimuth units

* Add blank line after heading

* Update vector.md

* Update atragmx.md

* fix link atragmx.md

* Fix dagr not showing bearing in mils (#5047)

* Fix cargo loading to locked vehicle (#5049)

* Update ACEX to 3.2.0.4 (#5062)

* tweak ACE main menu info box

* use https for main menu

* use https for main men

* fix highlighted info box color (#5075)

* Filter headless clients from zeus teleportation (#5070)

* Use setShotParents in Advanced Throwing (#5052)

* Use setShotParents in Advanced Throwing - close #5034

* Execute setShotParents on server (server-only command)

* Fix FCS Vehicle Init (#5063)

* Tweak overheating (#4969)

* Tweak overheating

* Add define for constant magic num

* Virtual units - skip goggles/hearing effects (#4988)

* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler

* Fix tagging model cache (#5055)

* Frag - Cleanup and Performance (#5010)

* Frag - Cleanup and Performance

* Add dots

* (Medical) French text - minor changes (#5043)

Minor changes due to users feedback

* French localization complete (#5079)

* French localization complete

* STR_ACE_MapTools_drawStaightLines_description fix

"l'on doit survoler le milieu du trait pour pouvoir le supprimer"

* Space management

alganthe :
Espace en trop après référence.

* Diapo

alganthe :
Slideshow -> diaporama
Slide -> diapo

* Cohesion fix

alganthe :
Vous avez traduit le nom du module juste au dessus (displayname).
Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux.

Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them.

* Caisses de munitions

caisse de mun -> caisses de munitions

* STR_ACE_Scopes_Description

Oops, forgot that one.

* Fix RHS mp7 UBC (#5085)

* Fix broken  url on modules wiki page (#5088)

* Fix Javelin for AI for RHS (#5096)

* Remove CfgAiSkill config changes (#5091)

* Remove CfgAiSkill config changes

* Add note to wiki about removal

* Add volume toggle docs (#5077)

* Add volume toggle docs

* Change version and remove ref to another mod

* Changes as per review

* Fix numbers

* Fix refuel nozzle dropping to ground (#5119)

* Fix jerry can refuel interaction overlapping (#5107)

* Add keybind to toggle interaction menu (#5095)

* Add Paradrop Time Coefficient Setting (#5116)

* Add coef

* Show cargo paradrop time in menu

* Unary command, not a function call

* If drop time is 0 don't show a progress bar

* Add the setting to cargo's editor module

* Swap values

* Remove extra comma

* Move unload message to paradrop event

This way the message will show up on all paradrops, not just immidiate
ones.

* Disable search on spectator unit tree

Finally found out how to do this. Having search enabled on the unit tree might seem useful, but it doesn't interact well with keyboard shortcuts used for other purposes like camera control as it causes the tree to jump around unexpectedly.

* Simplify spectator compass code

* Optimize spectator unit list function

Making good use of the new `select` CODE syntax.

* Add 3den info to spectator template

- A `displayName` shown in the 3DEN multiplayer attributes display
- A `respawnTypes` array to define which respawn types the template is compatible with (currently only includes `2,3` - need to investigate compatibility with other types further).

* Fix #5081

The default values of the arrays manipulated by these functions overwrite
any changes applied before settings have finished initalising. This won't
be an issue after #4456 is merged in future.

* 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

* Fix Spotting Scope Interaction Point (#5132)

* Disable ACE_FCS on RHS Russian Attack Helis (#5145)

* Switch 2 perm PFEH to everyFrame (#5140)

* Explosives - Add code handler for detonation (#5115)

* Explosives - Add code handler for detonation

* Add info to wiki

* Fix cellphone in demo code, move example to wiki

* Zeus Suppression Module (#4977)

* add base structure

* Add getModuleDestination

* Add 2d map support, debug

* Cleanup, handle weapon max range

* Handle non-local units

* Use new showMessage func

* Run on groups when placed on leader

* Support for Indirect Fire Vehicles

* Cleanup

* Use doArtilleryFire which was fixed in 1.68

* hitreactions - Close map on hit (#5099)

* Wiki AtragMx minor changes (#5111)

* fix markdown syntax

* Update atragmx.md

* AB: Lythium latitude (#5109)

* Update fnc_getMapData.sqf

* bump1

* bump2

* AB: update compat R3F v3.5 (#5097)

* Update CfgWeapons.hpp

* Update CfgAmmo.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* fix missing `{`

* fix `dispersion`

* fix space

* AtragMx: BC G1 .338LM API526 (#5069)

* Update fnc_initGunList.sqf

* Update fnc_initGunList.sqf

* C1 coefficient 0.58

* Jerry Can - only set global var on server (#5131)

* Add Arma 3 Issues breaking ace_rearm (#5150)

* MapGesutres - Fix dependency on maptools (#5154)

* MapGesutres - Use getVariable to remove dependency

* Use isModLoaded

* Add missing base class to r3f compat (#5156)

* Disable g-forces for UAV AI (#5094)

* Increase max weapon index for large modsets (#5054)

* Disable rearm,refuel on dead vehicles (#5158)

* 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

* 1.70 CMs - Remove countermeasure mode switching (#5163)

* 1.70 FCS - Remove ACE_FCS from most vics (#5152)

* Handle 1.70 FCS

* Cleanup CfgWeapons

* Add warning for discreteDistance

* 1.70 CMs - Remove countermeasure mode switching (#5163)

* 1.70 FCS - Remove ACE_FCS from most vics (#5152)

* Handle 1.70 FCS

* Cleanup CfgWeapons

* Add warning for discreteDistance

* Realistic names for 1.70 pylon magazines (#5165)

* Realistic names for 1.70 pylon magazines (#5165)

* Fix gatling_30mm UBC for 1.70 (#5125)

* Fix gatling_30mm UBC for 1.70

* Fix verEsion

* Fix gatling_30mm UBC for 1.70 (#5125)

* Fix gatling_30mm UBC for 1.70

* Fix verEsion

* Prep 3.9.2 (version numbers)

* Update required Arma 3 version to 1.70

* Prepare release 3.9.2

* Update helmet hearing protection for RHS-US (#5146)

* Update helmet hearing protection for RHS-US

* Hearing - Add standardized helmet protection macros

* Tweak peltor vol

* Disable aircraft flightmodel changes (#5167)

* Disable aircraft flightmodel changes

* Remove files

* Fix merge, cbaEvents, macros, cleanup

* Use correct TransportX type for ace items (#5168)

* Use correct TransportX type for ace items

* Fix messing with flare colors

* Just warn for old compat pbos (#5177)

* Just warn for old compat pbos

* Use CBA_fnc_error big warning box

* fix caps

* Italian translation (Add & Fix) (#5193)

Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors

* Zeus updated (#5198)

Fixes and adds in the zeus section

* Add AtixNeon to AUTHORS.txt

* Add realistic names to dynamic loadout classes (#5185)

* RHS CH-47 - use animationSourcePhase (#5201)

* 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.

* Adv Throw - Handle getShotParents being [] (#5210)

* Correct compat classnames (#5204)

* Linking belt refactoring (#5206)

* Linking belt refatoring

startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.

* Fixed requested change

Fixed requested change

* AdvThrow - Handle bugged currentThrowable (#5216)

* Fix AB water vapor pressure calc (#4956)

* Fix AB water vapor pressure calc

* Fix calc in weather

* Cleanup usage of constant

* Add RVExtensionVersion, Rebuild AB DLLs

* CH53 Fastroping and other fixes (#4713)

* CH53 Fastroping and Fixes

Added fastrope points for CH53.

The getOut EH is required to keep the doors open when a unit exits the
vehicle and it uses the vehicle animation "doorHandler_R" or
"doorHandler_L" as a placeholder to determine if the doors are
open(1)/close(0).
eg. In UH1Y (Unarmed), when the right door is opened using the
useraction, "doorRB" and "doorHandler_R" will be set to 1.

* Changed TAB to 4 spaces

* Moved bracket to follow guidelines

* Refuel for non-AllVehicle objects (#5151)

* Enabled refuel for non-AllVehicles objects. Un-magic'd refuel progress timer.

* Changed helper attach position to centre of object. Offset applied when rope attached.

* Made fully compatible with non-thingX simulation types. Removed destruction effects of helper object.

* Using arma model. Removed ACE_Actions from helper object.

* Correct use of hideObjectGlobal

* Remove actions, cargo, repair on helper

* Switched helper to be setVar'd on the nozzle object

* Linkingbelt refactoring (#5213)

* Linking belt refatoring

startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.

* Fixed requested change

Fixed requested change

* simplified it even more

canLinkBelt now returns a value over 0 if success and -1 if something is not right.

* Fixed bug where if error we would not exit

Fixed bug where if error we would not exit

* changed name on canLinkBelt

Changed name to better reflect the function of the function.

* Author hype

* fixed return value info

fixed return value info

* fix header

* Fix ammo count hidden in UAVs (#5222)

* Fix ammo count hidden in UAVs

* Switch to ace_reload condition

* Add arsenal zeus modules (#4576)

* Add zeus arsenal modules

* Add french strings to arsenal modules

* Fix typo in french string

* Make changes to fit review

* locality check, use showMessage, set categroy

* Cargo load menu overhaul (#4871)

* Add submenu with vehicles to cargo load menu

* replace private ARRAY with keyword

* fix ace function macro using

* filter vehicles without cargo

* add Load condition, clean params, fix param reusing

* replace nearEntities with nearestObjects, add macro

* optimize, del magic, replace count with forEach

* del unused functions

* del useless _this parameter

* Cleanup aircraft (#5197)

* Refuel - Add setting for hose length (#5224)

* Remove unit from laser pointer list if laser removed (#5190)

* Handle escape menu with toggle iteractMenu (#5144)

* Handle escape menu with toggle iteractMenu

* Work on non-cursor menu

* Close cursor menu if open when switching

* Update fnc_handleEscapeMenu.sqf

* French translation missing (#5217)

* French translation for the two last entries

* French translation for the last entrie

* French Translation for the first entrie

* correct the spelling error

* Lower minimum speed limiter speed to 5 km/h (#5065)

* Update fnc_speedLimiter.sqf

* No minimum speed needed anymore

Minimum speed limit of 10 km/h was needed in the past due to engine limitations. Multiple user tests have shown that the minimum speed is not needed anymore. The new minimum of 0 km/h allows for example setting walking speed for vehicles (<10 km/h).

* Change minimum required speed for speed limiter to 3 km/h

To avoid problems with negative speeds (driving backwards) and zero speed, the current change switches from 10 km/h minimum speed to 3 km/h minimum speed. This seems to be the optimal solution to allow all relevant speeds including walking speed.

* Changed minimum required speed to 5 km/h

Officially the minimum required speed is 10 km/h in the master. Lower minimum needed to set car speed to walking speed of accompanying soldiers. Problems have been reported with 3 kmh/ using cars like ATVs.  Thus the new commit is set to 5 km/h minimum speed. Not tested with ATVs yet.

* 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

* Fix zeus interaction locality (#5214)

- The `setUnitPos`, `setFormation`, `setSpeedMode` and `setBehaviour` commands require local arguments
- The waypoint equivalents require server execution
- Add conditions to only show interactions when the appropriate things are selected

* Add cargo eden attributes (#4780)

- Add a ace_cargo_space attribute to vehicles to alter how much cargo they can carry.
- Add an ace_cargo_size attribute to objects to alter how much cargo space they consume.
- Add two public functions `fnc_setSize.sqf` and `fnc_setSpace.sqf` to update the cargo size/space respectively of any given object.
- Deprecate cargo makeLoadable module and public function.
- Added some macros to get the space/size of a config, making code more readable in places.

* Fix IVs not showing in patient display (#5230)

Fix #5192 for 3.10

* Remove submuntion ammo changes to A-10 (#5231)

* Remove changes to Aircraft cannons

* keep ammo changes, i guess

* Fix zeus RC units using player damage treshold (#5219)

* Fix zeus RC units using player damage treshold

Closes #5218

* add pabstmirrors suggestion

use gvar

* Implement new cook off SFX (#5179)

* Implement new cook off SFX with variants
* Add hybrid V to authors

* Open glass and CUP doors (#5226)

* Fixed glassdoor

Fixed so glassdoor now works with ace slow open.

* Made it more pretty with new file

Made it more pretty with new file

* Tidy up a bit

* Removed white space

* Replace tabs with spaces

Replace tabs with spaces

* Simplified and added comments

* Changes + was stupid was commit

Changes to go with code guidlines and extra check if door is empty

* Tabs to spaces

* Small fixes + Fixed so CUP houses now works

Fixed so CUP houses now works

* Remove todo

* Fixed requested changes

* Removed whitespaces

* 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

* 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

* 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

* [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]

* [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]

* [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]

* Fix spectator icons and camera jitter (#5067)

* Use `Visual` commands for icons and external camera position

* Fix accidental numerical change (#5235)

* Fix being unable to throw last mag (#5242)

* Italian Translation Update (#5243)

Added Italian translation for:
-cargo
-hellfire
-nlaw
-quickmount
-refuel
-zeus

* Cleanup unused hellfire vic stringtable (#5245)

* Fix weapon select grenade count wehn using advThrow (#5244)

* 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

* Added more info about indentations, tabs and EditorConfig (#5249)

* Added more info about indentations, tabs and EditorConfig

* Fixed original misspelling "Every"

* Added Pylon weapon as a valid weapon (#5250)

* Disable dragging on big AA Turrets (#5251)

* note required PboProject version (#5256)

* note required PboProject version

* Update setting-up-the-development-environment.md

* Conform function headers to coding guidelines (#5255)

* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team

* 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

* Fix minor debug that got left in (#5260)

* 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"

* 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

* Fix some event names on wiki (#5254)

* Fix some event names on wiki

* Switch callable events to functions

* 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

* Update kestrel4500.md (#5228)

* Add repair feature to wiki (#5247)

* Add repair feature to wiki

* Add blank lines, use adv engineer

* Add repair framework page

* 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

* Use getUnitTrait for medics, engineers and EOD (#5246)

* Increase required CBA version to 3.3.1

* Prepare version 3.10.0

* Update cargo docs with new public functions (#5266)

* Update cargo docs with new public functions
* Add myself to squad.xml

* Italian translation updated and fixed (#5268)

Added newest lines for:
-Rearm
-Repair

* Update homepage version numbers #4692
[ci skip]

* 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

* Prepare release 3.10.0 (build 2)

* fix video link (#5276)

* 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

* gos ndjenahoud latitude (#5275)

* 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

* Cleanup heli pod actions (#5271)

Close #4783
- Make taru pods non loadable
- Make taru pods non draggable
- Increase interaction range for huron pods

* Make array of cargo holders dynamic (#5274)

* 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

* Fix isFeatureCameraActive (#5291)

* Fix isFeatureCameraActive (#5291)

* Prepare release 3.10.1

* Add malden to getMapData (#5297)

* Add malden to getMapData

* Merge with CWR2 malden

* Add malden to getMapData (#5297)

* Add malden to getMapData

* Merge with CWR2 malden

* Add Chinese Traditional & Simplified Localization (#5295)

Add Chinese Traditional & Simplified Localization

* compats - Fix config name for resupply vics (#5300)

* Modify JoinGroup action to show group name (#5287)

* Modify JoinGroup action to show group name

* header

* Header

* Repair - Handle depends = "0" (#5283)

* Repair - Handle depends = "0"

* quote

* Refuel - change nozzle position calc (#5279)

* Handle ace_cargo_canLoad set to scalar (#5306)

* Add XEH to ace_module (#5304)

* Changed hellfire interaction check & added N variant (#5294)

* Changed weapon check for interaction to generic ace_hellfire_enabled value

* Added November hellfire variant

* Cleanup

* +1

* Japanese translation d02dacf (#5309)

* add the Jpn translation for repair

add the Japanese translation for repair

* minor fix to Jpn translation for medical

minor fix to Jpn translation for medical

* Correct new Chinese stringtable identifiers (#5334)

* Fix the issue that SFX variants are not global  (#5335)

* Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds

to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back

* add todo for 1.74

* inherit in CfgSFX from 1 class

* fix #5324 (#5325)

* Minor update Wiki AtragMx (#5322)

* update wiki atragmx

* Add files via upload

* Fix broken fonts for map gps display (#5337)

EtelkaNarrowMediumPro broke with 1.72 hotfix

* Handle locked doors (#5345)

* Allow repairing from slingload pods (#5316)

* Add cargo space to huron containers (#5315)

* Rallypoints- Don't modify setVar if already set (#5347)
2017-07-10 01:27:29 -07:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
Glowbal
e3f96b6594 Merge branch 'master' into merge-basic-and-advanced
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
2016-06-30 11:27:51 +02:00
esteldunedain
18f09b9310 Rename events:
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo ->  ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess ->  ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
2016-06-24 10:45:13 -03:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name
add 'name' to components
2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Josuan Albin
a04dec0c63 Update french translation 2016-06-19 15:16:43 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Glowbal
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +02:00
Glowbal
fd108478fe Clean up medical menu privates 2016-06-13 12:49:35 +02:00
Glowbal
d568041838 Change medical menu to work with basic medical injury overhaul 2016-06-13 12:19:19 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
95573ee711 Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
2016-06-01 23:45:51 +02:00
jonpas
ba27c8f914 Fix WEB_URL end of line error (#3854)
* Fix WEB_URL end of line error

* Change location of quote macro

* Fix medical_menu VERSION_CONFIG error
2016-06-01 14:41:33 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update
04/30/2016
2016-04-30 00:57:24 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
System98
48d312cb8e Add german translations
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
2016-02-25 18:10:26 +01:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
Thomas Kooi
4f10d551d6 Merge pull request #2949 from gienkov/fixWoundCount
ceil number of wounds
2016-02-20 16:56:17 +01:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
74aec45921 Fix medical menu not closing on range, litter dir
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
PabstMirror
39edd205f0 Merge pull request #2942 from acemod/CzechTables
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
821ccf5726 fix medical menu stringtable name 2015-12-07 10:21:48 +01:00
bux578
af31d43567 fix german typos 2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00