Commit Graph

6730 Commits

Author SHA1 Message Date
PabstMirror
f2bcd66784 Toolkit also consumed on fullRepair 2015-12-14 19:28:31 -06:00
PabstMirror
e964b2c135 Fix PostRepairDamage and toolkit consumtion setting
Fix #2982
2015-12-08 20:31:40 -06:00
Glowbal
0599b35fc6 Bump version to 3.4.1 2015-12-08 14:47:48 +01: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
9fa62c6d2a clean up vehicles config 2015-12-06 11:18:07 +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
commy2
e418cfcf11 Merge pull request #2935 from acemod/fixbinoculars2
Fix binocular related bugs
2015-12-04 21:27:53 +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
PabstMirror
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
PabstMirror
c928a0d6cb Remove Sleep/WaitUntil from checkPBO
Fix #2910
2015-12-01 22:50:28 -06:00
PabstMirror
419af195e9 #2902 - Remove error and don't exit if veh has no hit points
B_UAV_01_F has no hitpoints and would throw error
Don't exit so "fullRepair" action still gets added
2015-12-01 13:43:27 -06:00
Glowbal
dacfe4d6cb Bump version to 3.4.0 2015-12-01 17:05:08 +01:00
Thomas Kooi
02eee05cf4 Merge pull request #2884 from acemod/speedLimiterUGVFix
fix that in UGV dont work speedLimiter
2015-11-29 12:41:13 +01:00
Thomas Kooi
081106d6a3 Merge pull request #2892 from acemod/TheHidden
Remove nametags and actions on hidden units
2015-11-29 12:38:27 +01:00
bux578
35ecef454f Merge pull request #2825 from gienkov/pl-translation
pl translation
2015-11-29 07:35:04 +01:00
PabstMirror
8d2b612570 Remove nametags and actions on hidden units
Fix #2596
2015-11-28 21:35:25 -06:00
SilentSpike
c426bfc9c1 Merge pull request #2888 from acemod/repairPositions
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
Thomas Kooi
5282e95668 Merge pull request #2876 from acemod/medicalTranslateHP
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
ced94d73a7 Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
2015-11-28 20:51:39 +01:00
Thomas Kooi
d7a19cf0a6 Merge pull request #2882 from acemod/fixUGVNametag
fix UGV Nametag issue
2015-11-28 20:50:23 +01:00
Thomas Kooi
7dd0af33b4 Merge pull request #2871 from acemod/cleanupLaserpointer
cleanup laserpointer
2015-11-28 20:43:31 +01:00
Thomas Kooi
c132ef86cf Merge pull request #2133 from jonpas/dynamicViewDistance
Mk 1 eyeballs Integration
2015-11-28 20:40:29 +01:00
Thomas Kooi
e669f3e2cb Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight
Disable nvgs in sight
2015-11-28 20:37:30 +01:00
gienkov
f25a181d8e fix my error 2015-11-28 20:37:29 +01:00
Thomas Kooi
cef01baf0b Merge pull request #2856 from acemod/isEqualTypeRepalcement
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48 Merge pull request #2886 from acemod/bandageReopen
Add all wound types to bandage treatment configs
2015-11-28 20:32:13 +01:00
SilentSpike
a8cf9c6f48 Fix missing boolean inversion 2015-11-28 13:58:56 +00:00
gienkov
2c83fe4a11 refuel translation fixes 2015-11-28 13:45:59 +01:00
gienkov
a906c180ce remove alpha entries 2015-11-28 13:34:54 +01:00
PabstMirror
a42c2153cc Error handling for bad setting values array 2015-11-28 01:57:15 -06:00
PabstMirror
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
gienkov
adae379445 fixes 2015-11-27 21:55:05 +01:00
gienkov
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
PabstMirror
6031eb8c6e Add all wound types to bandage treatment configs
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
gienkov
7eecff4296 Merge remote-tracking branch 'origin' into pl-translation
Conflicts:
	addons/captives/stringtable.xml
	addons/map_gestures/stringtable.xml
	addons/zeus/stringtable.xml
2015-11-27 21:19:25 +01:00