Commit Graph

9465 Commits

Author SHA1 Message Date
Thomas Kooi
a0ea724db4 Merge pull request #3436 from acemod/register-last-damage-source
Add registering last damage source
2016-02-27 12:42:11 +01:00
Thomas Kooi
adcfec6ff0 Merge pull request #3430 from GitHawk/refuel_ropeImprovement
Refuel improvements
2016-02-27 12:40:50 +01:00
Thomas Kooi
938c1f4c0a Merge pull request #2904 from BaerMitUmlaut/fastroping
Fastroping
2016-02-27 12:36:43 +01:00
System98
05575538e4 Fix format errors in "medical" addon 2016-02-27 12:10:40 +01:00
System98
f7253edec8 Update german translations
- Fix some german translations
- Re-add strings in "medical" addon deleted in PR #3437
- Add german translations for previously deleted strings and update the
english texts so the purpose of the function gets clearer
2016-02-27 12:07:57 +01:00
System98
e03ef5df80 Merge branch 'master' of https://github.com/System98/ACE3 2016-02-27 11:23:36 +01:00
Thomas
e5308fb926 Merge pull request #2 from acemod/master
Update Fork
2016-02-27 11:23:15 +01:00
System98
110dd68736 Fix error in slideshow
- Fix error in slideshow addon
2016-02-27 10:37:52 +01:00
jonpas
9b343c107c Merge pull request #3437 from acemod/German-translations
German translations by @System98
2016-02-27 04:14:00 +01:00
looterz
8b534bb4bf Fixed ACE_Settings.hpp GVAR's missing category 2016-02-26 19:00:55 -06:00
jonpas
0c79869d7a Fix duplicated English strings 2016-02-27 01:43:57 +01:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
Glowbal
e0a65aa543 Add registering last damage source 2016-02-26 22:58:49 +01:00
bux578
db71aa54b8 Merge pull request #3434 from NorXAengell/Traduction-Fr
Traduction fr
2016-02-26 21:18:40 +01:00
bux578
431b6f872c Merge pull request #3433 from licht-im-Norden87/patch-54
German translation
2016-02-26 21:16:54 +01:00
PabstMirror
6e29beefa1 Remove extra "(" in debug output 2016-02-26 12:48:40 -06:00
licht-im-Norden87
a5864c6f40 Merge pull request #42 from licht-im-Norden87/patch-55
refuel
2016-02-26 19:44:50 +01:00
licht-im-Norden87
6a6190b99d Merge pull request #43 from licht-im-Norden87/patch-57
Update stringtable.xml
2016-02-26 19:44:37 +01:00
NorXAengell
0006f72663 Minor correction in explosive 2016-02-26 19:38:51 +01:00
licht-im-Norden87
1c7a25cc38 Update stringtable.xml 2016-02-26 19:36:47 +01:00
licht-im-Norden87
cac13e2f4f refuel 2016-02-26 19:26:34 +01:00
licht-im-Norden87
21766e10c2 German translation
Habe gerade Arma gestartet und dabei ist mir das ein oder andere Problem aufgefallen.
WIP
2016-02-26 19:25:01 +01:00
NorXAengell
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
System98
f8cb5a39a1 Fix error in slideshow
- Fix error in slideshow addon
2016-02-26 19:03:55 +01:00
Githawk
c8e8a17111 Fixes
- Fixed `isEngineOn` returning true on static objects
- Fixed `fnc_readFuelCounter` for objects with infinite fuel
2016-02-26 16:35:34 +01:00
NorXAengell
8b9865b50d Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr 2016-02-26 16:33:04 +01:00
NorXAengell
212d8f45ff Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr 2016-02-26 16:22:00 +01:00
Thomas
70e2d44afc Merge pull request #1 from System98/master
Fix text errors
2016-02-26 11:37:07 +01:00
System98
e587744b3e Fix text errors
- Fix errors in "map_gestures, medical, overheating, slideshow and zeus"
addons
2016-02-26 11:29:55 +01:00
GitHawk
7451d1ee5f Make setFuel and getFuel API 2016-02-26 10:50:02 +01:00
GitHawk
0b324336ee Initial pass
Unified ropeDestruction
Added check before ropeCreate
2016-02-26 10:46:12 +01:00
bux578
704e858d9c Merge pull request #3424 from NorXAengell/Traduction-Fr
Translation Fr Captives
2016-02-26 07:38:05 +01:00
NorXAengell
a5ce95f9c7 Traduction, correction Fr Common 2016-02-26 01:29:37 +01:00
NorXAengell
1870b145c1 Merge pull request #1 from ElTyranos/patch-1
French correction
2016-02-26 01:12:34 +01:00
ElTyranos
a79cfa583d bux578 correction 2016-02-25 23:47:27 +01:00
jonpas
e425483054 Remove redundant line 2016-02-25 23:04:16 +01:00
jonpas
d9179d6907 Improve further 2016-02-25 23:03:40 +01:00
jonpas
133c6beafa Improve GitHub files 2016-02-25 22:50:58 +01:00
Nicolás Badano
7646068a8b Merge pull request #3427 from SuN9491/master
Spanish Translation (3.5.0)
2016-02-25 17:10:55 -03:00
PabstMirror
6a0dc2d48c Merge pull request #3426 from acemod/fixMortarDisplay
Fix Mortar Display
2016-02-25 14:02:49 -06:00
PabstMirror
f59e8920f9 Fix Mortar Display 2016-02-25 13:59:00 -06:00
SuN9491
9efbdb2e71 Spanish Translation (3.5.0)
Remaining spanish translations for ACE 3.5.0
2016-02-25 20:50:29 +01:00
NorXAengell
f2fa46ddf0 Translation Fr Captives 2016-02-25 19:36:44 +01:00
BaerMitUmlaut
a7a157df56 Merge pull request #2 from gienkov/translatefastrop
translate fastroping
2016-02-25 19:09:54 +01:00
gienkov
4a73a0519e translate fastroping 2016-02-25 19:06:50 +01:00
System98
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
bux578
21ba45d0c9 Merge pull request #3421 from gienkov/pltranslation350
Polish translation 3.5.0 (FIXED)
2016-02-25 18:01:01 +01:00
gienkov
8ae1c68d5e remove tabs 2016-02-25 17:20:45 +01:00
gienkov
d4209b2b42 mk6 tagging and overheating translation, finish 2016-02-25 17:16:36 +01:00
Nicolás Badano
333c8f57bc Merge pull request #3419 from acemod/addMissingMedicalSettingCategory
Add missing medical category to delayUnconCaptive
2016-02-25 13:16:23 -03:00