Commit Graph

411 Commits

Author SHA1 Message Date
PabstMirror
6485898199 Merge branch 'master' into pr/8215 2024-04-11 22:06:18 -05:00
johnb432
dce7da60c9
General - Change count to isEqualTo where appropriate (#9921)
count -> isEqualTo
2024-04-06 11:57:08 -07:00
PabstMirror
b5d0ae600a Merge branch 'master' into pr/8215 2024-03-28 14:45:59 -05:00
johnb432
415d2f685c
General - Change FUNC to LINKFUNC where appropriate (#9882)
FUNC -> LINKFUNC
2024-03-28 13:57:23 -05:00
johnb432
512ceaa1a1
Missile Guidance - Rename preInit and postInit files (#9881)
Renamed preInit and postInit files
2024-03-27 22:37:36 -05:00
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
PabstMirror
4197a6e977 Merge branch 'master' into pr/8215 2024-01-06 18:59:24 -06:00
Fabio Schick
d70fbd5765
Translations - Complete Italian + almost complete German translation (#9673)
* medical_gui italian translations

* csw italian translations

* interact_menu italian translations

* switchunits italian translations

* trenches italian translations

* parachute italian translations

* vehicles italian translations

* viewdistance italian translations

* common italian translations

* magazinerepack italian translations

* vehiclelock italian translations

* overpressure italian translations

* ui italian translations

* medical_treatment italian translations

* medical_treatment german translations

* nametags italian translations

* overheating italian translations

* viewrestriction italian translations

* grenades italian translations

* ai italian translations

* aircraft italian translations

* arsenal italian translations

* arsenal german translations

* hellfire italian translations

* reload italian translations

* nightvision italian translations

* medical_damage italian translations

* towing italian translations

* fortify italian translations

* finger italian translations

* dragging italian translations

* viewports italian translations

* explosives italian translations

* killtracker italian translations

* killtracker german correction

* gforces italian translations

* noradio italian translations

* reloadlaunchers italian translations

* cargo italian translations

* medical_engine italian translations

* field_rations italian translations

* maverick italian translations

* slideshow italian translations

* medical_ai italian translations

* advanced_fatigue italian translations

* marker_flags italian translations

* tagging italian translations

* fastroping italian translations

* markers italian translations

* medical_statemachine italian translations

* microdagr italian translations

* novehicleclanlogo italian translations

* realisticnames italian translations

* irlight italian translations

* laser italian translations

* ballistics italian translations

* interaction italian translations

* medical_status italian translations

* medical_feedback italian translations

* medical italian translations

* map_gestures italian translations

* casings italian translations

* logistics_rope italian translations

* repair italian translations

* fieldmanual italian translations

* refuel italian translations

* refuel german translations

* intelitems italian translations

* gunbag italian translations

* fire italian translations

* cookoff italian translations

* smallarms italian translations

* zeus italian translations

* zeus german translations

* vehicle_damage italian translations

* advanced_ballistics italian translations

* advanced_throwing italian translations

* artillerytables italian translations

* captives italian translations

* chemlights italian translations

* compat_sog italian translations

* compat_rhs_usf3 italian translations

* compat_ws italian translations

* compat_ws german translations

* concertina_wire italian translations

* dogtags italian translations

* dragon italian translations

* fcs italian translations

* flashlights italian translations

* flashsuppressors italian translations

* frag italian translations

* gestures italian translations

* hitreactions italian translations

* hot italian translations

* huntir italian translations

* kestrel4500 italian translations

* laserpointer italian translations

* logistics_uavbattery italian translations

* logistics_wirecutter italian translations

* main italian translations

* map italian translations

* maptools italian translations

* medical_blood italian translations

* missileguidance italian translations

* missionmodules italian translations

* mk6mortar italian translations

* nlaw italian translations

* optionsmenu italian translations

* pylons italian translations

* quickmount italian translations

* rearm italian translations

* respawn italian translations

* sandbag italian translations

* scopes italian translations

* spectator italian translations

* spectator german translations

* tripod italian translations

* volume italian translations

* weaponselect italian translations

* weather italian translations

* winddeflection italian translations

* dagr italian translations

* headless italian translations

* hearing italian translations

* towing italian translations

* yardage450 italian translations

* Grammar Suggestion

* Fix Error from merge conflict resolution
2023-12-11 19:31:02 -06:00
Apricot
aa48e87323
Translations - Improve and overhaul Japanese localization. (#9657)
* More Japanese

* bit tweak

* cargo missing

* little bit better wording

* update medicaly

* more medical

* Grenade Things and more

* common and csw

* minor tweaks

* even more tweaks

* I want this to be the final update

* overhaul not over yet

* Finaly finaly it's over. maybe.

* zeus med module update addition

* range things

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* progress bar

* revert and feedbackicon

feedback is still used??? i can't check that

* Captive fix and Specialist things

* Training level required

* time things

* Zeus_ModuleUnloadFromCargo

* error fix

* revert field manual cause conflict with portuguese

* reattempt field manual

* advanced wording

* magazine name and chemlight name

* space

* I forgot change that

* Jam and cookoff meaning

* space is important

* Pointing
2023-12-01 17:50:58 -06:00
PabstMirror
b5bae13ab7 Update to new include paths 2023-10-06 19:45:05 -05:00
PabstMirror
477bdd0184 Merge branch 'master' into pr/8215 2023-10-06 19:41:13 -05:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
PabstMirror
10065f76b4 Update fnc_seekerType_SACLOS.sqf 2023-09-10 12:00:33 -05:00
PabstMirror
6e6d24a680 fix header 2023-09-09 11:30:39 -05:00
PabstMirror
2c0a7209bf Merge branch 'master' into pr/8215 2023-09-09 11:24:44 -05:00
Apricot
c1c1433c44
Translations - Improve and Add Japanese (#9357)
* update japanese

* full-width to half-width

* more tweak
2023-08-31 11:24:35 -05:00
Bailey Danyluk
ef23310aec
Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
Bailey
3af57174d6 fix NLAW overfly 2023-01-31 14:12:34 -07:00
Bailey
0957a3356f Change configs to enclose strings for calculations 2023-01-20 18:55:00 -07:00
PabstMirror
16dee0a280 Merge branch 'master' into pr/8215 2023-01-19 22:35:23 -06:00
PabstMirror
4eef2da0fe
Missile Guidance - Use weaponsInfo to optimize fire-mode selection (#8879) 2022-08-29 09:33:58 +01: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
Bailey Danyluk
bcd753f0d5 Change name 2022-06-02 20:36:46 -06:00
Bailey Danyluk
5a55d2d257 Add ability to disable iron dome (disabled by default) 2022-06-02 20:11:35 -06:00
Bailey Danyluk
0b7c89af50 better debug info 2022-06-02 19:30:28 -06:00
Bailey Danyluk
e46cd2c97b add better error messaging 2022-06-02 19:26:00 -06:00
PabstMirror
2041c88cee Merge branch 'master' into pr/8215 2022-05-24 12:00:12 -05:00
Bailey Danyluk
d944f09a85 Merge branch 'missileDynamics' of github.com:TheCandianVendingMachine/ACE3 into missileDynamics 2022-05-14 14:11:04 -06:00
Bailey Danyluk
67fe609897 tweak javelin to make minimum ranges more realistic 2022-05-14 14:10:57 -06:00
Psycool
61f74831a1
Korean Translation 100% done (#8899)
* Korean Translation 100% done

fixed typos, changing the Korean transliteration of proper nouns, and changing the meaning of the original to a more understandable interpretation without compromising the transmission of the original

* Something Edited

edit incorrect translation and add typo correction
2022-05-09 20:28:28 -05:00
PabstMirror
76bb679acf Merge branch 'master' into pr/8215 2022-04-15 22:25:18 -05:00
Bailey Danyluk
f79dde58a4 remove debug sets 2022-04-04 18:49:01 -06:00
Bailey Danyluk
71e01a2ee4 Update all Line guidance missiles 2022-04-04 18:46:40 -06:00
Bailey Danyluk
f9241fe595 Remove debug sets 2022-02-16 14:16:14 -07:00
Bailey Danyluk
56c85fc6ea Tweak IR seeker. Fix MCLOS fired from vehicles 2022-02-15 17:06:20 -07: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
Brandon Danyluk
20ad6283b7 more SACLOS tweaks 2022-01-01 21:28:54 -07:00
Brandon Danyluk
5b4e29a796 Merge branch 'missileDynamics' of github.com:TheCandianVendingMachine/ACE3 into missileDynamics 2022-01-01 19:11:39 -07:00
Brandon Danyluk
f9ea835c59 add spike ATGM 2021-12-11 20:55:03 -07:00
PabstMirror
b40903b16a Merge branch 'master' into pr/8215 2021-11-12 19:55:11 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
Brandon Danyluk
d8ebc35359 improve lin navigation 2021-10-16 22:45:39 -06:00
Brandon Danyluk
34c7b57532 add dev function to get ammo which has MG class data 2021-10-15 22:34:45 -06:00
Brandon Danyluk
9a2d6313b0 make pronav use the correct units 2021-10-15 22:02:26 -06:00
Brandon Danyluk
120d16cd0d small changes 2021-10-15 21:35:25 -06:00
Brandon Danyluk
959564023e Merge remote-tracking branch 'ACERemote/master' into missileDynamics
# Conflicts:
#	addons/maverick/CfgAmmo.hpp
#	addons/maverick/CfgMagazines.hpp
#	addons/maverick/CfgWeapons.hpp
2021-10-15 20:59:28 -06: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
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