171 Commits

Author	SHA1	Message	Date
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	827718f748	Magazine Repack - Categorizaton and stringtable overhaul (#5770)	2017-11-14 14:41:14 +01:00
jonpas	711e1fc026	Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521) ... * Fix Magazine Repack underwater - fix #5513 Also prevent common goKneeling function underwater * Fix loading patients underwater - fix #5515 * Fix load object underwater * Fix take nozzle on jerry can underwater * Fix refuel underwater conditions further * Use isTouchingGround, Make refuel semi-compatible reports false if head is out of the water, we want true even if we are not diving * Less interact exceptions duplication * Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround * Fix condition * Support dragging underwater No carrying due to animation timing issues and other misc things * Allow Medical Legs SelfActions underwater * Fix fixPosition function underwater (use getPosATL instead of getPos) * Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well	2017-10-01 13:38:11 -05:00
classic	9dfc76b6d5	Update the Japanese translation (#5565) ... * Update the Jpn translation following to official localization. * Update the Jpn translation fix for miss translation * Update the Jpn translation added more natural words and fix miss translation. * Update the Jpn translation fixed for miss translation. * Update the Jpn translation just tweaks * Update the Jpn translation added to new entry. fixed or tweaked to few entry. * Update the Jpn translation added the jpn translation to new entry * Update the Jpn translation Added the Jpn translation to new entry. * Update the Jpn translation tweak to jpn translation * Update the Jpn translation following to official Japanese localization * Update the Jpn translation support to new entrys and few fix * Update the Jpn translation just tweaks to few entrys	2017-09-28 16:04:24 +02:00
shukari	a783e6319f	magazinerepack stringtable fix #5390 (#5392) ... * fix #5390 stringtable optimization * Dont use the same wort twice - magazinerepack stringtable * [magazinerepack] get bulletsLeft in last partial mag as optional param * [magrepack] remove unused entries * [magrepack] entry is needed for interrupt event * [magrepack] finish msg successful -> full mags + left rounds Interrupted -> full mags + partial mags * [magrepack] final translation change * space fix	2017-09-21 20:42:01 +02:00
Ozan Eğitmen	90f92db01d	Replace UI icons with vanilla/common ones (#5532) ... Also removes some _very_ old paa files that belong to AGM/CSE	2017-09-21 16:22:28 +02:00
jonpas	e11e102a76	Underwater actions support (#4984) ... * Enable majority of actions underwater * Remove log * Add logistics_wirecutter support (don't play kneel animations underwater - looks silly) * Don't perform kneel animations when repairing or medicaling underwater * Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles) * Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define * Remove left-over systemChat * Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS	2017-08-22 13:30:56 -05:00
jonpas	5cf7569711	Correct new Chinese stringtable identifiers (#5334)	2017-07-08 09:48:39 -05:00
GodofMonkeys	60131ee589	Add Chinese Traditional & Simplified Localization (#5295) ... Add Chinese Traditional & Simplified Localization	2017-06-22 16:46:00 +02:00
Phyma	ffaa195fe5	Conform function headers to coding guidelines (#5255) ... * Fixed headers to work with silentspike python script * Fixed rest of the files * Fixed ace-team	2017-06-08 15:31:51 +02:00
PabstMirror	00b91bed45	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	2017-05-31 22:09:36 +01:00
PabstMirror	bfd3695868	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	2017-05-14 14:48:05 -05:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794) ... * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
PabstMirror	a3c50a6c76	Add dev macro to quickly recompile functions (#4699)	2016-11-23 13:35:25 -06:00
commy2	05d30c5573	convert log macros to cba versions (#4282) ... * convert log macros to cba versions * Add changes to AB * remove obsolete macro	2016-10-02 12:55:31 +02:00
classicarma	ef6ea019c9	translate magazinerepack	2016-09-28 01:14:15 +09: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
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
commy2	c481ddedaf	add 'name' to components	2016-06-19 09:38:39 +02:00
Josuan Albin	7c9dcf6bdb	Merge branch 'pr/3480' ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/cargo/stringtable.xml addons/flashlights/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/main/stringtable.xml addons/map/stringtable.xml	2016-06-18 16:26:46 +02:00
jonpas	03e923aa68	Cleanup Function Headers titles	2016-06-18 11:50:41 +02:00
jonpas	8ff4a2ecaf	Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style)	2016-06-04 20:40:55 +02: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	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	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
Ozan Eğitmen	b8abec0c61	Fix Capitalization of ACE Settings classes. (#3627)	2016-05-07 22:14:56 +02:00
jonpas	85b4366368	Use new QPATHTOF and QPATHTOEF macros	2016-04-08 20:34:50 +02:00
Alessandro Foresi	e97c7c0f65	Translation: IT completed (with BOM)	2016-03-27 21:22:15 +02:00
NorXAengell	772c4cc100	Another batch of translations and corrections (Fr)	2016-03-01 02:27:19 +01:00
bux578	aa8d3a3fd0	Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis ... Unified ellipsis	2016-02-23 08:27:28 +01:00
BaerMitUmlaut	74ea79e2cc	Unified ellipsis	2016-02-22 23:51:47 +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
PabstMirror	ed653456e5	Merge pull request #3338 from acemod/translations156merge ... Fix Merge Conflicts on More Italian Translations	2016-02-19 15:09:40 -06:00
PabstMirror	dccc1d33fd	Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge	2016-02-17 12:30:03 -06:00
licht-im-Norden87	a725553a95	commy2	2016-02-10 17:11:24 +01:00
licht-im-Norden87	ed1047e199	magazine repack	2016-02-10 16:26:03 +01: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
commy2	a8228f60c2	fix configFile capitalization	2015-11-30 17:23:02 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
Alessandro Foresi	6cb902a7ab	Changed: IT riempi instead of ricarica	2015-09-12 22:00:41 +02:00
Glowbal	f0792233ae	Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack ... Code Cleanup Magazine Repack Module	2015-08-21 14:09:55 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
jokoho48	4478be096e	Code Cleanup Magazine Repack Module.	2015-08-16 00:30:24 +02:00
jonpas	1eeca28a3d	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
jonpas	332afb2174	Allow certain self-interactions while sitting	2015-06-09 16:17:05 +02:00
jonpas	541f1010a7	Merge branch 'master' into macroSTR ... Conflicts: addons/attach/functions/fnc_attach.sqf addons/captives/functions/fnc_moduleSurrender.sqf addons/common/CfgVehicles.hpp addons/explosives/CfgModule.hpp addons/hearing/CfgVehicles.hpp addons/interaction/CfgVehicles.hpp addons/map/CfgVehicles.hpp addons/microdagr/CfgVehicles.hpp addons/mk6mortar/CfgVehicles.hpp addons/nametags/CfgVehicles.hpp addons/nightvision/functions/fnc_changeNVGBrightness.sqf addons/respawn/CfgVehicles.hpp addons/switchunits/CfgVehicles.hpp addons/vehiclelock/CfgVehicles.hpp addons/winddeflection/stringtable.xml	2015-06-02 22:14:32 +02:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
Macusercom	7eeddfbd65	German translations ... Added a lot of German translations and fixed even more typos.	2015-05-26 17:04:53 +02:00
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
SAM	31adb5a9fc	Second batch of settings files	2015-05-14 20:59:25 +02:00
PabstMirror	245a6da6f6	Merge pull request #1027 from acemod/sortForMagRepack ... Sort for mag repack	2015-05-12 21:56:12 -05:00
Alessandro Foresi	643df71932	Added: Italian translation from Blackedsoul p#20	2015-05-10 11:05:16 +02:00
Alessandro Foresi	7e7c3ed053	Added: More italian translations	2015-05-10 00:04:42 +02:00
PabstMirror	5f43cffecd	Sort for mag repack	2015-05-05 20:35:08 -05:00
KoffeinFlummi	761e23001f	Merge https://github.com/Dimaslg/ACE3 into spanish-merge ... Conflicts: addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/optionsmenu/stringtable.xml	2015-05-01 16:51:20 +02:00
Dimaslg	f8d5c423ae	Merge conflicts resolved	2015-04-29 21:15:22 +02:00
KoffeinFlummi	a1e709047e	Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: AUTHORS.txt addons/aircraft/stringtable.xml addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/disposable/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/grenades/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml addons/nametags/stringtable.xml addons/nightvision/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/parachute/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/respawn/stringtable.xml addons/safemode/stringtable.xml addons/switchunits/stringtable.xml addons/vehiclelock/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-29 12:52:55 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +02:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
Glowbal	0146439925	increasing the text box height #834 ... Temporary solution until we get something properly done. Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.	2015-04-24 07:46:01 +02:00
Grzegorz	485fd7078f	Update stringtable.xml	2015-04-22 00:22:44 +02:00
Grzegorz Sikora	222aceaf56	PL fix	2015-04-20 17:11:22 +02:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
PabstMirror	caef5c105f	More Privates	2015-04-17 22:40:37 -05:00
KoffeinFlummi	1b67b2df26	Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disposable/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml	2015-04-15 22:20:47 +02:00
KoffeinFlummi	8b915380b7	Merge branch 'hungarian-merge'	2015-04-15 13:55:02 +02:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
Marco	5238647021	Update stringtable.xml ... Italian	2015-04-15 11:12:15 +02:00
esteldunedain	6f4bb48489	Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/attach/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/magazinerepack/stringtable.xml addons/overheating/stringtable.xml extensions/CMakeLists.txt	2015-04-14 19:09:57 -03:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
Harakhti	1b60a335a5	Translation: J to M ... I feel burned out. This was very specifically long and tedious.	2015-04-13 23:03:09 +02:00
Grzegorz Sikora	ac886828b0	Fixes	2015-04-13 18:02:48 +02:00
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
KoffeinFlummi	614afa8537	Merge https://github.com/Kllrt/ACE3 into czech-merge ... Conflicts: addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/goggles/stringtable.xml addons/grenades/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-12 14:27:59 +02:00
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
esteldunedain	0565eb6c74	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment ... Conflicts: addons/laser_selfdesignate/stringtable.xml	2015-04-12 01:26:55 -03:00
esteldunedain	7b797d906f	Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf addons/overheating/stringtable.xml	2015-04-12 00:19:33 -03:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
VyMajoris	9d326ce9a5	Added - Portuguese translation to magazineRepack	2015-04-11 03:10:39 -03:00
EpMAK	17a552bb80	Russian Translation ... Russian translation of stringtables: new lines + old lines fixed a bit, realistic names for armory are not yet filled.	2015-04-10 19:55:57 +03:00
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Anthariel	0c851a6d9a	Update stringtable.xml ... Added: French Translations (100%)	2015-04-10 06:22:26 +02:00
Grzegorz	685d21169d	magazinerepack PL translation ... Had to make some shifts in lines 70 and 93 to make it sound good in PL	2015-04-10 03:03:03 +02:00
Legolasindar	2a5e416dfc	Update stringtable.xml ... fixed spanish terms	2015-04-10 01:40:22 +02:00
esteldunedain	a658cafb4e	Remove line breaks from actions	2015-04-04 01:45:03 -03:00
PabstMirror	6cd7ab2f7d	Fix getChildren - condition/only show inv mags	2015-04-03 22:37:48 -05:00
PabstMirror	a92a541234	Headers	2015-04-01 23:05:41 -05:00