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
10,812 Commits 73 Branches 88 Tags 752 MiB
962a296710
Commit Graph

1509 Commits

Author SHA1 Message Date
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
bux578
076803951d Merge pull request #3628 from alef/translation/15bn/alef 
Italian translation
 2016-03-31 06:54:31 +02:00
PabstMirror
bcde9f8ed6 Filter minor falling damage to non-leg hitpoints 2016-03-28 01:15:58 -05:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
SzwedzikPL
cdcde46a7d Fix double displayName in medical settings 2016-03-22 13:05:47 +01:00
Thomas Kooi
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
Thomas Kooi
61f1959109 Fix morphine increasing viscosity 
Morphine should decrease viscosity instead of increase. Closes #3579
 2016-03-12 18:55:42 +01: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
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -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
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
PabstMirror
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06:00
esteldunedain
9e682253f3 Move the dead body cleanup PFH to a loop using waitAndExecute 2016-02-28 23:33:51 -03:00
esteldunedain
90a54397ae Move the litter cleanup PFH to a loop using waitAndExecute 2016-02-28 23:20:26 -03:00
esteldunedain
4b702f68df Make loops non public 2016-02-28 23:10:15 -03:00
esteldunedain
94e8bee348 Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop 2016-02-28 23:08:25 -03:00
esteldunedain
12895e7983 Remove unneeded parameter 2016-02-28 22:58:09 -03:00
esteldunedain
0e82cdfe82 Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance. 2016-02-28 22:50:04 -03:00
esteldunedain
21d4939abb Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10 2016-02-28 22:08:59 -03:00
esteldunedain
35e13d5357 Fixes 2016-02-28 20:55:05 -03:00
esteldunedain
bbb84ec7d1 Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities 2016-02-28 20:50:28 -03:00
esteldunedain
085860c770 Restore addToInjuredCollection as a deprecated function 2016-02-28 20:32:02 -03:00
esteldunedain
bed51ac8a4 Fix waitAndExecute syntax 2016-02-28 20:26:05 -03:00
esteldunedain
3bbabac2d7 Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance. 2016-02-28 20:12:56 -03: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
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
PabstMirror
f1797feead Make wound assignment consistent for dll/sqf 
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
 2016-02-16 12:19:18 -06:00
PabstMirror
5c9dfd7dc5 Handle enemy causing veh explode, fix revive unload 
Fix #3269
 2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be Fix vehicle crashes not being fatal to non-drivers 
Fix #3306
 2016-02-15 17:11:04 -06:00
Glowbal
ff86359247 Merge branch 'master' into medical-focus-feature 2016-02-13 19:51:45 +01:00
Ivan Krouglyi
0a226b5ee9 Update fnc_treatment_success.sqf 
Error at 84 line - you forget ";"
 2016-02-13 03:29:42 +03:00
PabstMirror
ff4ba98e68 Pre-load again on mission load (save game) 2016-02-10 11:50:30 -06:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
PabstMirror
e1b83b8172 Manually pre-load for StaticWeapons and Car 
Fix #3168
 2016-02-09 22:43:38 -06:00
SzwedzikPL
0c80551fd8 ace attribute category, lower case classes 2016-02-10 01:17:18 +01:00
SzwedzikPL
94ea26c7b9 typo fix 2016-02-08 00:14:55 +01:00
SzwedzikPL
3bfac35b65 ace repair and medical attributes 2016-02-07 23:56:45 +01:00
Glowbal
e754c89c73 Remove non functional event driven handleDamage 2016-02-07 13:18:19 +01:00
Glowbal
575f362fb6 Add setting for limiting usage of Epinephrine in basic medical #1792 
Part of focus feature medical #3134. Default settings are inline with old default.
 2016-02-07 13:10:38 +01:00
