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 |
|
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 |
|
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 |
|
ElTyranos
|
a79cfa583d
|
bux578 correction
|
2016-02-25 23:47:27 +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
|
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 |
|
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 |
|
jonpas
|
6ad107ecc0
|
Add medical category to delayUnconCaptive
|
2016-02-25 17:03:38 +01:00 |
|
gienkov
|
04f714e53c
|
Merge remote-tracking branch 'origin/master' into pltranslation350
|
2016-02-25 16:41:09 +01:00 |
|
gienkov
|
25561ab2c5
|
hearing and medical, unwind medical pl shorts
|
2016-02-25 16:31:47 +01:00 |
|
Nicolás Badano
|
69a3c79756
|
Merge pull request #3418 from acemod/spanishTranslation3.5.0
Remaining Spanish translations
|
2016-02-25 12:28:30 -03:00 |
|
esteldunedain
|
3fa3512509
|
Remaining spanish translations
|
2016-02-25 12:25:42 -03:00 |
|
PabstMirror
|
3b03f84116
|
Disable debug
|
2016-02-25 09:12:24 -06:00 |
|
looterz
|
859a4321c6
|
Actually, nevermind that last commit
|
2016-02-25 09:03:30 -06:00 |
|
jonpas
|
8375694368
|
Merge pull request #3403 from acemod/fixCargoEventsParams
Reimplement old parameter syntax for (Un)LoadCargo events
|
2016-02-25 16:01:57 +01:00 |
|
looterz
|
e6314eb114
|
Wrapped _groupsToDrawMarkers filtering with a condition check
|
2016-02-25 09:00:47 -06:00 |
|
esteldunedain
|
2fc27c553f
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spanishTranslation3.5.0
|
2016-02-25 11:47:10 -03:00 |
|
esteldunedain
|
64a62d65fc
|
More spanish translations
|
2016-02-25 11:46:56 -03:00 |
|
bux578
|
ed05d2f1e7
|
Merge pull request #3414 from acemod/spanishTranslation3.5.0
Spanish translation3.5.0
|
2016-02-25 15:45:38 +01:00 |
|
jonpas
|
b2b781957f
|
Reimplement old parameter syntax for (Un)LoadCargo events
|
2016-02-25 15:35:47 +01:00 |
|
looterz
|
b354fed39a
|
Moved _playersToDrawMarkers into BFT_ShowPlayerNames code region
|
2016-02-25 08:35:33 -06:00 |
|
looterz
|
00f06f81d1
|
Added Show Player Names option to Blue Force Tracking Module
|
2016-02-25 07:57:32 -06:00 |
|
esteldunedain
|
71707bc81a
|
Some spanish translations for 3.5.0
|
2016-02-25 10:54:19 -03:00 |
|
jonpas
|
36d5c40b06
|
Merge pull request #3411 from GitHawk/refuel_api
Refuel change documentation header for API fnc
|
2016-02-25 14:52:25 +01:00 |
|
Nicolás Badano
|
23d35cf9f7
|
Merge pull request #3412 from GitHawk/rearm_api
Rearm added API
|
2016-02-25 10:42:28 -03:00 |
|
Nicolás Badano
|
da46a1c0cd
|
Merge pull request #3408 from acemod/moduleDescriptions
Cleanup some module descriptions
|
2016-02-25 09:56:31 -03:00 |
|
Nicolás Badano
|
d02a590886
|
Merge pull request #3406 from acemod/diePurista
Replace Purista with Roboto - everywhere
|
2016-02-25 09:56:16 -03:00 |
|
Nicolás Badano
|
91e671085e
|
Merge pull request #3371 from acemod/moreSevereJamming
More severe jamming
|
2016-02-25 09:56:08 -03:00 |
|
Nicolás Badano
|
d037512c81
|
Merge pull request #3405 from acemod/3k404
remove unused non API functions
|
2016-02-25 09:55:22 -03:00 |
|
Nicolás Badano
|
ae2ce0eebc
|
Merge pull request #3124 from acemod/delayUnconCaptiv
add delay to Unconsciousness Captivity
|
2016-02-25 09:54:27 -03:00 |
|
bux578
|
6070d29f59
|
Merge pull request #3386 from licht-im-Norden87/patch-53
German translation Update: MK6 Mortar
|
2016-02-25 13:38:42 +01:00 |
|
GitHawk
|
6deecb0559
|
Add missing bracket
|
2016-02-25 10:25:57 +01:00 |
|
GitHawk
|
2f183548b6
|
Added API
|
2016-02-25 10:18:31 +01:00 |
|
GitHawk
|
5af31f6bb3
|
Remove brackets
|
2016-02-25 10:11:28 +01:00 |
|
GitHawk
|
53457cfe61
|
Change documentation header for API fnc
|
2016-02-25 10:08:20 +01:00 |
|
jonpas
|
1402985133
|
Fix typos
|
2016-02-24 19:34:03 +01:00 |
|
jonpas
|
a3d769c410
|
Cleanup some module descriptions, close #2561
|
2016-02-24 19:22:16 +01:00 |
|
jonpas
|
804456c722
|
Sort requiredAddons alphabetically
|
2016-02-24 18:35:52 +01:00 |
|
PabstMirror
|
8cb1546569
|
Add threeden to required addons and vers to 1.56
|
2016-02-24 10:52:34 -06:00 |
|
Nicolas Diego Badano
|
5af4e1ca25
|
Fix trace
|
2016-02-24 12:17:48 -03:00 |
|
Nicolas Diego Badano
|
c6f6e4e9f7
|
Let this finally fix it please
|
2016-02-24 12:14:47 -03:00 |
|
jonpas
|
8f775dfba4
|
Rename FontCSE macro to FONT_ACE
|
2016-02-24 15:08:54 +01:00 |
|
jonpas
|
7f022eda00
|
Replace Purista with Roboto - everywhere, close #3401
|
2016-02-24 15:06:27 +01:00 |
|
commy2
|
02b2a21300
|
remove unused non API functions
|
2016-02-24 10:10:31 +01:00 |
|
commy2
|
8233661d55
|
remove unused non API functions
|
2016-02-24 09:39:39 +01:00 |
|
PabstMirror
|
7cf912222b
|
Merge pull request #3393 from acemod/3denReplaceDropDown
Fix 3den attributes
|
2016-02-23 17:09:03 -06:00 |
|
PabstMirror
|
a437326032
|
Merge pull request #3400 from acemod/fixLampUnload
Fix lamp unloading
|
2016-02-23 17:07:31 -06:00 |
|
esteldunedain
|
b2c672e6c7
|
Apply the same pattern to ACE_Markers
|
2016-02-23 19:32:39 -03:00 |
|
esteldunedain
|
b32732cad0
|
Delete the logic and group after used
|
2016-02-23 19:29:18 -03:00 |
|
esteldunedain
|
66fa18888e
|
Use the logic directly to determine client
|
2016-02-23 18:53:33 -03:00 |
|
Nicolás Badano
|
b55648ccb4
|
Merge pull request #3402 from acemod/fixCutG
Fix #3334 replace Purista with Roboto in cargo menu
|
2016-02-23 18:48:06 -03:00 |
|
commy2
|
b08ae7a266
|
Merge pull request #3395 from acemod/cba23compile
Cleanup old cba SLX_XEH_COMPILE_NEW code
|
2016-02-23 22:43:42 +01:00 |
|
jonpas
|
60fba483fe
|
Fix #3334 replace Purista with Roboto in cargo menu
|
2016-02-23 22:30:15 +01:00 |
|
jonpas
|
168ec5344d
|
Fix #3363 lamp unloading bug, Correct cargo menu button classnames
|
2016-02-23 22:17:36 +01:00 |
|
Thomas Kooi
|
52108b1737
|
Merge pull request #3382 from acemod/doAnimEvents
ObjectEvent Func, swap execRemoteFnc in doAnim
|
2016-02-23 18:38:43 +01:00 |
|
esteldunedain
|
f9ef100fad
|
Broadcast client
|
2016-02-23 11:56:46 -03:00 |
|
jokoho48
|
0956b97dce
|
remove module settings
change defualt in ACE_Settings
|
2016-02-23 15:49:03 +01:00 |
|
jokoho48
|
c61763edc9
|
fix simicolon
add stringtable entrys
|
2016-02-23 15:37:28 +01:00 |
|
jokoho48
|
b2d2bec2cf
|
Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv
# Conflicts:
# addons/medical/functions/fnc_setUnconscious.sqf
|
2016-02-23 15:31:38 +01:00 |
|
esteldunedain
|
056244602d
|
Get the client ID from a new logic object
|
2016-02-23 10:09:55 -03:00 |
|
esteldunedain
|
ec88e4ad32
|
Revert "Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031"
This reverts commit aea02af618.
|
2016-02-23 09:55:37 -03:00 |
|
esteldunedain
|
645ed3e63d
|
Resync mine orientations in JIP. Fix #3317
|
2016-02-23 09:53:38 -03:00 |
|
esteldunedain
|
e6af2864eb
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2016-02-23 09:27:23 -03:00 |
|
bux578
|
aa8d3a3fd0
|
Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis
Unified ellipsis
|
2016-02-23 08:27:28 +01:00 |
|
BaerMitUmlaut
|
74ea79e2cc
|
Unified ellipsis
|
2016-02-22 23:51:47 +01:00 |
|
PabstMirror
|
a4391a713d
|
Cleanup old cba SLX_XEH_COMPILE_NEW code
|
2016-02-22 15:30:16 -06:00 |
|
BaerMitUmlaut
|
b2337d7485
|
Config cleanup
|
2016-02-22 22:21:13 +01:00 |
|
PabstMirror
|
37eb353edf
|
Cleanup Merge
|
2016-02-22 15:03:40 -06:00 |
|
PabstMirror
|
6dc0d7d4f5
|
Merge branch 'master' into moreSevereJamming
|
2016-02-22 14:57:40 -06:00 |
|
BaerMitUmlaut
|
b72751e693
|
Fixed macro
|
2016-02-22 21:06:26 +01:00 |
|
BaerMitUmlaut
|
c2856fd8c7
|
Fixed scopes
|
2016-02-22 20:58:55 +01:00 |
|
PabstMirror
|
9ec4135be9
|
Add prep
|
2016-02-22 12:27:27 -06:00 |
|
PabstMirror
|
eb08149946
|
Merge branch 'master' into doAnimEvents
|
2016-02-22 12:27:07 -06:00 |
|
licht-im-Norden87
|
d13e1272ce
|
Update stringtable.xml
|
2016-02-22 18:55:45 +01:00 |
|
PabstMirror
|
330792ba7a
|
Add medic threeden control
|
2016-02-22 11:26:32 -06:00 |
|