102 Commits

Author	SHA1	Message	Date
commy2	da70854568	manual merge	2016-05-18 11:48:27 +02:00
Alessandro Foresi	e97c7c0f65	Translation: IT completed (with BOM)	2016-03-27 21:22:15 +02:00
commy2	467075ad67	replace timePFH with CBA_missionTime	2016-03-02 11:01:39 +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
Thomas Kooi	f6dfd03bec	Merge pull request #2168 from jokoho48/codeCleanupLaserSelfdesignate ... Code Cleanup laser Self Designate Module	2016-02-20 17:28:41 +01:00
Thomas Kooi	ff7dbfa9f2	Merge pull request #3305 from GitHawk/dagr_fix ... Disable ACE_Laser for choppers (aka Changes to DAGR)	2016-02-20 17:17:46 +01:00
Githawk	17cba965c3	Deactivate laser_sefldesignate on Comanche	2016-02-11 20:27:46 +01:00
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
commy2	e3ecc64771	remove undefined macro	2015-12-18 13:53:25 +01:00
PabstMirror	db41512dc0	#2349 - Don't disable locking for base RocketPods	2015-09-14 22:11:12 -05:00
jokoho48	438f9da87b	Improve Comments	2015-08-28 12:58:53 +02:00
jokoho48	bcec28e4b5	Code Cleanup laser Self Designate Module.	2015-08-15 23:53:04 +02:00
PabstMirror	b3741f4036	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05: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
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
Kavinsky	4b048553e2	wops... corrected wrong path	2015-05-20 23:44:50 +02:00
Kavinsky	8e9b35c757	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
Alessandro Foresi	9e093b9459	Added: More italian translations	2015-05-09 23:52:01 +02:00
commy2	52a904478b	laser selfdesignate has wrong version number macro setup	2015-05-09 15:32:34 +02:00
ToasterBR	021b00c722	Translation to Portuguese ... Done all remaining portuguese translations, including some minor corrections	2015-05-02 03:38:53 -03:00
jaynus	2ed05ed469	Merge remote-tracking branch 'origin/master' into laserCodeSelection	2015-05-01 11:35:11 -07:00
jaynus	dfbfb4ace2	Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751	2015-05-01 11:31:37 -07: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
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
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
bux578	0f2e4c22b7	Merge pull request #749 from FreeZbe/master ... French: updates / fixes stringtable	2015-04-18 21:16:07 +02:00
jaynus	dea95f7947	ace_laser_selfdesignate	2015-04-18 10:57:35 -07:00
jaynus	26e2917f79	Merge remote-tracking branch 'origin/master' into laserCodes ... Conflicts: addons/javelin/CfgWeapons.hpp	2015-04-18 10:36:07 -07:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
PabstMirror	b2625c43e7	#644 - Extra Space in macro	2015-04-15 20:30:09 -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	96be1baddc	Update stringtable.xml ... Italian	2015-04-15 11:08:43 +02:00
jaynus	934f2ce097	Display current laser code. Standardize GVARs	2015-04-14 16:29:49 -07: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
jaynus	739807303b	Fix script error for canceling designation and dying while designating.	2015-04-14 11:42:26 -07: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
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
jaynus	0c3caffe89	Merge pull request #501 from acemod/network_lasers ... Break all the lasers. Continuing expansion work is in #535	2015-04-12 16:47:24 -07:00
Anthariel	638868b3da	Update stringtable.xml ... Added: French translation (100%).	2015-04-13 00:41:50 +02:00
jaynus	9287d6fe44	Remove dead code.	2015-04-12 11:46:28 -07:00
jaynus	7f0e54b9c3	More defaults.	2015-04-12 11:43:37 -07:00
jaynus	197b13e6d9	Use current codes for FCS updates.	2015-04-12 11:41:50 -07:00
jaynus	9273a32d23	code cleanup, default laser parameters, getVariable self designation specifics.	2015-04-12 11:38:07 -07:00