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
14,574 Commits 73 Branches 88 Tags 752 MiB
11984f6dcb
Commit Graph

69 Commits

Author SHA1 Message Date
GhostIsSpooky
4943b2119d
CSW - Fix loading with ammo from vehicle cargo (#8995) 
Co-authored-by: GhostIsSpooky <LinkIsParking@hotmail.com>
 2022-08-14 17:09:01 +01:00
RcINS
904310c99a
Translation - Add Simplified Chinese translation (#8984) 
* Complete Simplified Chinese translation

* Slight tweak translation
 2022-07-30 18:08:44 -05:00
Psycool
57893f311d
KoreanTranslation (#8937) 
Someone has returned all the translations in Korean to English. there is no need to return them.
 2022-06-21 13:35:06 -05:00
Krzyciu
cce1700f9c
Translations - Add Missing Polish (#8921) 
* Translations - Add Missing Polish

When merged this pull request will:

- Add missing Polish Translations

* Missing space

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-28 12:30:28 -05:00
Apricot
74e49d1f5a
Translations - Add and Improve Missing Japanese (#8924) 
* Japanese Translation Update

Fill missing Japanese translation and Weird translation fixes made long ago.

* Remove Corner Bracket and change it to apostrophe

* Update STR_ACE_Common_unloadWeapon

* Update SunflowerSeeds Description
 2022-05-27 14:06:51 -05:00
Dystopian
89badcc71f
CSW - Fix missing magazine on assembling (#8880) 
* Fix missing magazine on assembling

* Fix adding mag when csw is empty

* Fix missing magazine when player has launcher
 2022-05-04 17:28:58 -05:00
Dystopian
54c13c5f42
Move carry mag getting code to function (#8888) 2022-05-02 18:54:04 -05:00
Wakbub
dd07b0fa30
Fix Error Type String, expected Array (#8871) 
Pass an array instead of a string to insert.
 2022-04-09 13:50:47 -05:00
Nilia119
3b79693717
Added Missing German Translation (#8870) 
- Added Missing Translation in CSW
- Added Missing Translation in field_radio
- Added Missing Translation in finger
- Added Missing Translation in noradio
- Added Missing Translation in overpressure
 2022-04-09 13:49:26 -05:00
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795) 
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* optimize condition

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* capitalization

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* use object in getVehicleIcon

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* remove extra brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add missing brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment pt2

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-08 21:41:21 -06:00
GhostIsSpooky
a4ae61f1fc
CSW - Add reloading from nearSupplies (#8776) 
* allow players to reload from nearSupplies

* limit reloading to friendly sides

* add handling for ai getting inside empty weapon

* configOf for lookup

* add getin handler, hammer out remaining bugs

* configOf lookup

* improve friendly/object filter

* more configOf lookups

* Capitalize settings, add ammo storage setting

* remove systemChat

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* fix TRACE

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-07 12:29:19 -06:00
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
Bailey Danyluk
7958f1dd9b
change name (#8805) 2022-01-30 11:54:30 -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
mihuan-0
ce6e0d48a1
Translations - Add missing Simplified Chinese translation and change a few existing ones (#8731) 
* Add files via upload

* Delete stringtable.xml

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-12-18 17:13:43 -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
Nilia119
d86ddb41d6
Translations - Add Missing German (#8592) 
* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Update addons/arsenal/stringtable.xml

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

* Update addons/ballistics/stringtable.xml

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

* Update addons/ballistics/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/common/stringtable.xml

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

* Update addons/common/stringtable.xml

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

* Update addons/common/stringtable.xml

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

* Update addons/ui/stringtable.xml

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

* Update addons/vehicle_damage/stringtable.xml

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

* Update addons/vehicle_damage/stringtable.xml

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

* Update addons/vehiclelock/stringtable.xml

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

* Update addons/common/stringtable.xml

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

* Update addons/cookoff/stringtable.xml

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

* Update addons/cookoff/stringtable.xml

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

* Update addons/explosives/stringtable.xml

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

* Update addons/explosives/stringtable.xml

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

* Update addons/field_rations/stringtable.xml

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

* Update addons/field_rations/stringtable.xml

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

* Update addons/field_rations/stringtable.xml

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

* Update addons/fire/stringtable.xml

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

* Update addons/field_rations/stringtable.xml

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

* Update addons/fortify/stringtable.xml

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

* Update addons/gforces/stringtable.xml

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

* Update addons/grenades/stringtable.xml

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

* Update addons/gunbag/stringtable.xml

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

* Update addons/hellfire/stringtable.xml

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

* Update addons/hellfire/stringtable.xml

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

* Update addons/interact_menu/stringtable.xml

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

* Update addons/interaction/stringtable.xml

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

* Update addons/magazinerepack/stringtable.xml

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

* Update addons/map_gestures/stringtable.xml

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

* Update addons/map_gestures/stringtable.xml

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

* Update addons/map_gestures/stringtable.xml

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

* Update addons/map_gestures/stringtable.xml

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

* Update addons/map_gestures/stringtable.xml

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

* Update addons/map_gestures/stringtable.xml

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

* Update addons/markers/stringtable.xml

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

* Update addons/markers/stringtable.xml

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

* Update addons/markers/stringtable.xml

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

* Update addons/markers/stringtable.xml

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

* Update addons/markers/stringtable.xml

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

* Update addons/medical_damage/stringtable.xml

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

* Update addons/medical_damage/stringtable.xml

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

* Update addons/medical_engine/stringtable.xml

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

* Update addons/medical_engine/stringtable.xml

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

* Update addons/medical_feedback/stringtable.xml

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

* Update stringtable.xml

* Update addons/medical/stringtable.xml

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

* Apply suggestions from code review

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

* Update stringtable.xml

* Update addons/explosives/stringtable.xml

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

* Update addons/gforces/stringtable.xml

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

* Update addons/medical/stringtable.xml

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

* Update addons/medical_engine/stringtable.xml

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

Co-authored-by: Jo David <github@jonathandavid.de>
 2021-10-28 00:10:19 -05:00
Björn Dahlgren
b12af1e0b5
General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
PabstMirror
93b7722716
General - Cleanup CfgPatches unit/weapon arrays (#8524) 
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box

* Update config.cpp
 2021-10-15 13:48:33 -05:00
PabstMirror
916346ae59
General - Format config class defines to coding guidelines (+tool) (#8520) 
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

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

* Update tools/config_style_checker.py

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

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-15 13:47:05 -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
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468) 
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
 2021-10-10 18:55:14 +02:00
Salluci
a4f24cbe3d
CSW - Fix AI reloading from GroundWeaponHolder (#8399) 
* fix fnc_ai_handleFired

* remove debug messages

* use banana instead of FakePrimaryWeapon

* switch from dummy item to new weaponholder

* use exitWith instead of break
 2021-09-25 10:39:03 -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
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
Dystopian
b151148542
Replace canAdd with CBA_fnc_canAddItem (#8012) 2021-02-27 10:26:12 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00
PabstMirror
cb870693fd
CSW - use preferred XEH format (#8112) 2021-02-13 15:37:26 -06:00
Taha
e53bc23ebf
Turkish Language Update (#7909) 
Added missing translation to Turkish
 2020-10-04 10:57:46 -05:00
classic
49c84e2ce1
Update Japanese translation (#7880) 2020-08-28 10:30:32 -05:00
Hubert Stefanski
fe8d2e900b
Translations - fix Polish punctuation (#7776) 
* fix punctuation

* minor change to lower-case
 2020-06-23 09:11:22 -05:00
Smith
7a8a17b924
Add Russian translation (#7742) 
* Russian translation

* Update AUTHORS.txt

* CSW Fix Russian translation

* Fix RU translation mistakes

* Small fixes RU translation
 2020-05-31 16:04:21 -05:00
Abogado
19523f028a
Crew served weapons - Add spanish translations (#7728) 
* Update stringtable.xml

-Added spanish translations
-Minor corrections
-"Armas de manejo colectivo" could be more appropriate.
https://www.linguee.co/ingles-espanol/traduccion/crew-served+weapons.html
https://www.defensa.com/en-abierto/armamento-ligero-colectivo-pesado-infanteria-marina-espanola-20

* Update addons/csw/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:36:58 +02: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
Elgin675
9286d9727e
Translations - Add French CSW StaticM2ShieldBag key (#7696) 2020-05-09 12:21:31 -05:00
Dominik Butschek
7a7485e016
Translations - Add missing Czech translation strings (#7683) 
* add missing Czech translation strings

* improve ClearTraumaAfterBandage translation
 2020-05-06 17:33:44 -05:00
PabstMirror
58bc4b7ed8
CSW - Add configs for 1.98's M2 Turret (#7619) 2020-04-30 11:40:57 -05:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
Vdauphin
82d7980ada
CSW - Add event when deploy weapon succeded (#7635) 2020-04-14 09:34:34 -05:00
PabstMirror
fafc597321
CSW - Update 3den config for 1.98 changes (#7335) 2020-04-14 09:33:25 -05:00
PabstMirror
82116bd98b
CSW - Check carry mag exists (#7587) 
Fix #7579
 2020-03-11 18:42:21 -05:00
jonpas
c42a004ab3
General - Fix preprocessor issues (#7563) 
* Fix preprocessor issues

* Fix more preprocessor issues
 2020-02-29 16:09:31 -06:00
Elgin675
d63c7685b4
Update French Translations (#7440) 2020-02-22 22:15:28 +01:00
padddyyy
056560e798
Update German Translations (#7469) 2020-02-22 21:53:35 +01:00
Whigital
7e91ffc7a2 Update CSW author fields and remove inherited properties on ace_csw_staticAACarry 2020-01-31 18:31:48 +01:00
Whigital
62a7db5c43 Remove CSW mag defs 2020-01-30 23:21:30 +01:00
Whigital
93173d43b2 Add magazines to carryable statics 2020-01-30 23:17:15 +01:00