commy2
03b8e2b590
fix reloadMutex nil, fix#3450
2016-02-28 06:12:40 +01:00
Thomas Kooi
f758a90351
Merge pull request #3445 from acemod/preventSelfIMFromClosing
...
Prevent Self Interact Menu from bugging out during animations
2016-02-27 20:35:18 +01:00
Thomas Kooi
d0b1ac56ba
Merge pull request #3440 from System98/Update-german-translations
...
Update german translations
2016-02-27 20:33:51 +01:00
Thomas Kooi
6f4c3483cb
Merge pull request #3444 from ElTyranos/patch-4
...
Fastrope French translation
2016-02-27 20:32:53 +01:00
esteldunedain
a86bbdb162
Prevent the interact menu from closing when moving the mouse during animations
2016-02-27 15:47:23 -03:00
ElTyranos
9d50812a65
Fastrope French translation
2016-02-27 19:46:15 +01:00
esteldunedain
121663226c
Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases.
2016-02-27 15:44:53 -03:00
commy2
a7ec4d9d2f
Merge pull request #3398 from acemod/fix3317
...
Resync mine orientations in JIP.
2016-02-27 16:52:53 +01:00
Thomas Kooi
a9fa3a99b8
Merge pull request #3441 from acemod/fixNametagsError
...
Fix error in nametags when a player disconnects
2016-02-27 15:17:15 +01:00
esteldunedain
30d62859dc
Fix error in nametags when a player disconnects
2016-02-27 10:17:26 -03:00
esteldunedain
188941a9b7
Filter the GVAR(explosivesOrientations) list before sending it
2016-02-27 10:07:51 -03:00
esteldunedain
fba1a322ac
Yet more fixes
2016-02-27 09:50:44 -03:00
esteldunedain
823eb116ae
more fixes
2016-02-27 09:37:57 -03:00
esteldunedain
8280335d07
Fix event name typo
2016-02-27 09:26:42 -03:00
esteldunedain
b9e1028f23
Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317
2016-02-27 09:14:16 -03:00
esteldunedain
834cbb4d24
Debug stuff
2016-02-27 09:14:07 -03:00
esteldunedain
849fa4f1ee
Redo markers, lost in the merge
2016-02-27 09:06:19 -03:00
System98
df3ec3a179
Fix length of a display name
...
- Fix the length of a display name so it doesn't get cut off in the
settings.
2016-02-27 12:51:32 +01:00
System98
a13b029b4a
Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations
2016-02-27 12:50:07 +01:00
esteldunedain
db4974eae2
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317
...
Conflicts:
addons/medical/CfgEden.hpp
addons/repair/CfgEden.hpp
2016-02-27 08:48:57 -03:00
Thomas Kooi
ae136af2d6
Merge pull request #3415 from looterz/bftplayernames
...
Added Show Player Names option to Blue Force Tracking Module
2016-02-27 12:43:15 +01:00
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
