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
8,142 Commits 73 Branches 88 Tags 752 MiB
291f4df072
Commit Graph

1241 Commits

Author SHA1 Message Date
licht-im-Norden87
291f4df072 Update German Stringtables 
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
 2015-12-04 22:06:44 -06:00
Thomas Kooi
5282e95668 Merge pull request #2876 from acemod/medicalTranslateHP 
Medical Fixes
 2015-11-28 20:58:08 +01:00
Thomas Kooi
cef01baf0b Merge pull request #2856 from acemod/isEqualTypeRepalcement 
1.54 - Replace typeName with isEqualType
 2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48 Merge pull request #2886 from acemod/bandageReopen 
Add all wound types to bandage treatment configs
 2015-11-28 20:32:13 +01:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
PabstMirror
6031eb8c6e Add all wound types to bandage treatment configs 
Fix by adding all config entries;
instead of trying to modify classname
 2015-11-27 14:19:26 -06:00
ViperMaul
8d4364350c Fix for "double semicolon detected" error 2015-11-27 10:43:30 -08:00
PabstMirror
e51f658ce0 Try base wound class in bandage treatment configs 
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
 2015-11-26 23:18:39 -06:00
PabstMirror
a5c45c137f Medical - addDamageToUnit Helper 2015-11-26 09:53:12 -06:00
PabstMirror
988a5c76bb Medical - 1.54 Changes 
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset

Cache hitpointIndex to reset damage

Normalize Limb Armor to 1.54

Cleanup

Cleanup
 2015-11-25 11:49:20 -06:00
PabstMirror
20bf90f3e9 Medical - Fix Hitpoints Macro when building 2015-11-24 16:30:09 -06:00
PabstMirror
c2564de5ef Fix UBC for 1.54 
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
 2015-11-20 23:27:29 -06:00
Thomas Kooi
801120fb39 Merge pull request #2841 from acemod/medicalAiBandage 
Move bandage log before basic exit
 2015-11-20 22:28:55 +01:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-20 14:37:23 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
kaban
f8481ae5f2 Merge branch 'master' of https://github.com/acemod/ACE3.git into develop 
Conflicts:
	addons/captives/stringtable.xml
 2015-11-18 06:39:58 +03:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
PabstMirror
c3e6990d00 #2528 (6) - Move bandage log before basic exit 
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
 2015-11-12 01:06:29 -06:00
Thomas Kooi
ec1187e79b Merge pull request #2830 from acemod/mixedMedicalDisplay 
Display basicMed wounds for AI in mixed mode
 2015-11-10 08:33:21 +01:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
PabstMirror
c326bc2f87 #2772 - Display basicMed wounds for AI in mixed mode 2015-11-06 01:05:25 -06:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
1cebe613fa Fix Capitialzation 2015-11-04 14:38:32 -06:00
PabstMirror
c5da32e470 Medical Handle Damage - check hitpoints if selection is weird 2015-11-04 14:36:26 -06:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments 
Changed ACE_time back to time in comments where appropriate
 2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-03 12:09:36 -06:00
Glowbal
8f6e9be636 Add method to deal with new hitpoints 
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.

This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
 2015-11-01 16:35:25 +01:00
Jonathan Pereira
ce5364d7af Added PT-BR translations 
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
 2015-10-26 22:04:03 -02:00
Glowbal
b5539db27f Merge pull request #2767 from acemod/canTreatLocation 
Fix medical location check when set to disabled for PAK/Surgical
 2015-10-24 00:55:51 +02:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
Glowbal
57abe3b885 Merge pull request #2743 from acemod/medicalStuff 
Medical Menu Fixes
 2015-10-19 22:47:13 +02:00
PabstMirror
cfde11d2fa Fix medic treatment location check as well 2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896 #2765 - Fix location check when set to disabled 2015-10-19 01:20:11 -05:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList 
Parse List Common Function
 2015-10-18 12:14:18 +02:00
Glowbal
94ed78a173 Merge pull request #2578 from alganthe/strings_fix 
PAK and Surgical Kit strings normalized inside modules.
 2015-10-11 12:05:11 +02:00
PabstMirror
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05:00
gienkov
b6d2cdee69 Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-04 12:25:55 +02:00
Glowbal
58ea8d5e2c Merge pull request #2543 from alef/feature/death_short_diagnose 
Remove: pain diagnosis on dead patients
 2015-10-04 09:34:10 +02:00
Glowbal
9ce4ce6cdd Merge pull request #2582 from acemod/fixLitterFloating 
fix Littergeneric fly over ground
 2015-10-04 09:32:03 +02:00
Glowbal
e36df978ec Merge pull request #2646 from DerekSauer/FixArmaInjury 
Fix healHitPointAfterAdvBandage - Issue #2498.
 2015-10-04 09:28:47 +02:00
PabstMirror
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
Derek Sauer
f9352de489 Clarified comment slightly. 2015-09-30 20:34:51 -04:00
Derek Sauer
0a788a282e Improved efficiency of wound counting. 
Using a switch/case conditional since it offers early termination if a
matching condition is found before all conditions are checked. It also
unnecessary to use a conditional to confirm whether a limb is wounded or
not. Number of Wounds multiplied by Blood loss will return zero for
a fully bandaged body part, not incrementing the wound counter; or it will
return some other number which will increment the wound counter.
 2015-09-30 20:27:40 -04:00
Derek Sauer
f69f4066e9 Fix capitalization on forEach and getVariable. 2015-09-30 06:17:54 -04:00
Derek Sauer
2824009317 Incorrectly retrieving list of current wounds. 
Used the wrong method to retrieve the target's current wounds and was
getting an empty array. This caused bandaging any wound even once to
completely heal the target on the Arma side.
 2015-09-29 17:00:49 -04:00
Derek Sauer
8d05214eb0 Resolve merge conflict from upstream pull. 2015-09-29 16:24:17 -04:00
gienkov
d88d2fe578 Merge remote-tracking branch 'origin' into pl-strings 2015-09-29 21:56:29 +02:00
Derek Sauer
954fad615a Reformatted to follow ACE3 coding guidelines. 2015-09-29 06:36:36 -04:00