93 Commits

Author	SHA1	Message	Date
jonpas	b0352fdeb9	Merge branch 'master' into eol-lf	2016-06-02 17:02:09 +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
commy2	fd26e2e44e	Merge pull request #3516 from acemod/cbamissiontime ... replace timePFH with CBA_missionTime	2016-05-30 21:23:57 +02:00
jonpas	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
jonpas	816da2aef1	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
commy2	da70854568	manual merge	2016-05-18 11:48:27 +02:00
BaerMitUmlaut	7fcbe93b71	Cleaned up excessive whitespace	2016-05-03 02:32:44 +02:00
PabstMirror	d523ef1fcd	Try to use cursorObject first	2016-04-14 10:57:36 -05:00
PabstMirror	3744b980f4	Javelin - Verify player has LOS to cursorTarget ... Fix #3668	2016-04-12 02:14:06 -05: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
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
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
PabstMirror	67087d7c88	Capitalization	2016-01-18 00:27:19 -06:00
PabstMirror	a5c6c5579f	#3175 - Javelin - Fix zeus RC after switchCamera	2016-01-17 12:12:05 -06:00
commy2	ca9b909e75	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
PabstMirror	6e982018d3	Don't use uiNamespace to store PEFH	2015-07-04 23:14:44 -05:00
PabstMirror	183c03a3a4	Add missing PREP	2015-07-04 22:54:21 -05:00
PabstMirror	6dba8b33da	Merge pull request #1507 from acemod/fixJavelinLocking ... Fix javelin locking	2015-06-13 12:54:06 -05:00
PabstMirror	21db1bcf46	Fix Ammo check / formating	2015-06-04 13:08:01 -05:00
PabstMirror	3a2e32b800	#1444 - Javelin Locking	2015-06-03 02:32:53 -05:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
jonpas	87db721d4f	Stringtable fixes up to medical	2015-05-27 21:19:14 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
PabstMirror	c7d9074f3f	Javelin - Only run if weapon and ammo supported	2015-05-25 05:38:45 -05:00
PabstMirror	0452270380	Add Javelin CfgAmmo ... Leave M_Titan_AT alone for A3 Vehicles / Mods that use it	2015-05-25 05:34:07 -05: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
Grzegorz Sikora	44466e8be8	Remove tabs and repair errors @Glowbal found ... Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp addons/optionsmenu/stringtable.xml	2015-05-12 18:27:27 +02:00
PabstMirror	ce1255bb2f	Fix configProperties	2015-05-01 17:56:04 -05:00
Lukas	1d3f5cc312	Czceh translation	2015-05-02 00:04:50 +02:00
jaynus	e4567fb59f	Merge remote-tracking branch 'origin/master' into guidanceClassFixes ... Conflicts: addons/javelin/functions/fnc_onOpticDraw.sqf	2015-05-01 06:59:28 -07:00
jaynus	9997b6d464	action is select 1	2015-05-01 06:57:49 -07:00
Glowbal	131468f0d8	plurals	2015-04-30 22:39:33 +02:00
Glowbal	1ca0d66f30	Initial categories	2015-04-30 22:02:20 +02:00
jaynus	7568773ece	class localize and disable all guidance/locking.	2015-04-30 09:00:09 -07:00
Glowbal	8f3d8707cc	Should be select ... Should fix the new script error after last fix.	2015-04-30 08:53:43 +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
Glowbal	7dc8a08b89	Replaced _currentshooter by _this ... Fixes script error `Error Undefined variable in expression: _currentshooter`	2015-04-24 20:03:04 +02:00
jaynus	0c6786a138	use the vehicle of the player for variables, not the player. allows static optics. FIxes #808	2015-04-22 08:07:58 -07:00
jaynus	d63de3a09e	restart PFH on optic reload. Fixes #812	2015-04-22 07:49:18 -07:00
bux578	0f2e4c22b7	Merge pull request #749 from FreeZbe/master ... French: updates / fixes stringtable	2015-04-18 21:16:07 +02:00
jaynus	87337bcb7a	ace_javelin privates	2015-04-18 10:50:22 -07:00
jaynus	9c076364ec	Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff.	2015-04-18 10:18:33 -07:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
jaynus	d1e03d8e7a	Slight tweaks.	2015-04-18 09:40:46 -07:00
jaynus	6c3e699fdb	tabs	2015-04-17 07:28:19 -07:00