192 Commits

Author	SHA1	Message	Date
nsgundy	eee5664ec5	Move MicroDAGR 3D model from BFT branch to microdagr module	2015-09-07 11:05:18 +02:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
PabstMirror	4cf81b493a	Fix stringtable and more cleanup	2015-08-26 11:00:59 -05:00
jokoho48	ca71dd43e1	Code Cleanup MicroDagr Module	2015-08-26 05:31:33 +02:00
PabstMirror	248b4449bf	#2204 - Tweak road draw for performance	2015-08-22 22:07:29 -05:00
PabstMirror	3df5b82402	#2225 - Fix mdagr list box colors	2015-08-22 20:53:29 -05:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
jonpas	5a0a3a53e0	Uppercased 2 readme files	2015-08-19 04:19:00 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
KoffeinFlummi	88a5609016	Merge branch 'master' of https://github.com/acemod/ACE3	2015-07-25 19:35:26 +02:00
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +02:00
PabstMirror	c1dd2df57a	Move grid funcs and map long,lat,altitude to common	2015-06-30 12:26:51 -05:00
PabstMirror	ccebb4f86a	Merge branch 'master' into 10digitGrids2 ... Conflicts: addons/microdagr/functions/fnc_updateDisplay.sqf	2015-06-30 11:25:55 -05:00
PabstMirror	923018a9f6	mdagr use getMapPosFromGrid	2015-06-30 11:18:47 -05:00
ToasterBR	f4a51d57ef	Translation to Brazilian Portuguese (PT-BR) ... Made all remaining translations, including new ones like the sitting module, for example.	2015-06-27 15:48:39 -03:00
PabstMirror	6bb235f38a	Merge pull request #1711 from acemod/mdagr-ambientBrightness ... mdagr use ambientBrightness	2015-06-26 20:23:32 -05:00
PabstMirror	2d6e862237	Merge branch 'master' into 10digitGrids2	2015-06-21 13:07:58 -05:00
PabstMirror	f0adf256a8	#573 - mdagr use ambientBrightness	2015-06-21 12:25:16 -05:00
Macusercom	09f7473d7b	Added German translations	2015-06-16 03:06:47 +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	29ce8f635e	Merge branch 'master' into sitting ... Conflicts: addons/kestrel4500/CfgVehicles.hpp addons/microdagr/CfgVehicles.hpp	2015-06-13 21:43:42 +02:00
PabstMirror	6ab8b129fa	Merge branch 'master' into multipleDevices ... Conflicts: addons/common/XEH_postInit.sqf	2015-06-13 12:30:35 -05:00
ProfessorCZ	531372b2a3	CZ - Translation ... Already in README	2015-06-12 14:50:50 +02:00
jonpas	332afb2174	Allow certain self-interactions while sitting	2015-06-09 16:17:05 +02:00
PabstMirror	560609fbed	Cleanup	2015-06-05 19:46:19 -05:00
PabstMirror	470492759c	Merge branch 'master' into multipleDevices ... Conflicts: addons/atragmx/initKeybinds.sqf addons/common/XEH_postInit.sqf addons/kestrel4500/CfgVehicles.hpp addons/kestrel4500/initKeybinds.sqf addons/microdagr/CfgVehicles.hpp addons/microdagr/XEH_clientInit.sqf	2015-06-05 17:50:04 -05: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
Glowbal	1c0c73be54	Merge pull request #1433 from acemod/fixSettingsFromModules ... Delay initialization of modules until settings are properly setup	2015-06-01 19:18:11 +02:00
KoffeinFlummi	fa73aec15b	Merge https://github.com/Macusercom/ACE3 into german-merge	2015-06-01 14:27:49 +02:00
esteldunedain	9d29aa2107	- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing. ... - Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it	2015-05-30 01:37:41 -03:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
jonpas	0b0f7274d7	Applied ESTRING and ECSTRING macros	2015-05-27 22:04:41 +02:00
jonpas	6f6f2a55f0	Stringtable fixes except medical	2015-05-27 21:43:30 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello	047a2ee736	added spansih translate ... added spansih translate for (advanced_ballistics, ballistics, captives, common, explosives, frag, hearing, interaction, map, medical, microdagr, missileguidance, missionmodules, mk6mortar, nametags, optionsmenu, respawn, switchunits, vehiclelock, weather, winddeflection). I used the Pull request of #1251 for complete my commit, because #1251 is outdated now.	2015-05-27 15:27:04 +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
PabstMirror	64a401ee8c	#1241 closed - Add Editor placeable item	2015-05-20 17:17:10 +02:00
PabstMirror	fd8d68c451	Merge branch 'master' into multipleDevices ... Conflicts: addons/common/stringtable.xml	2015-05-14 15:38:13 -05:00
SAM	021679208b	First batch of settings files ... Separating ACE_Settings.hpp from config.cpp	2015-05-14 20:46:35 +02:00
Glowbal	abadf05342	Merge remote-tracking branch 'gienkov/module-translations' ... Conflicts: addons/medical/stringtable.xml	2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello	43c5afac55	fixed some spanish translation ... I fixed some spanish translation.	2015-05-14 14:32:35 +02:00
Grzegorz Sikora	6a821715a0	Stringtable modules ... Conflicts: addons/missionmodules/CfgVehicles.hpp addons/respawn/CfgVehicles.hpp	2015-05-12 18:25:40 +02:00
PabstMirror	ffce1f6386	Condense mDagr interactions - intergrate kestral	2015-05-11 21:49:13 -05:00
PabstMirror	05f1b884fa	Localization/ headers	2015-05-10 15:17:50 -05:00
PabstMirror	f7ff4a2f36	Base Device Handler Framework ... Multiple devices share Home/Ctrl-home keys	2015-05-10 14:59:53 -05:00
VKing	8d61b42e87	Changed MicroDAGR position and target display to 10-digit grids	2015-05-10 21:47:05 +02:00
VKing	2dd42f828d	"Borrowed" pabst's UTM zone/band function and moved it from microdagr to map	2015-05-10 21:45:49 +02:00
KoffeinFlummi	2bb3a0f139	Cleanup #1095 ... - Fix tabs - Remove tabler comments - Restore one removed Russian string	2015-05-10 16:19:46 +02:00
Alessandro Foresi	9e093b9459	Added: More italian translations	2015-05-09 23:52:01 +02:00
KoffeinFlummi	e96f23c197	Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge ... Conflicts: addons/atragmx/stringtable.xml addons/interact_menu/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml addons/realisticnames/stringtable.xml addons/respawn/stringtable.xml	2015-05-01 17:30:59 +02: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
Glowbal	1ca0d66f30	Initial categories	2015-04-30 22:02:20 +02:00
Harakhti	4e165e2572	Update Hungarian translations ... Let us match the current revision. At the time of making, the Ballistics XML was broken.	2015-04-30 13:25:25 +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	1bb8628109	Merge https://github.com/simon84/ACE3 into german-merge	2015-04-26 21:00:22 +02:00
VyMajoris	523cb49ff1	Added - Portuguese translation to lots of things. ... Also fixed a typo the english key for STR_ACE_microdagr_configure.	2015-04-26 03:09:16 -03:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
Nicolás Badano	1bfb13abac	Revert "remove author from items inheriting ACE_ItemCore"	2015-04-21 19:07:42 -03:00
bux578	3897b73d56	remove author from items inheriting ACE_ItemCore	2015-04-21 19:16:54 +02:00
PabstMirror	fdbd0c1905	#777 - mDagr - Update map pos each frame.	2015-04-20 16:12:01 -05:00
KoffeinFlummi	06a4f3d10e	Remove tabler comments.	2015-04-20 15:48:50 +02:00
Grzegorz Sikora	4283e07942	PL fix	2015-04-19 13:50:08 +02:00
PabstMirror	060dc22ad5	Merge pull request #721 from acemod/privatesPass1 ... Privates Var Fixing	2015-04-17 23:51:23 -05:00
Tachii	ad61557557	Update stringtable.xml	2015-04-18 03:10:28 +03:00
Tachii	04858bb673	Update stringtable.xml	2015-04-18 02:19:09 +03:00
PabstMirror	00f26144ec	More Privates	2015-04-17 15:45:00 -05:00
simon84	cc75928cc0	Merge remote-tracking branch 'acemod/master' ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:47:51 +02:00
simon84	c18284d964	German translation	2015-04-16 22:04:24 +02: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	47f8161855	Update stringtable.xml ... Italian	2015-04-15 11:18:22 +02:00
Grzegorz Sikora	3543b9c806	PL Translation ... Some french, german and russian entries were listed twice, had to remove one of two here and there so this list is for revision by different translators	2015-04-15 00:43:42 +02:00
KoffeinFlummi	ebcdafe610	Fix spelling of "isClientSetable"	2015-04-14 21:43:19 +02:00
KoffeinFlummi	b563bf8a8e	Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-14 15:04:42 +02: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
Kllrt	1c611ba2db	Added another new CZ strings	2015-04-13 21:15:04 +02:00
Grzegorz Sikora	ac886828b0	Fixes	2015-04-13 18:02:48 +02:00
bux578	8c24d9ec35	fix invalid xml, fix duplicate keys	2015-04-13 15:25:30 +02:00
KoffeinFlummi	8d4003a396	Merge https://github.com/HerrStein/ACE3 into german-merge	2015-04-13 14:21:00 +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
PabstMirror	b50a7a0147	Try to fix degree symbol (encoding issue)	2015-04-12 22:56:46 -05:00
Anthariel	0e925bc006	Update stringtable.xml	2015-04-13 01:31:49 +02:00
simon84	51bc7208bc	German translation ... Some german translations and corrections	2015-04-12 20:52:15 +02:00
licht-im-Norden87	fef0d690f8	Update stringtable.xml	2015-04-12 15:25:18 +02:00
licht-im-Norden87	36ba507ab5	Update stringtable.xml	2015-04-12 14:52:37 +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
licht-im-Norden87	a3f97efbc3	Update stringtable.xml ... What does WDG and MGRS mean?	2015-04-12 14:07:49 +02:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02: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