VKing
73720f9313
Too hasty
2015-12-20 18:20:34 +01:00
VKing
b7bd468fdd
That ought to not have worked before
2015-12-20 18:18:33 +01:00
VKing
450a18e13a
Forgot to disable in case the setting's set to "no" (but why would you ever want to
2015-12-19 21:29:37 +01:00
VKing
f75311917c
Upped mortar round mass
2015-12-19 20:49:09 +01:00
VKing
b4cb5c2ba7
Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init.
2015-12-19 19:54:45 +01:00
VKing
85270e4521
Fix init issue
2015-12-19 18:22:54 +01:00
VKing
a37d97103f
Erk
2015-12-19 16:37:30 +01:00
VKing
a336707623
Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars)
2015-12-19 16:30:01 +01:00
VKing
dfe7c07936
Fix fnc_mortarInit, fnc_loadMagazine, some other stuff
2015-12-19 12:10:12 +01:00
VKing
901f55802c
Merge remote-tracking branch 'origin/Mortar_interact' into Mortar_interact
...
Conflicts:
addons/mk6mortar/CfgEventHandlers.hpp
2015-12-19 02:21:31 +01:00
VKing
2c4a25a6c0
Mortar init functions
2015-12-19 02:18:35 +01:00
VKing
c3788e8038
Changed to postInit
2015-12-17 23:35:02 +01:00
VKing
579f861b8f
Unload to player inventory
2015-12-17 19:25:22 +01:00
VKing
27890a8dab
First try at some module control
2015-12-17 11:00:46 +01:00
VKing
a0fdc58ed7
Remove unused variables, spaces
2015-12-17 09:13:23 +01:00
VKing
d8c8d02177
Port inventory picture and model
2015-12-17 00:21:54 +01:00
VKing
e0a21ce144
Completed code porting and interaction
2015-12-16 23:47:14 +01:00
VKing
3e6fc52733
First working iteration.
...
Todo:
Implement in module (Choose new or old/don't break old missions)
Magazine UI+model
Add preparing delay
Fix function readmes
Cleanup in functions?
Credits
MP Testing
2015-12-16 20:22:18 +01:00
VKing
170095ae35
Initial commit for mortar ammunition handling.
2015-12-13 18:27:13 +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
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
PabstMirror
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
Thomas Kooi
761d6e28d8
Merge pull request #2939 from acemod/fixMicroDagrDefines
...
MicroDagr - Add #undef to config for pboProject
2015-12-05 11:29:25 +01:00
Thomas Kooi
8e88740730
Merge pull request #2924 from acemod/woundReopeningArray
...
Don't update openWounds if not bandaged
2015-12-05 11:28:56 +01:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
PabstMirror
f5aae81465
MicroDagr - Add #undef to config for pboProject
...
#2936
2015-12-04 20:08:30 -06:00
PabstMirror
43a168f0b9
Flashbangs - Make event radius match effect radius
2015-12-04 15:16:17 -06:00
commy2
e418cfcf11
Merge pull request #2935 from acemod/fixbinoculars2
...
Fix binocular related bugs
2015-12-04 21:27:53 +01:00
commy2
4d20615c29
Merge pull request #2911 from acemod/checkPBOsNonSchedul
...
Remove Sleep/WaitUntil from checkPBO
2015-12-04 21:24:42 +01:00
commy2
5d43fa93c6
fix FUNC(binocularMagazine), fix #2916 , fix #2917 , fix #2918 , fix #2922 , fix #2928 , fix #2933
2015-12-04 19:37:37 +01:00
PabstMirror
875b3980ac
Don't update openWounds if not bandaged
...
Fix #2921
2015-12-03 15:23:38 -06:00