Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
[OMCB]kaban
6c48a4a0de
Fix due to review
2015-09-05 05:07:18 +03:00
bux578
9e1ae58f4f
fix restore gear
2015-09-03 18:17:53 +02:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
Michael Braun
035b3432c5
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
Michael Braun
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
bux578
3d9b0d527c
fix indentation
...
atom needed the editorconfig package
2015-08-15 18:58:31 +02:00
bux578
675cfc2da7
after respawn select last weapon, muzzle and mode
...
#2138
2015-08-15 18:54:39 +02:00
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
PabstMirror
7eb26c8710
#1699 - Rally point object names
2015-07-01 01:27:06 -05:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
PabstMirror
4e8fc49b5e
Always remove fakeWeapon after adding
...
Should fix #1500
2015-06-05 15:38:45 -05:00
jonpas
9fbf256acd
Merge branch 'master' into macroSTR
...
Conflicts:
addons/hearing/functions/fnc_putInEarplugs.sqf
addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
bux578
ee85aab791
fix #1439
2015-06-04 14:30:38 +02:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02:00
esteldunedain
9d29aa2107
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
...
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
2015-05-30 01:37:41 -03: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
6f6f2a55f0
Stringtable fixes except medical
2015-05-27 21:43:30 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
SAM
31adb5a9fc
Second batch of settings files
2015-05-14 20:59:25 +02:00
GieNkoV
ed1acd8c15
Some small errors fixed #2
...
Mainly tabs and wrong italian strings (got those from newest master)
2015-05-12 19:42:35 +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
Grzegorz Sikora
156bba3321
Yes/No to BOOL
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
ViperMaul
e75c4594e6
Added missing $PBOPREFIX$ for respawn
2015-05-11 15:17:44 -07:00
KoffeinFlummi
2bb3a0f139
Cleanup #1095
...
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
2dd06babec
Added: Italian translations completed.
...
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Glowbal
a49feee76b
should have been defaultValue
2015-05-05 19:47:17 +02:00
Glowbal
cee83113d2
lets use proper module config for this
2015-05-05 19:44:56 +02:00
Glowbal
9abf8a15c1
Make certain that GVAR(BodyRemoveTimer) exists
2015-05-05 19:44:44 +02:00
Bla1337
a7d66b59cf
transaltions
2015-05-03 14:01:35 +03:00
KoffeinFlummi
298e1d88bd
Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02:00
Harakhti
6c2717be7f
More more translations
...
Stope.
2015-05-02 18:06:01 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
KoffeinFlummi
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
Lukas
1d3f5cc312
Czceh translation
2015-05-02 00:04:50 +02:00
FreeZbe
6f5e64b4a5
French : update / fix stringtable
2015-05-01 23:10:06 +02:00
