122 Commits

Author	SHA1	Message	Date
commy2	ca9b909e75	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
PabstMirror	a621eaab24	#2750 - Update FCS display after distance adjust	2015-11-13 02:57:06 -06:00
PabstMirror	a3443cae43	Merge pull request #2780 from acemod/fixTimeInComments ... Changed ACE_time back to time in comments where appropriate	2015-11-04 13:04:05 -06:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
VKing	a899c74133	ace_fcs_ace_time -> ace_fcs_time	2015-10-21 22:17:28 +02:00
VKing	0936238862	Fix lead calculation for vehicle FCS	2015-10-21 21:52:48 +02:00
commy2	a03bc44ba0	add fcs to static machine guns, close #1188	2015-09-17 14:40:58 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
PabstMirror	32ce0aa6fd	Macroize all stringtables	2015-06-05 21:02:24 -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
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	582ea318d4	Merge remote-tracking branch 'origin/superTime' ... Conflicts: addons/frag/functions/fnc_fired.sqf addons/frag/functions/fnc_trackFragRound.sqf	2015-05-22 07:24:55 -07:00
Felix Wiegand	fd2676c7b9	Merge pull request #1135 from acemod/fcsPrivates ... FCS - Privates	2015-05-21 22:18:14 +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
PabstMirror	54dcbb9ef4	FCS - Privates	2015-05-12 22:15:52 -05:00
ulteq	ff2d7fdb72	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix ... Conflicts: addons/fcs/functions/fnc_firedEH.sqf	2015-05-01 19:00:27 +02:00
ulteq	aa21962f8b	Allowed positive weapon initSpeed values	2015-05-01 18:55:44 +02:00
ulteq	a42dec6760	Added more missing privates	2015-05-01 17:40:30 +02:00
ulteq	5dcb45bd33	Finds the corresponding weapon class for each magazine type.	2015-05-01 17:39:38 +02:00
ulteq	6dc28f026f	Added missing private	2015-05-01 17:15:49 +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
ulteq	800ccc07f3	Removed duplicate code	2015-05-01 16:24:16 +02:00
ulteq	3ad668605a	Fix for last fcs change	2015-05-01 16:02:34 +02:00
Nicolás Badano	cde80b2901	Revert "Takes negative initSpeed values into account"	2015-05-01 10:38:41 -03:00
ulteq	4c0bed609e	Fixed a typo	2015-05-01 11:53:53 +02:00
ulteq	965e45a53c	Takes negative initSpeed values into account	2015-05-01 10:25:33 +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
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
NukeDev	db82df6214	Italian's Translation's Changes v2	2015-04-28 18:10:35 +02:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
commy2	e207a11851	fix: Cannot zero when looking through optics of static weapons and vehicle mg/gmg, fix #836	2015-04-24 19:02:29 +02:00
commy2	ea368511b7	ace extensions class for modularity	2015-04-20 18:48:58 +02:00
jaynus	26e2917f79	Merge remote-tracking branch 'origin/master' into laserCodes ... Conflicts: addons/javelin/CfgWeapons.hpp	2015-04-18 10:36:07 -07:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
jaynus	2ec74a6a3e	align correctly, create event, remove FCS from laserDesignator.	2015-04-14 16:20:03 -07:00
Harakhti	3c3f6ba4c3	Translation: A to I ... Some parts filled out, other parts corrected or stylized.	2015-04-13 19:28:58 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
PabstMirror	36b92b3d44	Don't do client stuff on dedicated.	2015-04-12 22:44:19 -05: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
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