Commit Graph

86 Commits

Author SHA1 Message Date
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05: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
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +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
dd2e9140ae Q(E)GVAR rangefinderData event 2016-05-25 01:44:56 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
PabstMirror
cf9479efab Non-hardcoded binocular / vector detection 2016-04-20 10:40:00 -05:00
PabstMirror
23632281cf Add day (non night vision) version of the vector 21 2016-04-17 23:22:41 -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
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
2b9518bf81 use precompiled function for vector display 2016-02-21 22:41:11 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
SilentSpike
a8cf9c6f48 Fix missing boolean inversion 2015-11-28 13:58:56 +00:00
PabstMirror
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
SzwedzikPL
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
PabstMirror
aa3b9e7b1c #1871 - Don't do ctrlText(set) on RscControlsGroup
Throws `control[ACE_ScriptedDisplayControlsGroup]: Unexpected control
type [15]`
2015-07-23 16:46:30 -05: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
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
Alessandro Foresi
7e7c3ed053 Added: More italian translations 2015-05-10 00:04:42 +02:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02:00
bux578
28a8fbc4fe fix vector name
it's the vector 21 not the vector IV
2015-04-26 15:36:47 +02:00
commy2
bd168981e2 how do I merge 2015-04-13 19:23:42 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
PabstMirror
36b92b3d44 Don't do client stuff on dedicated. 2015-04-12 22:44:19 -05: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
commy2
56de4f05f3 scripts for vector illum, renaming some files 2015-04-12 13:56:01 +02:00
commy2
83e634be8a illuminate vector number textures at night 2015-04-12 12:54:36 +02:00
commy2
f16d5398f4 enable vector on ffv positions, fix #506 2015-04-12 12:03:49 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
commy2
1e497c228c switch sides of add/drop left/right 2015-04-06 16:18:59 +02:00
commy2
ebd1e555a3 fix: derp when switching control numbers 2015-04-06 16:07:52 +02:00
VKing
8255ff666d Fix long-standing typo (get it?) 2015-04-05 22:18:28 +02:00
VKing
8ad202b039 Fix Fall-of-Shot units being inverted 2015-04-05 22:16:47 +02:00
commy2
b0575bad21 improve infoDisplayChanged EH 2015-04-03 17:50:52 +02:00