Commit Graph

236 Commits

Author SHA1 Message Date
RcINS
7197be2f49
Localization - Improve Simplified Chinese (#8781)
* Improve Chinese translation

* Optional Compat SOG and Tracers Simplified Chinese

* Fix settings string not correctly localized

* Fix mode of heli minigun have no realistic name

* Fix Regex replace flaw

* fix merge

* Various improvements

* Translate CSW, fix short name not short

* Trim

* Magazines naming

* Minor tweak

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-02-14 15:57:50 -06:00
GhostIsSpooky
bd8ba24ee3
Mk6 Mortar - Add [CSW] prefix to magazines (#8780)
* add csw prefix to magazines

* Update addons/mk6mortar/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

Co-authored-by: Jo David <github@jonathandavid.de>
2022-01-19 17:35:27 -06:00
jtj5283449
4d53d9ce44
Translation - Korean v2.0 (#8768)
* Add files via upload

* Add files via upload

* Delete stringtable.xml

* Delete advanced_ballistics directory

* Add files via upload

* Add files via upload

* Add files via upload

* Normalize line endings

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-12 14:41:09 -06:00
PabstMirror
9c946727cc
General - Setting category cleanup (#8640)
* General - Setting category cleanup

- Localize ACE Uncategorized
- Add subcategories for everything in Uncategorized
- Put colors in subCategory (alphabetically last)
- Add extra info on ViewDistance settings descriptions
- Move all settings to initSettings.sqf

* Update initSettings.sqf
2021-10-30 16:42:47 -05:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
PabstMirror
efe09682cc
Add SQFC support (#8235)
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-09-03 19:08:34 -05:00
Kyle Mckay
56123591a0
Update contribution documents (#8382)
* Update code guidelines for script_component

* Update contributing documents for pull requests

- Reflect true attribution practices
- Reflect true merge process (this changed a long time ago)

* Remove listed maintainer from component readmes

We have almost never used these and serve as a source of confusion for
new contributors.
2021-08-16 20:17:56 +01:00
jonpas
f37f8bbe80
Mk6 Mortar - Fix README.md typo (#8205) 2021-04-09 13:15:40 -05:00
PabstMirror
bac47bb292
Chery pick 6868fa5600 (#8139)
Co-Authored-By: Toni Vicente <arv187@users.noreply.github.com>

Co-authored-by: Toni Vicente <arv187@users.noreply.github.com>
2021-02-26 13:28:42 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -06:00
PabstMirror
5ffcac9c88
Misc - Fix minor macro usage (#8091) 2021-02-03 17:56:18 -06:00
Gold John King
b42d6f013d
Update: Minor changes on Simplified Chinese translation. (#7829)
* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Update SC Translation for triage card

Update SC Translation for triage card

* Update Chinesesimp Translations

Update: usage for doing something in SC.
Update: Bandaging action in SC.

* Update: Unlock action for SC Translation

Update: Unlock action for SC Translation
2020-08-04 10:15:03 -05:00
Taha
35e4c2ae35
Turkish Language Update (#7690)
* Fatal

Turkish Language Update

* Update AUTHORS.txt

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Fix medical_treatment

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-05-09 12:26:27 -05:00
Taha
d8f18c685b Turkish Language Update (#7446)
* Fatal

* Fatal

* Fatal

Turkish Language Update

* Fatal

* Update AUTHORS.txt

* Fatal

Fix

* Update AUTHORS.txt

* Update

* Delete stringtable.xml

* Update stringtable.xml

* Delete stringtable.xml

* Revert "Delete stringtable.xml"

This reverts commit 704c1e838c.

* Update stringtable.xml

* Fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-16 21:14:23 -06:00
Dominik Butschek
331d47c04e Addition to Czech translation (#7319)
* czech translation up to exlosives

* The rest of czech translation

* restore some lost in merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-20 13:38:53 -06:00
PabstMirror
833fd26780
Cleanup mk6 and fix nametag strings (#7317) 2019-12-19 13:16:36 -06:00
Elgin675
bd0ecd7edf French translation (#7298)
* Cleaning and reorganizing of some stringtable files (WIP) :

- Duplicate entries have been removed, and the arrangement improved, to help future translators.
- Some ACE_Settings.hpp files have been modified because they were not up to date.
- Minor french translation correction.

* Added French translation and / or correction for :

- Weaponselect module,
- Weather module,
- Winddeflection module,
- Yardage450 module,
- Zeus module.

* Convert Tabs to Spaces

* Minor corrections ; arrangement improved for few stringtable.xml files.

* Improved French translation, and adjust fews settings.

- Nombreuses corrections mineures, en vérifiant chaque menu un à un, puis chaque
  option dans le jeu lui-même. Ca m'a permit de constater qu'il y a certaines
  absurdités, y compris en anglais, qui ont donc été retraduites dans toutes les
  langues, mais qui ne correspondent pas vraiment à l'option telle qu'implémentée.
  Par exemple, le système de réarmement dans Eden est traduit de manière très
  étrange.

- Modification du fichier "addons/overheating/ACE_Settings.hpp", afin de changer
  l'ordre du menu "ACE Surchauffe". En effet la case "activé" était tout en bas,
  aussi je l'ai mise tout en haut (comme c'est déjà le cas pour toutes les options).

- Modification du fichier "addons/finger/ACE_Settings.hpp", concernant le pointage
  du doigt ACE, afin d'y ajouter une description dans les réglages des addons.
  Il y en avait déjà une (peu utile) dans les paramètres des commandes, mais pas
  dans les options des addons, ce qui rend l'option peu explicite pour un débutant.

* Corrections mineures

* correction erreurs

* correction erreurs (nametags)

* correction erreurs et modules obsolètes (nametags)

* correction erreurs et modules obsolètes (common)

* Mise en commentaire d'éléments obsolètes

* correction key error

* Added Vdauphin suggestions :).

* French translation - Replaced "Faction" (faction) to "Camp" (side)

addons/captives/stringtable.xml
addons/switchunits/stringtable.xml
addons/zeus/stringtable.xml

* Minor correction of french Concertina_wire translation

* - (PabstMirror suggestions) Replace tabs by spaces, in addons/common/stringtable.xml
- (PabstMirror suggestions) Replace xml comments by french plain text, in addons/common/stringtable.xml

- Replace xml comments by french plain text, addons/explosives/stringtable.xml
- Replace xml comments by french plain text, addons/nametags/stringtable.xml

* Removed accented capital letters for objects in french translation :

Capital accented letters were a problem because they were not classified alphabetically.
Thus in Eden or in the arsenal, objects starting with a capital accented letter were systematically at the top of the list.

modified:   addons/chemlights/stringtable.xml
modified:   addons/huntir/stringtable.xml

* Correction of a typing error (french concertina_wire translation
2019-12-19 11:08:31 -06:00
PabstMirror
8e3fd45500
Artillery rangletables (universal) (#6853)
* Initial

* Update artillerytables.cpp

* Pass by value, remove c17 features

* Tweak accuracy

* SQF work

- improve compat with a3 mlrs with remote cam (animationSourcePhase)
- handle non [0] turrets (rhs prp)
- add config entries
- use vectorCos to fix fp error (thanks commy)

* Support per mag air friction

* tweak friction

* Integrate with mk6

* more acos fixes

* Handle invalid memPointGunOptic (CUP_BM21_Base)

* Cleanup

* cleanup/tweaks

* Update checkConfigs.sqf

* Finish cleanup of ace_mk6mortar

* Update stringtable.xml

* fix bwc for ACE_RangeTable_82mm

* Update fnc_rangeTableCanUse.sqf

* build 32dll, fix some headers

* strncpy and move testing to seperate file

* Move to sub-category

* Update for ACE_Extensions changes and add warning to ace_common

* Update stringtable.xml

* Update addons/common/functions/fnc_checkFiles.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Update stringtable.xml

* Update stringtable.xml

* test extension.yml update logical operator

* Revert "test extension.yml update logical operator"

This reverts commit b1871724ad.

* more guess and test
2019-12-17 10:14:45 -06:00
Elgin675
ec27cee1ac French translation Update / Added (#7213)
* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French MicroDAGR Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* Update French Explosives Translation Update

* Update addons/advanced_ballistics/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/cargo/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update frag/gestures/goggles/grenades/gunbag french translation

* Update hearing french translation

* Added French update translation and / or correction for :

- Frag Module
- Gestures Module
- Goggles Module
- Grenades Module
- Gunbag Module
- Hearing Module
- Hellfire Module
- Hitreactions Module
- Hot Module
- Interact_Menu Module
- Interaction Module
- Inventory Module
- Laser Module
- Laserpointer Module
- Magazinerepack Module
- Map Module
- Map_gesture Module
- Maptools Module
- Markers Module
- Maverick Module

* Added French update translation and / or correction for :

- Interaction Module
- Medical Module
- Medical_damage Module
- Medical_feedback Module
- Medical_gui Module
- Medical_statemachine Module
- Medical_treatment Module
- Microdagr Module

* Added French update translation and / or correction for :

- Missileguidance Module
- Missionmodules Module
- Nametags Module
- Nightvision Module
- Nlaw Module
- Noradio Module
- Optionsmenu Module

* Added French update translation and / or correction for :

- Overheating Module
- Overpressure Module
- Parachute Module
- Pylons Module
- Quickmount Module
- Rangecard Module
- Realisticnames Module
- Rearm Module
- Refuel Module
- Reload Module

* Adding French translation and correction for the Repair Module

* Correction typo mineure

* Adding French translation and / or correction for :

- Respawn Module
- Safemode Module
- Sandbag Module
- Scopes Module

* Minor corrections of the French translation for the ACE arsenal

* Minor corrections of the French translation for the Medical_treatment Module

* Correction de quelques anomalies dans les options ACE pour Eden.

Remplacement de la mention "Est infirmier" par "Qualification médicale", dans les options ACE de l'éditeur de mission.
En effet, il n'y a pas (plus ?) de case à cocher, mais un menu "direct", avec les choix "Par défaut/Aucune/Infirmier/Médecin.
Cela est donc bien plus approprié ;).

De même pour la mention "Est ingénieur", remplacée par "Qualification technique", là aussi bien plus appropriée.

Il a également fallu que je remplace la valeur "Ingénieur avancé" par "Ing. avancé" (Adv. Engineer en anglais), pour des raisons de place : la dénomination complète déborderait de la case / serait tronquée.

* Added French translation and / or correction for :

- Slideshow Module,
- Spectator Module,
- Spottingscope Module,
- Swichunits Module,

Minor correction on Nametags Module

* Correction ponctuation

* Added French translation and / or correction for :

- Tacticalladder Module,
- Tagging Module,
- Trenches Module,
- Tripod Module.

* Added French translation and / or correction for :

- UI Module,
- Vehiclelock Module,
- Vehicles Module.

Minor correction on Tacticalladder Module

* Added French update translation and / or correction for Viewdistance Module
2019-12-07 13:48:47 -06:00
dfr1238
f77b25014f
Update /mk6mortar/stringtable.xml
translate unit on tchinese
2019-11-29 01:47:58 +08:00
EckoMoire
f98aee7a98 Portugues Language Updated 2019-09-14 15:36:28 -03:00
Brandon Danyluk
b1d5bbe450 Adds Crew Served Static Weapons (#5652)
* Initial Commit

* Got rid of unneeded translation values

* Updated Strings

* "Fixed" issue where when you deploy the tripid and weapon on slope it freaked out.

* Fixed locality issues. Added timers to relavent functions.

* Added weights to all magazines/tripod. Weights to weapons coming soon when I transfer them to the launcher slot

* Fixed bug regarding localized strings. Created new tripod model

* Added timers for deploying/picking up the tripod. Changed ammo-box model from custom to one already in ARMA. Changed gun-bag model for a more generic one. Created a texture for the tripod and gunbag

* Removed ability to disassemble weapons via the addAction. Added  ACE Action to get in due to a memory point issue. Changed from a static deploy/dismount time to one based in the weapon configs

* Created forward-compatability. Made it so I can define a base plate for any weapon if I ever want to expand from the generic M3 Tripod.

* Fixed bug where tripod wouldn't deploy with the correct times. Fixed bug where if you moved the tripod into the ground it would go flying.

* Added mortar compatability. Will probably shift whole mortar ammo loading to CSW one day

* Added icons to each relavent item

* Added README, possibly fixed bug where if you are in a weapon others cant load/unload ammo. Changed distance you can interact with weapons

* Added checks for when deploying the gun as well as unloading ammo to prevent duplication/deletion of items.

* Added documentation

* Added order to doc

* Explained why things are the way they are

* Remove temp files

* Removed redundant files

* Converted tabs->spaces. Added newlines at end of all files. Changed broken line in fnc_tripodDeploy.sqf.

* 100% newlines at end of file

* Added newlines to files that didnt get the change. Fixed README. Changed from GVAR(cswOptions) to GVAR(options). Changed from tabs to spaces in wiki

* Fixed issue with UAV assembling with enableWeaponDisassembling. Fixed bug where game would crash if you disassembled static weapon with more than 1 magazine

* Tabs->Spaces

* Added CSW options to base StaticWeapon class to allow for easier additions. Switched default mortar away from CSW system due to incompatabilities

* Lazy Evaluations and macros to describe how things work.

* Added newlines to script_component. Fix no-texture issue on tripod. "Fix" 20mm HE saying 40mm HE. Add custom icons to all weapons. Move "Check Ammo" to CSW menu

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Revert changes to fortify.md

* Updated UI Icon to Crew Served Ammo branch UI

* Added Pabst's CrewServedAmmo to handle ammo loading/unloading instead of my solution

* Fixed bug where currentWeaponTurret returned a blank string when a player hasent entered hte weapon to select the current weapon

* Re-added ammo loading time

* Tabs->Spaces

* Newline at end of files

* Removed replaced functions

* Remove redundant strings. Move ammo handling to appropiate section

* Tabs->Spaces

* Update wiki

* Updated to fix crash with default weapons and disable CSW ability on default static weapons

* Added editor attributes to enable/disable CSW at edit time

* Change how ammo is removed from the CSW. Uses math instead of iteration

* Fix bug where assembled weapon did not get rid of default actions

* Added support for multiple types of ammo in one CSW

* Add tracer magazines for .50 cal

* Fix bug where you could load ammo even if the gun couldnt take any more

* Disable debug and enable compile cache

* Changed weapon deploy/pickup time. Removed custom Titan missiles. Using ACE Dragging now. Added progress bar check for pickupTripod. Updated documentation

* Removed check if CSW is full to unload ammo

* Fix bug where items would spawn underneath other items on wepaon dismount

* Change some things

* Configure base statics, improve returnAmmo

* Add mortar baseplate

* Remove explicit inheritance

* Fix bug where unloading ammo would duplicate it if you had room in your person.

* Tab->Space

* Player couldnt pickup tripod due to legacy code

* Fix GMG_01_base_F inheritce

* Port of ACE 2 tripod + ACE 2 CSW Bag

* Move ACE 2 Data to APL folder

* Adjust weights to make them more accurate to how ARMA uses it and the real life equivalents

* Fix bug where error was thrown on esc from picking up tripod. Tripod rotated 180

* Fix bug where if you called ace_common_claim the weapon could be set to be disassembled even though it may not be wanted via CSW

* Added ability to toggle ammo handling when weaponAssembly is disabled.

* Add Proxy Weapons for all Vanilla static weapons. These serve as a way to allow for realistic ammo reload times without having to modify base classes if you want feautres turned off. Adjusted reload and mount times to be more "realistic"

* Fix Shadow RPT Spam

* Update wiki

* Change order of setDir and setPos

* Change all setDir/setPos orientations. Remove redundant check. Ensure that weapon locked state reflects it with the "getIn" command. Add a way to pass in a specific classname for the weapon assemble type. Add a callback function onDisassemble if user wants to set the state of the new tripod using the old weapon as a reference

* Actually check for the carryWeaponClassname in the deployWeapon check

* Ai Compatiblity

* Add stringtable entries

* Formatting fixes

* Stringtables for settings, fix setMagazineTurretAmmo

* inherit ammo for mags, reorder stringtable

displays correct ammo and descriptionShort

* don't require ace_javelin

* Tweaks, cleanup, localzation, ace_reload changes

change weapon tag to [CSW]
tweak localization strings
minor cleanup
simplify some ace_reload funcs

* delete moved dev func

* Hopefully fix issue where to-be deleted tripod intersects with newly created weapon and vice versa. Remove PBOPREFIX newline

* cleanup/proxyWeapon/mk6 compat
2019-06-07 23:47:39 -05:00
barman75
d684a8042e Russian translations (#7005)
* Russian translation is done

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration, still WIP

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration 2, still WIP, sorry

Co-Authored-By: Dystopian <sddex@ya.ru>

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

small fixes

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* /arsenal and /captives resolve

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor changes in /scopes, almost done

Co-Authored-By: Dystopian <sddex@ya.ru>

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
2019-06-03 09:59:13 -05:00
classic
c37b7644af Update Japanese translation (#6838)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
2019-02-28 13:36:34 -06:00
Jakub Ochalski
91182482db Polish Translation (#6730)
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
PabstMirror
c9ee0995c3
mk6mortar - Tweak charge UI for 1.86 (#6718) 2018-12-06 13:37:44 -06:00
PabstMirror
e3421cbf8f
Arsenal - Add config to force show (mortars) (#6694)
* Arsenal - Add config to force show (mortars)

* Update CfgMagazines.hpp

* Update arsenal-framework.md
2018-11-18 23:04:50 -06:00
jonpas
0745e249fc Merge branch 'master' into armake 2018-11-14 18:32:47 +01:00
Josuan Albin
4d5f2d0de2 French translation (#6644)
* Add french strings for advanced fatigue, finger and rearm

* Add french strings for rearm, fix some of the old ones

* Add missing strings for ACE Nightvision

* Add missing strings for ACE Pylons

* Add missing string for ACE mk6 mortar

* Add / Fix french strings in ACE CookOff

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/pylons/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>
2018-10-27 15:10:45 -05:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
mharis001
803d497d8a Improve checking of unit items (#6350)
* Add uniqueItems function

* Optimize dogtag children actions function

* Optimize getDetonators item search

* Store CfgWeapons lookup in getDetonators

* Update items to use new function

* Update items to use new function 2

* More optimization of uniqueItems function

* Update items to use new function 3
2018-09-17 14:03:28 -05:00
Thomas Kooi
21eb5e3df6
Merge branch 'master' into armake 2018-08-02 21:49:35 +02:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
shukari
bdc58441f4 Fixed mortar double loading (#6240)
* block double loading

* prevent double loading

* block double loading

* use nil

* use nil

* fix some wrong variables

* not needed here

* unload only one person

* prevent duping

* wrong makro

* wrong makro

* wrong macros

* wrong macros
2018-05-30 16:45:31 -05:00
jonpas
2ac412a406 Merge branch 'master' into armake 2018-02-06 14:34:07 +01:00
classic
504d54461e Update Japanese translations (#5831)
* Update Japanese translation for captives

* Update Jpn translation for common

* Update Jpn translation for cookoff

* Update Jpn translation for finger

* Update Jpn translation for googles

* Update Jpn translation for hitreactions

* Update Jpn translation for interaction

* Update Jpn translation for magazinerepack

* Update Jpn translation for mk6mortar

* Update Jpn translation for noradio

* Update Jpn translation for overheating

* Update Jpn translation for pylons

* Update Jpn translation for rearm

* Update Jpn translation for respawn

* Update Jpn translation for scopes

* Update Jpn translation for spectator

* Update Jpn translation for switchunits

* Update Jpn translation for vehiclelock

* Update Jpn translation for weaponselect

* Update Jpn translation for weather

* Update Jpn translation for zeus

* Update Jpn translation for reloadlaunchers

* fix the tag
2017-11-30 16:52:27 -06:00
God of Monkeys
257bde4eef Update Chinese stringtable (#5786) 2017-11-17 10:18:54 -06:00
Andrea Verano
4d24840181 Italian Translation Update (#5779)
Added new strings in:
-captives
-common
-cookoff
-finger
-goggles
-hitreactions
-interaction
-magazinerepack
-mk6mortar
-noradio
-overheating
-rearm
-respawn
-scopes
-spectator
-switchunits
-vehiclelock
-weather
-zeus

Fixed some strings in:
-goggles
-magazinerepack
-nightvision
-sandbag
-switchunits
-trenches
-vehiclelock
-weather
2017-11-16 23:35:49 -06:00
ulteq
9d383d5add
Settings - Added more categories (#5771) 2017-11-15 20:10:20 +01:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
ulteq
dcc934202b
Weather - Major Cleanup (#5710)
* Single global on/off switch (that really turns everything off properly)
* Less coupling between code that runs on the client / server
* Simpler update routines
* More cohesive code
* Less module options
* Less network traffic
2017-11-10 15:44:15 +01:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
KoffeinFlummi
fa02d0d993 Merge tag 'v3.10.2' into armake 2017-09-19 02:13:24 +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
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375)
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
2017-07-19 20:57:20 +02:00
jonpas
fa3743ca54 Correct new Chinese stringtable identifiers (#5334) 2017-07-10 16:47:26 +02:00