Commit Graph

215 Commits

Author SHA1 Message Date
c0c6d3c52f Merge branch 'release' into fixFastropeRepairError 2016-02-29 12:10:34 -06:00
e5b79d7b33 Don't try adding repair actions to fastrope helper 2016-02-28 14:17:14 -06:00
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
48d312cb8e Add german translations
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
2016-02-25 18:10:26 +01:00
3fa3512509 Remaining spanish translations 2016-02-25 12:25:42 -03:00
7cf912222b Merge pull request #3393 from acemod/3denReplaceDropDown
Fix 3den attributes
2016-02-23 17:09:03 -06:00
aa8d3a3fd0 Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis
Unified ellipsis
2016-02-23 08:27:28 +01:00
74ea79e2cc Unified ellipsis 2016-02-22 23:51:47 +01:00
330792ba7a Add medic threeden control 2016-02-22 11:26:32 -06:00
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart
precompile on game start
2016-02-22 16:00:19 +01:00
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
ed96307f2f 3den repair - Replace bad combo with custom control 2016-02-22 02:50:20 -06:00
2467fa7b0c Fix empty callbacks in medical/repair 2016-02-21 11:34:25 -06:00
8b932fd5a0 Fix some undefined functions / strings 2016-02-20 16:58:45 -06:00
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
fc3bb0de6b Fix #3355 - add missing semi-colons 2016-02-19 18:51:25 -06:00
5d0d8576ea Merge pull request #3288 from SzwedzikPL/edenassignsettings
Repair & medical object attributes for eden editor
2016-02-19 11:47:26 +01:00
0c80551fd8 ace attribute category, lower case classes 2016-02-10 01:17:18 +01:00
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
3bfac35b65 ace repair and medical attributes 2016-02-07 23:56:45 +01:00
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
7258a0084a Merge pull request #2995 from acemod/repairThreshholdToolkit
Fix PostRepairDamage and toolkit consumtion setting
2015-12-14 19:30:19 -06:00
f2bcd66784 Toolkit also consumed on fullRepair 2015-12-14 19:28:31 -06:00
ee0812ad15 RHS Compat - Combine all ERA Hitpoints
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
2015-12-10 20:57:23 -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
39edd205f0 Merge pull request #2942 from acemod/CzechTables
Czech Translations - Update
2015-12-07 09:32:00 -06: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
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
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
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +01:00
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +01:00
5e41643cff fix pushBack capitalization 2015-11-30 17:21:28 +01:00
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
c426bfc9c1 Merge pull request #2888 from acemod/repairPositions
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
0ffb9ea5ad Define custom repair points for a few vehicles
Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.
2015-11-27 20:06:57 +00:00