Glowbal
275b0c4300
Merge branch 'release'
...
Conflicts:
README.md
addons/finger/stringtable.xml
2015-08-04 22:29:05 +02:00
PabstMirror
52130d5a45
Switch to some already translated CSTRINGs
2015-08-03 15:52:35 -05:00
PabstMirror
1d82a3c193
#1962 - Fix Changes in Wind Deflection s in AB
2015-07-31 23:39:05 -05:00
SilentSpike
16597515f0
Adding remaining missing English straings
2015-07-28 20:55:22 +01:00
PabstMirror
b47a17230b
Merge branch 'master' into 10digitGrids2
2015-07-16 17:26:19 -05:00
bux578
fcb6383337
remove some empty xml nodes
2015-07-04 16:19:53 +02:00
PabstMirror
c1dd2df57a
Move grid funcs and map long,lat,altitude to common
2015-06-30 12:26:51 -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
acc5f4d29f
CZ - Translation
2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
gienkov
c1a7374404
Merge remote-tracking branch 'upstream/master' into pl-translation-1
...
Conflicts:
addons/interact_menu/stringtable.xml
2015-06-05 09:40:50 +02: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
gienkov
b5eb39291c
Merge remote-tracking branch 'origin' into pl-translation-1
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/frag/stringtable.xml
2015-06-04 00:52:35 +02:00
ulteq
f0849e70ff
Slightly increased the alpha value of the bullet trace effect.
2015-06-02 23:11:44 +02:00
ulteq
16f6650486
Decreased the velocity threshold for the bullet trace effect
2015-06-02 22:38:44 +02:00
ulteq
c3e7129d13
Removed newline brackets
2015-06-02 22:38:12 +02:00
ulteq
52d304e9f9
Increased the protractor size
2015-06-02 22:37:27 +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
gienkov
a173b5b048
TABS
2015-05-31 22:46:32 +02:00
gienkov
212862a401
Merge remote-tracking branch 'origin' into pl-translation-1
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/frag/stringtable.xml
2015-05-31 22:45:09 +02:00
Macusercom
53e0b35c12
German 1 correction for Advanced Ballistics
2015-05-31 20:31:38 +02:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
PabstMirror
84d940e69d
Fix circular dependency - ModuleDescription
2015-05-30 00:31:07 -05:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Macusercom
489751f5aa
More German string fixed
...
As recommended...
2015-05-28 16:21:53 +02:00
jonpas
87db721d4f
Stringtable fixes up to medical
2015-05-27 21:19:14 +02:00
Macusercom
5cb0953094
Fixed German translations
...
Fixed some typos and phrases
2015-05-27 19:11:32 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
esteldunedain
bb99d5a860
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
2015-05-27 12:08:47 -03: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
Grzegorz
d96873b8a0
Fix line ending
2015-05-23 21:16:36 +02:00
gienkov
8ef41b7523
Translate missing frag and adv. ball. strings to PL
2015-05-23 21:16:34 +02:00
jonpas
030b509ec5
Fixed missing close tag in Advanced Ballistics stringtable
2015-05-23 03:34:11 +02:00
ulteq
9536423f2e
Merge pull request #1353 from acemod/cleanup_ATragMX_AB
...
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:09 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
ulteq
7d3bb526dd
Merge pull request #1263 from acemod/bulletTraceTweak
...
Slightly increased the bullet trace effect size
2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0
Slightly decreased the visibility of the bullet trace effect.
2015-05-20 22:12:02 +02:00
Grzegorz
96322fe689
PL translation for new advanced ballistics option
2015-05-20 17:17:08 +02:00
ulteq
c81446400c
Grammar
2015-05-20 10:14:10 +02:00
ulteq
28c8aba9bd
Added missing !
2015-05-19 20:46:55 +02:00
ulteq
57c37ecb9a
Reorder/Rewrite of some advanced ballistics module options:
...
* alwaysSimulateForSnipers -> simulateForSnipers
* alwaysSimulateForGroupMembers -> simulateForGroupMembers
* onlyActiveForLocalPlayers -> simulateForEveryone
2015-05-19 20:46:13 +02:00
Grzegorz
e3aabe2c42
PL translation for new advanced ballistics option
2015-05-19 18:52:17 +02:00
ulteq
8eaf754fdd
Further increased the visibility of the bullet trace effect.
2015-05-18 10:56:34 +02:00
ulteq
4513b02c10
Experiment with the bullet trace effect size
2015-05-17 12:57:55 +02:00
ulteq
96b92ac172
Added a new module option for advanced ballistics:
...
* alwaysSimulateForGroupMembers
2015-05-17 11:45:55 +02:00
ulteq
7474d7f313
Merge pull request #1193 from acemod/getTemperatureAtHeight
...
Moved all temperature calculations into the weather module.
2015-05-14 16:41:16 +02:00