Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55
fixed some spanish translation
...
I fixed some spanish translation.
2015-05-14 14:32:35 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +02:00
GieNkoV
5bbf875ef2
Tabs removed
...
Conflicts:
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:02 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
PabstMirror
21552caee7
Opps- Not the same as javelin
2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d
MissleGuidance - fix Inheritance check
2015-05-04 22:46:58 -05:00
Lukas
da309e6682
Update stringtable.xml
2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6
Czech translation - Update
2015-05-03 11:48:56 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
licht-im-Norden87
5e8096f29c
Update Stringtable: missileguidance
2015-05-01 21:29:49 +02:00
jaynus
c1ba4966f9
Test confirm no bouncy.
2015-05-01 11:53:55 -07:00
jaynus
5bf763a08e
quote, not var.
2015-05-01 11:47:49 -07:00
jaynus
2ed05ed469
Merge remote-tracking branch 'origin/master' into laserCodeSelection
2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e
Resolved. Conflicts:
...
addons/missileguidance/functions/fnc_onFired.sqf
2015-05-01 11:35:03 -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
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
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
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
commy2
b255d1040b
scope 1 for ACE_Comanche_Test, #943
2015-05-01 15:30:11 +02:00
jaynus
21cc0db28f
Correctly look up configs.
2015-04-30 09:04:29 -07:00
Harakhti
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
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Dimaslg
864c3ea03b
Conflicts resolve again
...
Conflicts resolve again
2015-04-29 21:23:32 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
NukeDev
73772d9de1
Other Fixes
2015-04-29 16:44:42 +02:00
jaynus
283e34779f
Don't inherit
2015-04-29 07:05:48 -07:00
Bla1337
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
Josuan Albin
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
Dimaslg
4b7daaa840
Spanish translation
...
Minor fixes and spelling mistakes.
2015-04-25 19:18:04 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Nicolás Badano
1bfb13abac
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:07:42 -03:00
Nicolás Badano
ce3cc71869
Merge pull request #795 from acemod/fixAuthor
...
remove author from items inheriting ACE_ItemCore
2015-04-21 15:08:53 -03:00
bux578
3897b73d56
remove author from items inheriting ACE_ItemCore
2015-04-21 19:16:54 +02:00
Ivan Navarro Cabello
55887b7cfe
updated stringtable for spanish
...
added some spanish translate
2015-04-21 19:03:55 +02:00
bux578
0d86374bee
Merge pull request #754 from gienkov/master
...
PL translation
2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569
isNull
2015-04-18 22:23:19 -05:00
KoffeinFlummi
65fd6b0937
Merge https://github.com/EpMAK/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
jaynus
2fe7122b3e
Disable handoff until completed.
2015-04-18 15:44:07 -07:00
Grzegorz Sikora
c08125e0f3
PL translation
2015-04-18 22:00:37 +02:00
bux578
0f2e4c22b7
Merge pull request #749 from FreeZbe/master
...
French: updates / fixes stringtable
2015-04-18 21:16:07 +02:00
jaynus
953faf3d4b
ace_missileguidance privates.
2015-04-18 10:53:21 -07:00
jaynus
11336cdade
Merge remote-tracking branch 'origin/master' into guidanceHandoff
2015-04-18 10:37:16 -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
e14ee45249
debug checking.
2015-04-18 09:29:58 -07:00
jaynus
d1993836ae
Cleanup. missing string.
2015-04-18 08:40:28 -07:00
EpMAK
31a2f1b279
Russian translations
...
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
