PabstMirror
|
c2d6fa53d4
|
Remove enum warnings (#5931)
|
2017-12-19 12:13:38 -06:00 |
|
classic
|
4e60847c95
|
Update jpn translation (#5930)
* Update Jpn translation
* Update Jpn translation
|
2017-12-19 18:35:49 +01:00 |
|
commy2
|
e2a863751f
|
Arsenal numpad enter for search (#5928)
|
2017-12-19 18:35:32 +01:00 |
|
jonpas
|
47051d9c6d
|
Revert premature version bump
|
2017-12-18 18:03:21 +01:00 |
|
jonpas
|
80165fb9c0
|
Prepare release 3.12.0 (build 2)
|
2017-12-18 17:43:15 +01:00 |
|
jonpas
|
c4637da6af
|
Merge branch 'master' into release-3.12.0
|
2017-12-18 17:40:27 +01:00 |
|
PabstMirror
|
c8b9483b44
|
Nightvision - Add setting for blur when ADS (#5924)
* Nightvision - Add setting for blur when ADS
* Allow blocking brightness control
|
2017-12-18 17:38:03 +01:00 |
|
SilentSpike
|
0a31a24fdf
|
Fix FRIES being applied when attribute unchecked (#5926)
|
2017-12-18 17:30:36 +01:00 |
|
Dystopian
|
1385f12542
|
Add brightness control when NV effects disabled (#5913)
* Add brightness control when NV effects disabled
* Add initial ajust and commit. Add comment to math
* Fix math comment
* Change initial level to -3
|
2017-12-17 13:09:41 -06:00 |
|
rufix
|
8f5ff1363f
|
Revert 3c6136bfaf
|
2017-12-17 12:55:30 +01:00 |
|
rufix
|
2c10265c26
|
Rename M200 back to "Tropisch"
|
2017-12-17 12:46:43 +01:00 |
|
Josuan Albin
|
af09fc652a
|
Add Ctrl+F search shortcut for ACE Arsenal (#5910)
* Add Ctrl+F search shortcut
* Add ctrl+A and ctrl+x support to search boxes
|
2017-12-16 12:33:41 -06:00 |
|
PabstMirror
|
e6683e8077
|
Add slider settings (#5920)
* Add slider settings
* WARNING to INFO
* tweak scopes / adv fatigue
|
2017-12-16 11:51:15 -06:00 |
|
mharis001
|
5371fb9eef
|
Make attach/detach hint look uniform (#5900)
Add space at the bottom of hint to make it look nicer
|
2017-12-16 16:20:43 +01:00 |
|
commy2
|
0eccca6174
|
display carried weight in SI and imperial (#5918)
|
2017-12-16 04:50:17 +01:00 |
|
Josuan Albin
|
7bc396ba24
|
Update how weight is displayed in ACE arsenal (#5909)
|
2017-12-16 04:50:02 +01:00 |
|
Josuan Albin
|
a959ae69fd
|
Revert "Fix global behavior in add / remove virtual items funcs (#5887)" (#5911)
This reverts commit 5fa0179d06.
|
2017-12-15 12:29:09 -06:00 |
|
ulteq
|
f9d729c874
|
Scopes - Fix 'boreHeight' and 'baseAngle' MP synchronization (#5917)
* Scopes - Unify 'getBaseAngle' & 'getBoreHeight' API
* Scopes - Fix boreHeight and baseAngle MP synchronization
* TODO: Cache the calculation or use publicVariables instead
* Cleanup unused GVARs
* Scopes - Cache getBaseAngle and getBoreHeight results
* Sync baseAngle/boreHeight
* Remove boreHeight/Angle caching
* Cleanup inv check
|
2017-12-15 10:22:31 -06:00 |
|
PabstMirror
|
a97dea896f
|
scopes - Fix base angle (#5916)
|
2017-12-15 10:25:00 +01:00 |
|
Andrea Verano
|
2ecc835438
|
Italian Translation Update (#5914)
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes
Fixed some strings in:
-Medical
-Scopes
|
2017-12-14 23:32:51 -06:00 |
|
commy2
|
2f3c43572b
|
dedmen's model fixes
|
2017-12-14 15:51:14 +01:00 |
|
rufix
|
3d1e9ac13e
|
"SIG 556 (Wüstentarn)" -> "SIG 556 (Tarnmuster)"
|
2017-12-14 13:56:48 +01:00 |
|
rufix
|
a4a9f63dfb
|
Removed international names for LSVs, added international names for JAS 39 Gripen
|
2017-12-14 13:49:06 +01:00 |
|
ulteq
|
b77c4d4667
|
Rangecard - Fixes broken bore height display (#5907)
* Reverts the getBoreHeight API change from:91425f8576
|
2017-12-14 13:43:32 +01:00 |
|
rufix
|
b9d8368b1a
|
Schreibe "sandfarben" klein.
|
2017-12-14 13:33:47 +01:00 |
|
rufix
|
2a61ab4bdf
|
Add missing realisticnames to Syndikat vehicles/aircraft.
|
2017-12-14 12:21:23 +01:00 |
|
rufix
|
b8e62af673
|
Add Gryphon/Gripen plane to realisticnames
|
2017-12-14 12:13:00 +01:00 |
|
rufix
|
497fd080ea
|
Add Tanoan Ifrit/Karatel to realisticnames
|
2017-12-14 12:06:10 +01:00 |
|
rufix
|
456f59fc2f
|
Add Tanoan Marid/Otokar ARMA to realisticnames
|
2017-12-14 12:04:37 +01:00 |
|
rufix
|
123c5fce37
|
Add LSVs to realisticnames.
|
2017-12-14 11:56:57 +01:00 |
|
rufix
|
d5b6b70267
|
Add ACE tag to Maverick L strings
|
2017-12-14 11:32:30 +01:00 |
|
rufix
|
22a478019b
|
Add count of rockets in missiles DAR.
|
2017-12-14 11:02:57 +01:00 |
|
rufix
|
5448795226
|
German translations of HK Rifles
|
2017-12-14 10:59:16 +01:00 |
|
rufix
|
3e1ac5e4ed
|
German translation of M200.
|
2017-12-14 10:58:10 +01:00 |
|
rufix
|
7184243251
|
Rename M249 to FN Minimi.
|
2017-12-14 10:57:20 +01:00 |
|
rufix
|
c50a1e5796
|
German translations of Marksman-DLC rifles and MGs
|
2017-12-14 10:54:14 +01:00 |
|
rufix
|
b0e93e10a8
|
Rename "TAR-21 EGLM" to "GTAR-21 EGLM".
|
2017-12-14 10:48:52 +01:00 |
|
rufix
|
9b7ece0ab1
|
Use "ß" in "Weiß" for M83.
|
2017-12-14 10:39:27 +01:00 |
|
rufix
|
3c6136bfaf
|
Rename Germam stromg "ZSU" to "SSU" ("З" is transcribed as "s" in German)
|
2017-12-14 10:34:15 +01:00 |
|
rufix
|
a9e7e31a4b
|
Rename "KamAZ" to "KamAS" in German strings (Russian "З" is transcribed as "s" in German).
|
2017-12-14 10:30:42 +01:00 |
|
rufix
|
023e189786
|
Rename "Punisher" to "Karatel" which seems to be the official name used.
|
2017-12-14 10:29:20 +01:00 |
|
rufix
|
838b4e9945
|
Use "sMG" instead of "SMG" for "schweres Maschinengewehr" (HMG)
|
2017-12-14 10:22:56 +01:00 |
|
PabstMirror
|
0a87bd134b
|
Add cookoff setting category (#5903)
Fix #5902
|
2017-12-13 16:04:05 -06:00 |
|
commy2
|
36626d26d8
|
Merge remote-tracking branch 'origin' into tripd-updates
|
2017-12-13 23:00:26 +01:00 |
|
jonpas
|
18d107508b
|
Merge branch 'master' into release-3.12.0
|
2017-12-12 18:06:24 +01:00 |
|
commy2
|
1a28d69b9e
|
remove obsolete mine jip synch (#5895)
|
2017-12-12 18:01:47 +01:00 |
|
Christian Klemm
|
d83ce62ee8
|
Adjusted dig surface whitelist for jungle maps (#5897)
* Added grasstall to dig surface whitelist
* Added forest to dig surface whitelist
|
2017-12-12 17:20:55 +01:00 |
|
classic
|
51f29b7b37
|
Update Japanese translation (#5891)
* Update Jpn translation
* Update Jpn translation
* Add Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn tranlastion
* Update Jpn tranlation
* Update Jpn translation
* Updatr Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* fix for incorrect indentation
* re-fix incorrect indentation
|
2017-12-12 17:17:51 +01:00 |
|
Jo David
|
952af6fa64
|
Merge pull request #5896 from mharis001/master
Revert slideshow module to scope = 2
|
2017-12-12 17:12:28 +01:00 |
|
mharis001
|
b3c8a243cb
|
Revert slideshow module to scope = 2
Slideshow is mission utility not setting
|
2017-12-12 10:54:48 -05:00 |
|