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
KoffeinFlummi
058d3e0e02
Remove superfluous ##s
2017-12-13 22:03:00 +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
jonpas
047591bc2b
Prepare release 3.12.0
2017-12-12 12:40:41 +01:00
jonpas
57da8c3ad0
Fix Mikero tools detection not looking at Wow6432Node
2017-12-12 12:40:33 +01:00
commy2
4319b79b45
use ownerEvent instead of game logics
2017-12-11 20:11:21 +01:00
PabstMirror
2aaef9e791
Fix some undefined funcs / strings ( #5889 )
...
* fix missing respawn func / spectator string
* fix readSettingsFromParamsArray, cleanup spec event
* cleanup usless if statement
2017-12-11 13:10:30 -06:00
Dystopian
d234fd33a0
Add category for laserpointer and reload settings ( #5879 )
2017-12-10 14:57:17 -06:00
Josuan Albin
a28a06a082
Fix ACE arsenal missing string and unused code in buttonHide ( #5890 )
...
* Add missing ACE_Arsenal_CantOpenDisplay string
* Remove unused code in buttonHide
2017-12-10 14:48:47 -06:00
SilentSpike
c1045e4266
Update vanilla zeus functions ( #5888 )
...
* Cleanup zeus module
* Update zeus BI functions
* Restore accidentally removed setting check
2017-12-10 12:29:38 -06:00
PabstMirror
be67cf0737
Transfer old client settings to CBA ( #5882 )
...
* Transfer old client settings to CBA
* Remove cleanup code
2017-12-10 12:13:17 -06:00
commy2
a38afac04b
spotting scope updates ( #5880 )
...
* add tanoha forces spotting scopes and add preview picture
* factory standard preview picture...
* spotting scope damage materials, hide damage anim, buff hp
* delete unused model
* make ai call out spotting scope, proper thread and cost, better icon
* spotting scope death effects
* disable smoke effect
2017-12-10 12:01:27 -06:00
Josuan Albin
5fa0179d06
Fix global behavior in add / remove virtual items funcs ( #5887 )
2017-12-10 11:53:51 -06:00
commy2
fdd5f8a2a1
add preview picture for tripod
2017-12-10 15:12:14 +01:00
SilentSpike
845f3656d4
Remove deprecated functionality for 3.12.0 ( #5878 )
...
* Remove deprecated functionality for 3.12.0
* Remove associated deprecated module icon
* Restore a dummy version of old module
This is just to prevent existing missions from breaking due to a missing
object.
2017-12-10 13:38:32 +00:00
rufix
7c4adee2e7
Prepare for merging with #5773 .
2017-12-10 11:41:05 +01:00
PabstMirror
2a448577bb
Fix bofor realistic name UBC ( #5884 )
2017-12-09 23:47:07 -06:00
commy2
fa61cd3643
improve repair item editor preview images ( #5883 )
2017-12-09 20:51:45 -06:00
PabstMirror
61c99cb5d8
Attempt to make enum errors more clear ( #5876 )
...
* Add note to enum script error
* Bump Arma/CBA versions
* req 1.78
2017-12-08 21:39:35 -06:00
jonpas
82f3a57e22
Use ACRE2 add display passthrough keys API in spectator ( #5735 )
...
* Use ACRE2 add display passthrough keys API
* Assure backwards compatibility with older ACRE2 versions
2017-12-08 23:08:30 +00:00
Dedmen Miller
18d4b9660d
Add endRadioTransmissions Event ( #5873 )
...
* Add endRadioTransmissions Event
* Update fnc_endRadioTransmission.sqf
2017-12-08 10:44:24 -06:00
ulteq
77fd2007ea
Advanced Ballistics - Fixed faulty wind attenuation ( #5869 )
...
* Advanced Ballistics - Fixed faulty wind attenuation
* Only relevant at very low altitudes above ground (below 1.6 m)
* Also fixes the Kestrel 4500 readout
* Kestrel 4500 - Minor optimization / fix
* Avoids possible math error 'ln(0)'
* Rebuild Dills
2017-12-08 10:44:12 -06:00
jonpas
534898a680
Remove dash from Arsenal category name ( #5874 )
2017-12-08 16:01:58 +01:00
commy2
d1cc7cc12b
Add compass control to spectator ( #5870 )
2017-12-07 22:09:19 +00:00
commy2
44912253af
Merge pull request #5864 from acemod/avoid-setCaptive
...
replace usage of setCaptive with camouflageCoef trait
2017-12-07 23:08:37 +01:00
commy2
24214fc576
Add zeus-like compass control to common ( #5860 )
2017-12-07 21:51:57 +00:00
SilentSpike
c15966c79a
Fix draw3D in specator free camera when perma-dead ( #5868 )
...
This is a weird engine behaviour where draw3D doesn't work if the
current camera unit is not alive (or going to respawn), so we switch to
a temporary agent unit while in free camera to work around this edge
case.
2017-12-07 21:45:30 +00:00
PabstMirror
6a6b03eb57
Fix undefined var
2017-12-07 12:45:59 -06:00
commy2
2ca398ea71
Merge branch 'master' into avoid-setCaptive
2017-12-07 19:11:09 +01:00
Dystopian
36b61fdb6e
Block adv. throwing when player is busy ( #5534 )
...
* Add throw blocking status effect
* Add concertina_wire and tripod support
* Add launcher in hands support
* Disable effect sending more than once
* Fix EFUNC using, add trace
* Disable vanilla throw blocking
* Improve status handling
* Fix rearm status key
2017-12-07 11:26:21 -06:00
commy2
235315e4ef
Merge pull request #5867 from acemod/spare-items-3den-settings
...
3den attribute for spare items in cargo
2017-12-07 18:25:44 +01:00
commy2
cec440c3b1
fix repair item damage, hide spare item module
2017-12-07 18:01:31 +01:00
commy2
bb05037a4d
3den attribute for spare items in cargo
2017-12-07 15:29:54 +01:00
Jo David
f987eb4159
Merge pull request #5866 from acemod/nvgCat
...
Remove dash from NV category name
2017-12-07 13:57:36 +01:00
SilentSpike
753f0c8914
Remove dash from NV category name
2017-12-07 11:27:08 +00:00
commy2
c7119c5575
Merge pull request #5865 from acemod/fix-stringtable
...
remove duplicate japanese entry
2017-12-07 11:07:09 +01:00
bux
9b15464af6
remove duplicate japanese entry
2017-12-07 10:07:52 +01:00
