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
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
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
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07: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
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
Glowbal
f861466882
Merge pull request #1075 from acemod/ambianceSoundModuleDescAndDoc
...
adjust ambiance sound module description and docs
2015-05-10 11:46:53 +02:00
bux578
fb284faa66
adjust ambiance sound module description and docs
2015-05-09 08:18:44 +02:00
bux578
ddf32052c4
fix removeWhiteSpace function name
...
used `string_removeWhiteSpace` but had to be `stringRemoveWhiteSpace`
due to 612fa69c1c
2015-05-09 08:02:13 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
bux578
7744d5b5fb
fix authors #2
2015-03-24 19:43:06 +01:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
Glowbal
af3709f481
Fixed forgotten missionModules.
2015-02-19 19:07:19 +01:00
Glowbal
1ea35548e0
Fixed ambiance sounds module.
2015-02-19 18:40:40 +01:00
Glowbal
bfc748fbbe
Added missionmodules.
2015-02-17 07:51:51 +01:00