Glowbal
bfd90cd5d3 Add Adenosine to replace atropine #1573 2016-02-07 12:54:23 +01:00
Glowbal
39cf11367f improve medical bandage configuration 2016-02-07 12:37:00 +01:00
Glowbal
84878c3d8b Merge branch 'master' into medical-focus-feature 2016-02-07 12:11:25 +01:00
commy2
ac007e6995 replace more map with apply 2016-02-06 12:08:04 +01:00
PabstMirror
35333cbe9d Merge branch 'cargoCleanup' 2016-02-04 12:51:52 -06:00
Thomas Kooi
69746a133b Merge pull request #3254 from ProfessorCZ/master 
Czech Translation - Update
 2016-02-04 19:36:28 +01:00
PabstMirror
336184dfaa Change medication removal from array 2016-02-04 10:00:33 -06:00
PabstMirror
3cc10a27ce Tourniquets block medication until released 
Close #2704
 2016-02-03 14:40:26 -06:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
Glowbal
34613b42f2 Increase heart rate increase speed #3134 2016-01-20 11:49:10 +01:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
Glowbal
86158ac45b Stage improvements bandage effectiveness 2016-01-17 14:09:22 +01:00
Glowbal
7de1a7bc6c add initial implementation of drowning and collision damage handling 2016-01-17 13:21:18 +01:00
Glowbal
209d10065b Fix missing event log entries #3134 2016-01-17 12:28:37 +01:00
Glowbal
6e42a10d47 Add selectionDamage implementation 2016-01-17 12:28:08 +01:00
Glowbal
ee9a620a63 Merge branch '340handledamage' into medical-focus-feature 2016-01-16 22:03:28 +01:00
Thomas Kooi
c8c91d2af7 Merge pull request #3138 from acemod/increaseTrainingInLocations 
Medical Locations Boost Training
 2016-01-16 21:59:45 +01:00
PabstMirror
1affbd7d2f Move littler syncedEH install to after settingInit 2016-01-14 17:06:46 -06:00
PabstMirror
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
jokoho48
daf2fc2669 remove ccp issue in settings 
prevent setCaptive if unit is wake up
 2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28 add delay to Unconsciousness Captivity(posible fix for #3121) 2016-01-06 17:46:59 +01:00
Glowbal
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
commy2
7eaa55f9df Merge pull request #3022 from acemod/bodybagevent 
add event for placing units in body bags
 2016-01-05 21:59:47 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
cf27571b5a Merge pull request #3007 from dudakov/master 
Russian Translations - Update
 2015-12-31 14:11:45 -06:00
PabstMirror
2e211c5a04 Fix Medical Triagecard Macro 
Fix #3087
 2015-12-31 01:46:24 -06:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
PabstMirror
74aec45921 Fix medical menu not closing on range, litter dir 
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
 2015-12-19 20:50:57 -06:00
PabstMirror
886c13f6a9 Merge pull request #3013 from acemod/bloodyLitter 
Fix litter for adv - Add bloody p3d for Pack/qClot
 2015-12-14 19:23:51 -06:00
commy2
7f63d51ccb add event for placing units in body bags 2015-12-12 18:21:11 +01:00
PabstMirror
a501c7e1c3 Remove new models and just combine existing litter 2015-12-11 19:47:40 -06:00
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
PabstMirror
e9be05209a Fix litter for adv - Add bloody p3d for Pack/qClot 
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
 2015-12-10 22:58:44 -06:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
PabstMirror
39edd205f0 Merge pull request #2942 from acemod/CzechTables 
Czech Translations - Update
 2015-12-07 09:32:00 -06:00
bux578
fbde1dd794 Merge pull request #2941 from acemod/DieStringtables 
Update German Stringtables
 2015-12-07 10:27:11 +01:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
gienkov
1132efaf48 ceil number of wounds 2015-12-06 02:57:21 +01:00
PabstMirror
b13656e54b addDamageToUnit - Disable debug / testing code 2015-12-05 12:19:34 -06:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
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
PabstMirror
875b3980ac Don't update openWounds if not bandaged 
Fix #2921
 2015-12-03 15:23:38 -06:00
commy2
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +01:00