b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
e1d683d8dc
laserpointer with new command lineintersectssurface
2015-08-31 17:31:37 +02:00
5ea98143e2
Merge pull request #2211 from jonpas/integrateAsdg
...
Integrated ASDG JR Optional
2015-08-26 17:53:32 -07:00
9fd155f3ec
Integrated ASDG JR Optional
2015-08-19 17:11:15 +02:00
5ffdf4628f
remove asdg message
...
new cba will include asdg jr
2015-08-16 13:15:01 +02:00
241e8acdd9
Merge pull request #1541 from jonpas/sitting
...
Sitting
2015-06-26 21:34:34 +02:00
d7717448fa
#1670 - Laser pointer - pass _brightness to drawFnc
2015-06-18 17:16:53 -05:00
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
2efc095c93
Merge branch 'master' into laserPointerSetting
...
Conflicts:
addons/laserpointer/XEH_postInit.sqf
2015-06-13 11:02:00 -05:00
9b2ebfcbe8
Privates, newline braces, typos
2015-06-13 10:41:19 +02:00
b960ae5d6b
Optional setting to disable laser pointer system
2015-06-12 00:58:04 -05:00
237b5b4e35
Merge pull request #1239 from acemod/laserPointerAsdgConflict
...
ASDG- Fail gracefully if attachments not compatible
2015-06-05 16:40:49 -05:00
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
1dd34199d6
ASDG- Fail gracefully if attachments not compatible
2015-05-15 22:23:46 -05:00
9e093b9459
Added: More italian translations
2015-05-09 23:52:01 +02:00
b57f731dd0
disable laserpointer inheritance for rhs
2015-05-09 04:59:10 +02:00
d0975b4c0f
Laserpointer Stringtable - fix swapped eng/czk
2015-05-02 18:55:23 -05:00
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
f1ba0cff26
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
1d3f5cc312
Czceh translation
2015-05-02 00:04:50 +02:00
f5303d455c
Translation of some stuff into czech language
...
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
2015-05-01 22:23:03 +02:00
e96f23c197
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
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
c52278c11f
Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty
2015-05-01 09:52:03 +02:00
f301491c7a
changed variable name to use QGVAR macro
2015-04-30 23:18:45 +02:00
131468f0d8
plurals
2015-04-30 22:39:33 +02:00
1ca0d66f30
Initial categories
2015-04-30 22:02:20 +02:00
b9c1936efc
changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser
2015-04-30 18:51:30 +02:00
4e165e2572
Update Hungarian translations
...
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
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
956b5e3558
Spanish Translation
...
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10:35 +02:00
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
31a2f1b279
Russian translations
...
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
11f9478035
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
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
18c65108c3
French : update stringtable
2015-04-15 21:24:24 +02:00
92031cc354
Update stringtable.xml
2015-04-15 19:59:45 +03:00
40b784fb7a
update stringtable
...
added spanish translate
2015-04-15 17:41:10 +02:00
250d6acb22
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
2015-04-15 16:09:40 +02:00
8b915380b7
Merge branch 'hungarian-merge'
2015-04-15 13:55:02 +02:00
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
f931c1a42c
Update stringtable.xml
...
Italian
2015-04-15 11:10:05 +02:00
3543b9c806
PL Translation
...
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
4c6cc8dddf
merging stringtables
2015-04-14 23:22:25 +02:00
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
f89e02a5ca
fix no laser in ffv slots
2015-04-14 13:24:17 +02:00
