Glowbal
|
5013254769
|
Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
|
2015-06-13 20:48:18 +02:00 |
|
Glowbal
|
ce908f0fb3
|
Merge pull request #1579 from acemod/medicalModuleOptions
[Adv. Medical] New module options
|
2015-06-13 13:37:02 +02:00 |
|
PabstMirror
|
affe323435
|
Fix bodybag string macro
|
2015-06-12 23:19:17 -05:00 |
|
ulteq
|
eef7c1295a
|
Added new adv. medical module option 'painIsOnlySuppressed'
|
2015-06-11 17:36:18 +02:00 |
|
ulteq
|
0c40c1b439
|
Added Adv. Medical module option 'healHitPointAfterAdvBandage':
* Changed the default value to '0'
|
2015-06-11 15:30:39 +02:00 |
|
AKALegman
|
5431ab5e01
|
fixed conflicts
|
2015-06-10 20:03:00 +01:00 |
|
AKALegman
|
1ae8e29ac2
|
updated isPlayer v2
|
2015-06-08 19:12:16 +01:00 |
|
PabstMirror
|
32ce0aa6fd
|
Macroize all stringtables
|
2015-06-05 21:02:24 -05:00 |
|
PabstMirror
|
e01ba64683
|
Fix Missing Strings
|
2015-06-04 22:51:40 -05: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 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
Grzegorz Sikora
|
44466e8be8
|
Remove tabs and repair errors @Glowbal found
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
|
2015-05-12 18:27:27 +02:00 |
|
Grzegorz Sikora
|
156bba3321
|
Yes/No to BOOL
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
|
2015-05-12 18:26:24 +02:00 |
|
Grzegorz Sikora
|
6a821715a0
|
Stringtable modules
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
|
2015-05-12 18:25:40 +02:00 |
|
Glowbal
|
09a0158fa4
|
This should not be 1
|
2015-05-01 22:49:13 +02:00 |
|
Glowbal
|
722c459c1e
|
added APL pbo
|
2015-05-01 19:37:17 +02:00 |
|
Glowbal
|
80162627ec
|
Fixed spelling of enableUnconsciousnessAI
|
2015-05-01 18:49:59 +02:00 |
|
KoffeinFlummi
|
53835605ea
|
Merge remote-tracking branch 'origin/master' into basic-med-options
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
|
2015-05-01 01:25:16 +02:00 |
|
KoffeinFlummi
|
965a976daf
|
Reorganize AI unconsciousness
|
2015-04-30 22:16:45 +02:00 |
|
KoffeinFlummi
|
f28a806938
|
Remove max unconsciousness time again
|
2015-04-30 22:15:40 +02:00 |
|
KoffeinFlummi
|
85669a9e92
|
Convert Medical stringtable key names to lowercase
|
2015-04-30 22:01:09 +02:00 |
|
Glowbal
|
1bee48214e
|
Merge branch 'master' into medicalMenuClientSetting
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
|
2015-04-30 21:08:46 +02:00 |
|
KoffeinFlummi
|
fd152c580b
|
Merge branch 'master' into basic-med-options
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
|
2015-04-30 18:39:33 +02:00 |
|
Glowbal
|
581c64f66f
|
Implemented unloading from vehicles #740
|
2015-04-29 23:12:47 +02:00 |
|
Glowbal
|
614a93ef12
|
fixes #838
|
2015-04-29 22:04:46 +02:00 |
|
Glowbal
|
fc08ebb0a5
|
added "isNotInside" exception to unload
|
2015-04-26 11:19:25 +02:00 |
|
Glowbal
|
11d86248a7
|
Reorganised module and settings #809
|
2015-04-25 22:20:28 +02:00 |
|
Glowbal
|
55529d0396
|
Added support for switching from 3d selections to radial menu
|
2015-04-25 09:41:55 +02:00 |
|
KoffeinFlummi
|
d1c95ba8a1
|
Add maximum unconsciousness time option
|
2015-04-23 11:31:27 +02:00 |
|
KoffeinFlummi
|
f6eeb5e3ba
|
Add pain coefficient
|
2015-04-22 22:29:31 +02:00 |
|
KoffeinFlummi
|
2391c5e6d6
|
Tweak crate names
|
2015-04-14 22:34:19 +02:00 |
|
KoffeinFlummi
|
a4c93ab2e2
|
Add seperate crates for basic and advanced
|
2015-04-14 20:28:00 +02:00 |
|
KoffeinFlummi
|
c379f2775e
|
Style fixes
|
2015-04-14 20:27:42 +02:00 |
|
Glowbal
|
093d340ee7
|
Changed: Dragging/carrying now works for units with broken legs
Added unload and load of unconscious units
|
2015-04-09 21:23:10 +02:00 |
|
PabstMirror
|
c3564ee883
|
undef to Make PBO-Project Happy
|
2015-04-08 14:38:29 -05:00 |
|
jaynus
|
99008ac729
|
Merge pull request #332 from KoffeinFlummi/medicalBox
Added: Generic placeholder medical box.
|
2015-04-06 19:09:16 -07:00 |
|
Glowbal
|
76ad6b8294
|
Added missing main actions
|
2015-04-06 15:46:50 +02:00 |
|
Glowbal
|
ce4cdd3722
|
staged bodybag fixes
|
2015-04-06 15:11:54 +02:00 |
|
Glowbal
|
661d93e82c
|
Working commit
|
2015-04-06 14:51:17 +02:00 |
|
Glowbal
|
43b3190202
|
config fix
|
2015-04-06 14:14:00 +02:00 |
|
Glowbal
|
10a1108aae
|
Added support for customizable treatment location limitation
|
2015-04-06 14:11:10 +02:00 |
|
jaynus
|
c87f2f8bcc
|
Added: Generic placeholder medical box.
|
2015-04-05 15:16:32 -07:00 |
|
Glowbal
|
147bb92541
|
Added setting to disable variable sync (recommended on)
|
2015-04-05 20:23:07 +02:00 |
|
Glowbal
|
ecf84ae039
|
Updated module classname to be inline with others
|
2015-04-05 19:27:28 +02:00 |
|
Glowbal
|
cf1f641424
|
Moved selfActions to a separate hpp file
|
2015-04-05 13:02:55 +02:00 |
|
esteldunedain
|
f417fa2285
|
Add medical actions while boarded.
|
2015-04-04 19:41:12 -03:00 |
|
Glowbal
|
77d39877d2
|
Merge branch 'master' into medicalImprovements
|
2015-04-04 22:01:15 +02:00 |
|
Glowbal
|
a56e8745c3
|
fixed module settings
|
2015-04-04 21:59:18 +02:00 |
|
Glowbal
|
5c3ee0dd1a
|
Added settings to modules & fixed medicalVehicle module
|
2015-04-04 21:51:18 +02:00 |
|