commy2
05d30c5573
convert log macros to cba versions ( #4282 )
...
* convert log macros to cba versions
* Add changes to AB
* remove obsolete macro
2016-10-02 12:55:31 +02:00
classicarma
0ced153e53
translate markers
2016-09-28 01:15:26 +09:00
BaerMitUmlaut
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
commy2
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
PabstMirror
d7f9c52c2f
Merge branch 'master' into cbaEventSystem
2016-06-02 19:29:30 -05:00
PabstMirror
b6aaba7f90
Integrate 1.60 marker shape color map interface ( #3860 )
...
1.60 adds ability to set color and marker type from the map interface
Luckily they use the same values and indexes as ACE,
This PR connects the two systems,
Selecting a color from the 1.60 map display will set the color in the
ace marker display and vice versa
2016-06-02 09:28:52 -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
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
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
Alessandro Foresi
e97c7c0f65
Translation: IT completed (with BOM)
2016-03-27 21:22:15 +02:00
esteldunedain
849fa4f1ee
Redo markers, lost in the merge
2016-02-27 09:06:19 -03:00
esteldunedain
b2c672e6c7
Apply the same pattern to ACE_Markers
2016-02-23 19:32:39 -03: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
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
commy2
7748131e73
code cleanup markers
2015-12-10 15:32:31 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
.
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
PabstMirror
a82e5b5436
Fix Colors + Debug Trace
2015-08-23 14:25:41 -05:00
jokoho48
f35b82ddb9
Code Cleanup Marker Module.
2015-08-22 14:08:35 +02:00
jonpas
1eeca28a3d
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
2015-06-13 22:08:13 +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
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
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
PabstMirror
00f26144ec
More Privates
2015-04-17 15:45:00 -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
Marco
924cd80e60
Update stringtable.xml
...
ITalian
2015-04-15 11:13:47 +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
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
PabstMirror
a4af1fcb30
Fix Marker Placement on UAV Map
2015-04-08 13:55:29 -05:00
PabstMirror
4e4834974a
cleanup debug
2015-03-27 23:26:41 -05:00
PabstMirror
aa5a580645
Cleanup
2015-03-27 23:24:11 -05:00
PabstMirror
909f53753a
Fix JIP Marker SYnc
2015-03-27 23:19:03 -05:00
PabstMirror
e5cbca02e4
Show placement angle in preview
2015-03-27 22:55:19 -05:00
PabstMirror
24bba5dea6
Headers
2015-03-27 20:51:30 -05:00
PabstMirror
63b7f0a755
Marker Fixes for 1.42 WIP
2015-03-27 19:22:49 -05:00