Commit Graph

8409 Commits

Author SHA1 Message Date
68388bc976 add more filters to ammo boxes 2015-12-11 01:02:15 +01:00
bux
8e6a057f52 fix common stringtable 2015-12-10 18:48:00 +01:00
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
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
f3b7b3b94f Merge pull request #2994 from acemod/microDagrListBoxKeyblock
MicroDagr - Prevent Home Key being blocked
2015-12-10 09:20:06 -06:00
a71cce1981 Merge pull request #2987 from acemod/gesturesCleanup
Setting For Gestures - Fix BI* gestures
2015-12-10 09:19:35 -06:00
b7a05e206e Merge pull request #6 from acemod/master
Fork update from master
2015-12-10 18:14:52 +03:00
f0642950e3 Merge pull request #3005 from acemod/cleanupFCS2
code cleanup fcs
2015-12-10 16:05:21 +01:00
077b9827e8 code cleanup fcs 2015-12-10 16:00:14 +01:00
48e9a257f7 Merge pull request #3004 from acemod/markerscleanup2
code cleanup markers
2015-12-10 15:36:04 +01:00
7748131e73 code cleanup markers 2015-12-10 15:32:31 +01:00
f64f4f4c4b Merge pull request #3003 from acemod/tweaklasersize
tweak size of laserpointer - release
2015-12-10 15:27:45 +01:00
a08cf69149 tweak size of laserpointer, fix #2975 2015-12-09 22:56:14 +01:00
e9a669b03b Merge pull request #2996 from havena/patch-1
fix Unexpected stringtable format
2015-12-09 20:42:33 +01:00
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
3ae7cd15bd cleanup stringtable phrasing 2015-12-09 12:27:47 -06:00
3d560108a3 Setting For Gestures - Fix BI* gestures 2015-12-08 23:08:09 -06:00
0eed4799af MicroDagr - Prevent Home Key being blocked
Fix #2974
2015-12-08 21:31:03 -06:00
e964b2c135 Fix PostRepairDamage and toolkit consumtion setting
Fix #2982
2015-12-08 20:31:40 -06:00
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
0599b35fc6 Bump version to 3.4.1 v3.4.1 2015-12-08 14:47:48 +01:00
dec74a9d2d Merge pull request #2964 from acemod/fixUnload
Fix refuel unconc error - Man unloading for air
2015-12-07 19:08:25 -06:00
38bf869f07 Also Fix Rearm 2015-12-07 14:07:03 -06:00
cd68f9b320 Fix refuel unconc error - Man unloading for air 2015-12-07 13:54:41 -06:00
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
39edd205f0 Merge pull request #2942 from acemod/CzechTables
Czech Translations - Update
2015-12-07 09:32:00 -06:00
fbde1dd794 Merge pull request #2941 from acemod/DieStringtables
Update German Stringtables
2015-12-07 10:27:11 +01:00
821ccf5726 fix medical menu stringtable name 2015-12-07 10:21:48 +01:00
af31d43567 fix german typos 2015-12-07 10:20:35 +01:00
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
5237ed15dd Merge pull request #2955 from acemod/configcleanup
Vehicles config cleanup, fix #2897
2015-12-06 11:26:15 +01:00
9fa62c6d2a clean up vehicles config 2015-12-06 11:18:07 +01:00
55f6237b88 Merge pull request #2948 from gienkov/removeOriginal
remove Original entries
2015-12-05 22:33:58 +01:00
f6e7cad678 remove Original entries 2015-12-05 22:08:39 +01:00
b13656e54b addDamageToUnit - Disable debug / testing code 2015-12-05 12:19:34 -06:00
b80a7803c7 Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-12-05 16:00:51 +01:00
a7dff52d6a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-12-05 16:00:23 +01:00
761d6e28d8 Merge pull request #2939 from acemod/fixMicroDagrDefines
MicroDagr - Add #undef to config for pboProject
2015-12-05 11:29:25 +01:00
8e88740730 Merge pull request #2924 from acemod/woundReopeningArray
Don't update openWounds if not bandaged
2015-12-05 11:28:56 +01:00
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
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
f5aae81465 MicroDagr - Add #undef to config for pboProject
#2936
2015-12-04 20:08:30 -06:00
43a168f0b9 Flashbangs - Make event radius match effect radius 2015-12-04 15:16:17 -06:00
e418cfcf11 Merge pull request #2935 from acemod/fixbinoculars2
Fix binocular related bugs
2015-12-04 21:27:53 +01:00
4d20615c29 Merge pull request #2911 from acemod/checkPBOsNonSchedul
Remove Sleep/WaitUntil from checkPBO
2015-12-04 21:24:42 +01:00
5d43fa93c6 fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933 2015-12-04 19:37:37 +01:00
875b3980ac Don't update openWounds if not bandaged
Fix #2921
2015-12-03 15:23:38 -06:00
91ace4fc9b Fix whitelist string -> array error in checkPbo
Fix #2913
Use splitString instead of call compile to convert string into an array
2015-12-02 23:58:41 -06:00
c928a0d6cb Remove Sleep/WaitUntil from checkPBO
Fix #2910
2015-12-01 22:50:28 -06:00
deb87ef968 Update readme for 3.4 2015-12-01 16:54:01 -06:00