commy2
c45523475f
manual merge
2016-02-22 16:06:30 +01:00
commy2
0f7bfc0f66
Merge pull request #3389 from acemod/precompileongamestart
...
precompile on game start
2016-02-22 16:00:19 +01:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
bux578
55a6ef1937
Merge pull request #3367 from licht-im-Norden87/patch-43
...
Update German Stringtable
2016-02-22 08:26:23 +01:00
commy2
f4a985fdfd
Merge pull request #3345 from acemod/jrCompat338
...
Add flashsupressor to asdg_MuzzleSlot_338
2016-02-21 23:46:50 +01:00
commy2
dd10fac470
use DisplayLoad for main menu box and to disable options when world=Empty
2016-02-21 23:28:02 +01:00
commy2
9ac1f8fc47
use DisplayLoad for turretDisplayLoaded event
2016-02-21 23:13:26 +01:00
commy2
4c0a817ba8
use precompiled function for optics display
2016-02-21 22:56:35 +01:00
commy2
e1db193099
remove unused config and remove some wrong base classes
2016-02-21 22:50:15 +01:00
commy2
2b9518bf81
use precompiled function for vector display
2016-02-21 22:41:11 +01:00
commy2
da0d37ed0d
remove commented out code
2016-02-21 22:31:14 +01:00
commy2
3f855298e2
remove unused mapDisplayLoaded event and ACE_dlgMap variable
2016-02-21 22:23:46 +01:00
commy2
f43e88ff25
replace zeusDisplayChanged with DisplayLoad event
2016-02-21 22:16:12 +01:00
commy2
4335bfbfcf
replace inventoryDisplayLoaded with DisplayLoad event
2016-02-21 21:24:39 +01:00
commy2
e9808bf20b
remove unused PFH check
2016-02-21 20:42:06 +01:00
commy2
5e486869c0
replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)
2016-02-21 20:26:30 +01:00
licht-im-Norden87
4036dcaa8e
Update stringtable.xml
2016-02-21 20:05:26 +01:00
licht-im-Norden87
62dc2ffd06
Update stringtable.xml
2016-02-21 20:04:32 +01:00
licht-im-Norden87
3c8b3031d8
Update stringtable.xml
2016-02-21 19:59:06 +01:00
licht-im-Norden87
ce97916fbf
Update stringtable.xml
2016-02-21 19:55:08 +01:00
licht-im-Norden87
574a6a32ea
Update stringtable.xml
2016-02-21 19:54:24 +01:00
PabstMirror
2467fa7b0c
Fix empty callbacks in medical/repair
2016-02-21 11:34:25 -06:00
commy2
5dcb8707dd
Merge pull request #3359 from gienkov/edenadditions
...
integrate captivity modules with 3DEN
2016-02-21 12:44:39 +01:00
bux
38c1b45fb9
properly fix the medical translation file
2016-02-21 11:41:53 +01:00
PabstMirror
3d4602e461
Add all joint muzzles and remove from ballistics
2016-02-20 20:03:10 -06:00
PabstMirror
3fbd6cff18
Merge pull request #3368 from acemod/fixNils
...
Fix some undefined functions / strings
2016-02-20 19:49:07 -06:00
Nicolás Badano
d7403976aa
Merge pull request #3337 from acemod/overheatingSilencers
...
Substantially increase overheating when using silencers or flash suppresors
2016-02-20 22:06:19 -03:00
licht-im-Norden87
360c35dc9c
Update stringtable.xml
2016-02-21 02:04:58 +01:00
licht-im-Norden87
0a0400a7a2
deleted all lines exept for 2 because of obvious reason.
2016-02-21 02:03:30 +01:00
Glowbal
ea113b8e61
Fix duplicate {
2016-02-21 01:04:12 +01:00
Glowbal
7d063d4dee
Merge branch 'master' into medical-focus-feature
...
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
commy2
f5ef7b6b2d
displayLoad xeh for imenu
2016-02-21 00:36:46 +01:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
licht-im-Norden87
a977715460
Merge pull request #37 from licht-im-Norden87/patch-49
...
Viewdistance
2016-02-20 23:54:10 +01:00
licht-im-Norden87
82a938113c
Merge pull request #39 from licht-im-Norden87/patch-47
...
hearing
2016-02-20 23:54:04 +01:00
licht-im-Norden87
a4d0c219ac
Merge pull request #40 from licht-im-Norden87/patch-51
...
switchunits
2016-02-20 23:53:52 +01:00
licht-im-Norden87
fb20492573
switchunits
2016-02-20 23:53:02 +01:00
licht-im-Norden87
593ae5495e
Merge pull request #38 from licht-im-Norden87/patch-48
...
interaction
2016-02-20 23:46:17 +01:00
licht-im-Norden87
5996f50490
Merge pull request #36 from licht-im-Norden87/patch-50
...
finger
2016-02-20 23:46:11 +01:00
licht-im-Norden87
50dc6ec341
finger
...
Iam not happy with my translation in any way.
"Zeige Zeiger" sounds terrible
"Zeige Fingerzeig (middlefinger)" can be misunderstood
(maybe there is a nice solution Iam not aware of.) This is truely a pain in the ass
2016-02-20 23:43:16 +01:00
licht-im-Norden87
747cd8c4cf
Viewdistance
2016-02-20 23:33:12 +01:00
licht-im-Norden87
91bdceead6
interaction
2016-02-20 23:27:32 +01:00
licht-im-Norden87
5569790e0b
hearing
2016-02-20 23:25:19 +01:00
licht-im-Norden87
7f2dfe1749
Merge pull request #35 from licht-im-Norden87/patch-46
...
explosives
2016-02-20 23:20:21 +01:00
licht-im-Norden87
d4cca14929
explosives
2016-02-20 23:19:51 +01:00
licht-im-Norden87
83e17e293b
Merge pull request #33 from licht-im-Norden87/patch-45
...
common
2016-02-20 23:08:47 +01:00
licht-im-Norden87
5294527daa
Merge pull request #32 from licht-im-Norden87/patch-44
...
cargo
2016-02-20 23:07:59 +01:00
licht-im-Norden87
cdb58b6233
common
2016-02-20 23:06:29 +01:00
licht-im-Norden87
b41efc39ff
cargo
2016-02-20 23:02:02 +01:00
licht-im-Norden87
073a476ed1
Update German Stringtable
...
Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)
2016-02-20 22:57:45 +01:00
