ulteq
0661d25ae3
Removed debug output
2015-06-10 16:06:46 +02:00
ulteq
7318aae629
Cleanup
2015-06-10 12:47:22 +02:00
PabstMirror
e2890b0699
#1473 - Fix Medical Log Localization
...
also swap some common EFUNCs
2015-06-09 17:30:02 -05:00
Glowbal
610f74d9d6
Merge pull request #1523 from AgentRev/onSetDead
...
Added "medical_onSetDead" local event in fnc_setDead.sqf
2015-06-07 23:58:22 +02:00
AgentRev
f7007b4175
Fixed "medical_onSetDead" event
2015-06-07 17:52:42 -04:00
PabstMirror
6b612a9890
Merge pull request #1520 from acemod/hideFakeWeapon
...
Hide fake weapon
2015-06-07 16:37:26 -05:00
PabstMirror
fb9c1e14a3
Merge branch 'master' into allStringtableMacros
...
Conflicts:
addons/kestrel4500/CfgWeapons.hpp
2015-06-07 12:24:40 -05:00
KoffeinFlummi
c47e0ce796
Merge https://github.com/ODK-Bn/ACE3 into russian-merge
2015-06-06 21:13:03 +00:00
AgentRev
4a416a12a2
Added "medical_onSetDead" local event in fnc_setDead.sqf
2015-06-05 22:03:27 -04:00
PabstMirror
32ce0aa6fd
Macroize all stringtables
2015-06-05 21:02:24 -05:00
PabstMirror
84428e5e6c
Medical - unconsciousness: fix exitWith scope
2015-06-05 15:43:09 -05:00
PabstMirror
4e8fc49b5e
Always remove fakeWeapon after adding
...
Should fix #1500
2015-06-05 15:38:45 -05:00
PabstMirror
e01ba64683
Fix Missing Strings
2015-06-04 22:51:40 -05:00
Glowbal
e103007ae7
Merge pull request #1492 from GitHawk/master
...
Disabled pain effect while unconscious
2015-06-04 21:45:48 +02:00
IngoKauffmann
ede8d74c54
Disabled pain effect while unconscious
...
If the player is unconscious the pain effect is disabled.
2015-06-03 17:53:09 +02:00
IngoKauffmann
e60cfddc77
Limited strength of pain effect while unconscious
...
Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
2015-06-03 17:17:35 +02:00
jonpas
5496333c26
Merge branch 'master' into macroSTR
...
Conflicts:
addons/nametags/ACE_Settings.hpp
addons/nametags/CfgVehicles.hpp
addons/nametags/stringtable.xml
2015-06-02 22:22:51 +02:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
ulteq
048e5b6f6d
Body bag cleanup:
...
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
2015-06-01 22:33:25 +02:00
ulteq
14607f7aba
Fixes random body bag teleports
2015-06-01 21:23:00 +02:00
PabstMirror
f57427ec96
switch waitAndExecute with 0 delay to execNextFrame
...
Should Fix #1463
2015-06-01 13:14:05 -05:00
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
5d1f2eafaa
Fix German Translation
2015-05-30 23:34:19 +02:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
PabstMirror
84d940e69d
Fix circular dependency - ModuleDescription
2015-05-30 00:31:07 -05:00
Glowbal
552b2f390f
Merge pull request #1256 from acemod/medicalExtension
...
Medical Extension for handleDamage wounds
2015-05-29 23:16:00 +02:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Glowbal
d34c96038e
Merge branch 'master' of github.com:acemod/ACE3
2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0
Merge branch 'surgicalkit'
2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f
minor refactor
2015-05-28 20:54:13 +02:00
PabstMirror
3a4a02e524
#1407 - Make Saline 500ml match mass blood/plasma
2015-05-27 16:23:25 -05:00
jonpas
b85ae8f194
Fixed missed external strings
2015-05-27 22:34:57 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
1c58ff823d
Stringtable fixes medical
2015-05-27 21:58:35 +02:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
BaerMitUmlaut
f2e6a98eb4
Killed tabs
2015-05-27 13:51:22 +02:00
BaerMitUmlaut
6894a7433a
Removed duplicate private var
2015-05-27 13:51:15 +02:00
BaerMitUmlaut
f7578a92c9
Reverted in favour of onProgress treatment
2015-05-27 00:52:16 +02:00
BaerMitUmlaut
30df0e8dc9
Switched to callbackPogress for treatment
2015-05-27 00:45:50 +02:00
BaerMitUmlaut
890b568225
Implemented dynamic treatment time
2015-05-27 00:45:22 +02:00
Glowbal
4945f22f3e
Merge branch 'master' into medicalExtension
2015-05-26 22:42:26 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
ViperMaul
388d6c3519
Change to the proper isAwake function
...
#1375
2015-05-25 20:47:28 -07:00
BaerMitUmlaut
41892fd6df
Added surgicalKit treatment
2015-05-26 00:33:20 +02:00
ViperMaul
3bdb27386c
removing obsolete drag code
...
#1375
2015-05-25 10:25:28 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612
revert missing actionDragUnit file
...
#1375
2015-05-25 09:39:12 -07:00
