PabstMirror
8bdd5d0597
Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge
2015-12-31 14:30:29 -06:00
licht-im-Norden87
2d64d54d98
Update German Stringtable
...
Iam sure there was a translation some time ago. Someone must have deleted it.
spelling mistake
Update Stringtable
100% some of them already existed in german language
Update stringtable.xml
spelling mistake
Update stringtable.xml
Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.
Update stringtable.xml
2015-12-31 14:17:13 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06:00
Thomas Kooi
40afa45417
Merge pull request #3058 from freghar/isturnedout
...
fix inverted isTurnedOut for map lighting
2015-12-31 13:03:42 +01:00
Garth "L-H" de Wet
5f7bbd823f
Merge pull request #3085 from acemod/tripwireEnhancement
...
Explosive enhancements
2015-12-31 11:37:43 +02:00
bux
23bec6d9a8
Merge master into branch
2015-12-31 10:20:47 +01:00
Thomas Kooi
b0b0cc2a39
Merge pull request #3086 from acemod/removeObsoleteHotkey
...
Remove obsolete hotkey entries
2015-12-30 15:43:40 +01:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
bux
d6c5643790
improve code style
2015-12-30 09:43:19 +01:00
bux
2a6042bf61
add interaction position and defuse object position
...
and reduce interaction distance
2015-12-30 09:11:57 +01:00
bux
112c002b0b
remove ace_offset entry
...
Ported from AGM and simply renamed. It wasn't even used in AGM.
2015-12-29 20:57:55 +01:00
SilentSpike
d36543d3a9
Merge pull request #3069 from GitHawk/rearm
...
Fix scope of rearm dummy objects
2015-12-22 18:42:52 +00:00
Githawk
2432ac3319
Changed scope for carried objects
2015-12-22 17:54:16 +01:00
Githawk
499301e73e
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-12-22 17:53:15 +01:00
Thomas Kooi
792da96a5f
Merge pull request #3065 from acemod/tabs-are-our-enemy
...
Tabs are our enemy
2015-12-21 17:08:30 +01:00
Glowbal
e828076377
Add error on tab in sqf files to sqf validator
2015-12-21 17:06:04 +01:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
jokoho48
0addb592d3
remove Unused Varaible in AB
...
fix private in AB
2015-12-21 02:29:10 +01:00
freghar
a383da5b2d
fix inverted isTurnedOut for map lighting
...
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).
Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
Jonathan Pereira
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
Jonathan Pereira
db7074b6cf
Removed duplicated German entry
2015-12-18 14:45:20 -02:00
Jonathan Pereira
ef12439ca8
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-12-18 14:30:58 -02:00
Jonathan Pereira
40b717fd94
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-12-18 14:02:02 -02:00
Thomas Kooi
90387eaf5b
Merge pull request #3023 from acemod/disablestaminabar
...
add function to retrieve the control of the stamina bar
2015-12-16 10:39:26 +01:00
Thomas Kooi
c911fcdafc
Fix travis configuration
...
Travis yml was using invalid notification configuration for slack.
2015-12-14 14:08:50 +01:00
Thomas Kooi
ef1d7f4fdb
Change Travis notifications on success disabled
...
We only need to know if a build failed, since that is when action needs to be taken
2015-12-14 12:42:37 +01:00
Glowbal
c689cbfdfe
Add release branch to travis
2015-12-13 15:41:37 +01:00
Glowbal
f485ae41b1
Add travis notification for private slack
2015-12-13 15:39:33 +01:00
Glowbal
d159c2738c
Fix travis notifications
2015-12-13 14:56:04 +01:00
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
[OMCB]kaban
aec2c3fef2
HotFix: removed duplicated key.
...
Removed duplicated German key for STR_ACE_Common_DoNotForce.
It caused Tabler.exe couldn't read stringtable files.
2015-12-10 18:24:28 +03:00
[OMCB]kaban
b7a05e206e
Merge pull request #6 from acemod/master
...
Fork update from master
2015-12-10 18:14:52 +03:00
bux578
e9a669b03b
Merge pull request #2996 from havena/patch-1
...
fix Unexpected stringtable format
2015-12-09 20:42:33 +01:00
havena
6f0568c370
fix Unexpected stringtable format
...
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
2015-12-09 20:18:15 +01:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
Glowbal
0599b35fc6
Bump version to 3.4.1
2015-12-08 14:47:48 +01:00
PabstMirror
dec74a9d2d
Merge pull request #2964 from acemod/fixUnload
...
Fix refuel unconc error - Man unloading for air
2015-12-07 19:08:25 -06:00
PabstMirror
38bf869f07
Also Fix Rearm
2015-12-07 14:07:03 -06:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
Thomas Kooi
05c56f73b5
Change disable NVG with sights by default
...
As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.
2015-12-07 18:33:20 +01:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
fbde1dd794
Merge pull request #2941 from acemod/DieStringtables
...
Update German Stringtables
2015-12-07 10:27:11 +01:00
bux578
821ccf5726
fix medical menu stringtable name
2015-12-07 10:21:48 +01:00
bux578
af31d43567
fix german typos
2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
commy2
5237ed15dd
Merge pull request #2955 from acemod/configcleanup
...
Vehicles config cleanup, fix #2897
2015-12-06 11:26:15 +01:00
commy2
9fa62c6d2a
clean up vehicles config
2015-12-06 11:18:07 +01:00
Joko
55f6237b88
Merge pull request #2948 from gienkov/removeOriginal
...
remove Original entries
2015-12-05 22:33:58 +01:00
gienkov
f6e7cad678
remove Original entries
2015-12-05 22:08:39 +01:00
