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 |
|
bux578
|
db71aa54b8
|
Merge pull request #3434 from NorXAengell/Traduction-Fr
Traduction fr
|
2016-02-26 21:18:40 +01:00 |
|
licht-im-Norden87
|
1c7a25cc38
|
Update stringtable.xml
|
2016-02-26 19:36:47 +01:00 |
|
NorXAengell
|
ea461446f9
|
Translation Fr
|
2016-02-26 19:24:53 +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 |
|
SuN9491
|
9efbdb2e71
|
Spanish Translation (3.5.0)
Remaining spanish translations for ACE 3.5.0
|
2016-02-25 20:50:29 +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 |
|
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 |
|
esteldunedain
|
3fa3512509
|
Remaining spanish translations
|
2016-02-25 12:25:42 -03:00 |
|
esteldunedain
|
64a62d65fc
|
More spanish translations
|
2016-02-25 11:46:56 -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
|
ae2ce0eebc
|
Merge pull request #3124 from acemod/delayUnconCaptiv
add delay to Unconsciousness Captivity
|
2016-02-25 09:54:27 -03:00 |
|
jonpas
|
7f022eda00
|
Replace Purista with Roboto - everywhere, close #3401
|
2016-02-24 15:06:27 +01:00 |
|
PabstMirror
|
7cf912222b
|
Merge pull request #3393 from acemod/3denReplaceDropDown
Fix 3den attributes
|
2016-02-23 17:09:03 -06: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 |
|
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
|
330792ba7a
|
Add medic threeden control
|
2016-02-22 11:26:32 -06:00 |
|
commy2
|
0f7bfc0f66
|
Merge pull request #3389 from acemod/precompileongamestart
precompile on game start
|
2016-02-22 16:00:19 +01:00 |
|
commy2
|
46a239f9f6
|
precompile on game start
|
2016-02-22 15:20:36 +01:00 |
|
PabstMirror
|
2467fa7b0c
|
Fix empty callbacks in medical/repair
|
2016-02-21 11:34:25 -06:00 |
|
bux
|
38c1b45fb9
|
properly fix the medical translation file
|
2016-02-21 11:41:53 +01:00 |
|
PabstMirror
|
3fbd6cff18
|
Merge pull request #3368 from acemod/fixNils
Fix some undefined functions / strings
|
2016-02-20 19:49:07 -06:00 |
|
Glowbal
|
ea113b8e61
|
Fix duplicate {
|
2016-02-21 01:04:12 +01:00 |
|
Glowbal
|
7d063d4dee
|
Merge branch 'master' into medical-focus-feature
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
|
2016-02-21 00:37:30 +01:00 |
|
PabstMirror
|
8b932fd5a0
|
Fix some undefined functions / strings
|
2016-02-20 16:58:45 -06:00 |
|
ChairborneIT
|
0021bc08df
|
Added translation for most Italian stringtable entries
|
2016-02-20 21:39:05 +01:00 |
|
Thomas Kooi
|
2930fab6c6
|
Merge pull request #3354 from acemod/playerBodybags
Fix bagging respawning players (alt)
|
2016-02-20 17:26:07 +01:00 |
|
Thomas Kooi
|
4f10d551d6
|
Merge pull request #2949 from gienkov/fixWoundCount
ceil number of wounds
|
2016-02-20 16:56:17 +01:00 |
|
PabstMirror
|
fc3bb0de6b
|
Fix #3355 - add missing semi-colons
|
2016-02-19 18:51:25 -06:00 |
|
PabstMirror
|
dffcbc7650
|
Cleanup events
|
2016-02-19 15:45:37 -06:00 |
|
PabstMirror
|
44b526ab6d
|
bodybag - hide player corpse and delete later
Fix #1301
|
2016-02-19 15:41:13 -06:00 |
|
PabstMirror
|
ed653456e5
|
Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
|
2016-02-19 15:09:40 -06:00 |
|
Grzegorz
|
95250c8ecd
|
medical PL translation
3.5.0 ready
|
2016-02-19 19:10:59 +01:00 |
|
Thomas Kooi
|
95532ea521
|
Merge pull request #3333 from acemod/medicalEvents
Replace execRemoteFnc in ace_medical
|
2016-02-19 12:00:00 +01:00 |
|
commy2
|
5d0d8576ea
|
Merge pull request #3288 from SzwedzikPL/edenassignsettings
Repair & medical object attributes for eden editor
|
2016-02-19 11:47:26 +01:00 |
|
commy2
|
be8f7f9cc0
|
Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
|
2016-02-18 14:23:02 +01:00 |
|
esteldunedain
|
88eae19646
|
Replace execRemoteFnc in ace_medical
|
2016-02-17 22:54:43 -03:00 |
|
PabstMirror
|
be742c13cd
|
Merge branch 'master' into 155selectRandom
|
2016-02-17 15:58:19 -06:00 |
|
PabstMirror
|
dccc1d33fd
|
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
|
2016-02-17 12:30:03 -06:00 |
|
Thomas Kooi
|
26cb6bd6a3
|
Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
Make wound assignment consistent for dll/sqf
|
2016-02-17 18:34:28 +01:00 |
|
PabstMirror
|
40396fc69e
|
Remove debug
|
2016-02-17 09:37:08 -06:00 |
|