Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,371 Commits 73 Branches 88 Tags 752 MiB
c02e7ead32
Commit Graph

1387 Commits

Author SHA1 Message Date
KoffeinFlummi
c02e7ead32 Fix medical paths 2016-05-02 16:49:33 +02:00
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR 
Standardize GVAR array brackets in configs.
 2016-03-08 18:19:50 +01:00
PabstMirror
3232654e13 Close #3565 -Fix spelling of local var _woundEffectiveness 2016-03-08 11:02:54 -06:00
PabstMirror
e3deebff7e Fix empty callback for hr adjustment 
Fix #3526
Same issue as #3384
 2016-03-03 13:23:53 -06:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
PabstMirror
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06:00
jonpas
8d326a0a1b Remove duplicate medical string 2016-02-28 22:54:24 +01:00
VKing
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. 
This prevents any possible confusion when the GVARs are used in code.
 2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
jonpas
905586bddc Make unused medical strings be used 2016-02-27 21:04:04 +01: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
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
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
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
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