111 Commits

Author	SHA1	Message	Date
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
PabstMirror	473ab7d7c0	Fix mmg UBC	2015-05-31 23:48:20 -05:00
jonpas	d934c25b78	Merge branch 'master' into macroSTR ... Conflicts: addons/interact_menu/ACE_Settings.hpp	2015-05-30 19:54:32 +02:00
Josuan Albin	7603e71468	removed useless entries	2015-05-29 22:08:13 +02:00
Josuan Albin	26a9f7f38e	navid and SPMG barrel swapping added ... - added navid class to barrel swapping config - added SPMG class to barrel swapping config	2015-05-29 15:31:48 +02:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +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
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
Kavinsky	8e9b35c757	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
SAM	31adb5a9fc	Second batch of settings files	2015-05-14 20:59:25 +02:00
KoffeinFlummi	a8c4068b56	Remove unnecessary comment	2015-05-07 18:51:18 +02:00
KoffeinFlummi	db07de31af	Whoops; back to the roots.	2015-05-07 18:49:40 +02:00
KoffeinFlummi	27c8255987	Convert ACE_bulletMass to grams	2015-05-07 18:33:34 +02:00
Bla1337	a7d66b59cf	transaltions	2015-05-03 14:01:35 +03: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	131468f0d8	plurals	2015-04-30 22:39:33 +02:00
Glowbal	1ca0d66f30	Initial categories	2015-04-30 22:02:20 +02:00
ulteq	2c97b20781	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/vehiclelock/stringtable.xml	2015-04-30 13:20:31 +02:00
Dimaslg	f8d5c423ae	Merge conflicts resolved	2015-04-29 21:15:22 +02:00
NukeDev	d4dc5e6d85	Other Fixes 2	2015-04-29 17:22:20 +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
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
ulteq	d0c7a37841	Minor stringtable fix	2015-04-28 18:31:14 +02:00
ulteq	dc09c554c0	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-04-28 17:44:58 +02:00
Josuan Albin	e8dec708bc	Some french entries and a german duplicate ... Added some french entries and removed a german duplicate	2015-04-27 16:18:28 +02:00
Grzegorz Sikora	a272258500	PL translation	2015-04-26 22:59:20 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +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
KoffeinFlummi	3aafa2082d	Merge https://github.com/nomisum/ACE3 into german-merge ... Conflicts: addons/atragmx/stringtable.xml addons/scopes/stringtable.xml addons/weather/stringtable.xml	2015-04-19 00:39:44 +02:00
PabstMirror	caef5c105f	More Privates	2015-04-17 22:40:37 -05:00
nomisum	8813315f36	added missing translations german	2015-04-17 11:40:31 +02: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
ruPaladin	d8eb564c65	Update stringtable.xml	2015-04-15 19:52:29 +03: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
esteldunedain	495c822061	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-14 19:10:31 -03: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	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	8bfd915ec4	Translation: N to R ... This was a lot more fun than the previous two were. 12 folders left...	2015-04-13 23:45:44 +02:00
ulteq	2332f19274	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics ... Conflicts: addons/ballistics/stringtable.xml addons/magazines/CfgAmmo.hpp addons/magazines/CfgMagazines.hpp addons/magazines/CfgVehicles.hpp addons/magazines/CfgWeapons.hpp addons/magazines/newclasses.txt	2015-04-13 21:35:53 +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