Commit Graph

96 Commits

Author SHA1 Message Date
Glowbal
0a6b77b902 Removed more deprecated wound sync code 2015-09-05 14:10:28 +02:00
Glowbal
e4c246984f Removed another debug trace that should not be there 2015-09-05 14:10:04 +02:00
Glowbal
d9af19df28 properly fixes unconscious weird behavior. Because it never registered any unconscious conditions. 2015-09-05 14:08:46 +02:00
ViperMaul
2bc20501bc Adding more debug 2015-09-04 07:46:35 -07:00
Glowbal
1a4736e663 Clean up 2015-08-29 12:01:00 +02:00
Glowbal
1c9e88f213 fixes #1964 2015-08-29 11:58:28 +02:00
jokoho48
c2d94239a2 Code Cleanup Medical Module (Part 2). 2015-08-22 16:26:53 +02:00
SzwedzikPL
13999fdd31 finddisplay into curatorcamera 2015-07-02 19:36:34 +02:00
SzwedzikPL
c2e4ee431f no pain effect in zeus camera 2015-07-02 13:56:56 +02:00
PabstMirror
e2890b0699 #1473 - Fix Medical Log Localization
also swap some common EFUNCs
2015-06-09 17:30:02 -05: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
PabstMirror
537bba1382 Medical - Fix Unconscious Condition 2015-05-22 13:56:45 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Alessandro Foresi
67319b6808 Fixed: Removed § at the end of EH call 2015-05-20 22:04:19 +02:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
Glowbal
2b1468db24 Added pain suppression instead of removal 2015-05-20 17:15:22 +02:00
Glowbal
5b65d4117d fixed wrong macro for addEventhandler 2015-05-18 23:02:46 +02:00
Glowbal
e674229dde enabledFor > enableFor 2015-05-08 20:10:40 +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
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
PabstMirror
eb5af0cd89 Medical Private Variables 2015-04-30 01:17:26 -05:00
Glowbal
c06caa7209 Only add JIP event for player clients 2015-04-28 20:33:01 +02:00
Glowbal
ebbb88deff Join in progress players will now be initialized 2015-04-28 20:32:29 +02:00
KoffeinFlummi
74ca85cbd9 Change getBloodLoss to expect an array 2015-04-22 22:36:41 +02:00
KoffeinFlummi
f6eeb5e3ba Add pain coefficient 2015-04-22 22:29:31 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
jaynus
ca74ce721d Use cleanup settings, and force server TTL on the events. 2015-04-18 11:48:44 -07:00
jaynus
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
jaynus
f31e3c1fd4 litter simulation createVehicleLocal /w temporal network sync. 2015-04-18 08:31:03 -07:00
jaynus
c952a97de8 Revert "synced events implemented into litter."
This reverts commit 32df4a2adc.
2015-04-17 19:38:05 -07:00
jaynus
32df4a2adc synced events implemented into litter. 2015-04-17 19:33:07 -07:00
Glowbal
111a350a84 Merge branch 'master' into advMedicalEventSync 2015-04-17 20:11:53 +02:00
PabstMirror
6e077de829 Medical - Use default value instead of 0 for getVar
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
2015-04-17 12:13:23 -05:00
esteldunedain
ad750977e0 Fix ACRE volume on medical unconsciousness 2015-04-14 19:17:05 -03:00
Felix Wiegand
5d8dd701d2 Merge pull request #518 from acemod/basic-medical-tweaks
Basic medical tweaks
2015-04-14 23:49:00 +02:00
jaynus
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
KoffeinFlummi
f07949cf19 Remove some old todos 2015-04-14 22:57:18 +02:00
KoffeinFlummi
13d7649c4a Buff colour flashing effect 2015-04-14 22:49:26 +02:00
KoffeinFlummi
684c36f8a5 Add pain effect option 2015-04-14 21:49:56 +02:00
KoffeinFlummi
e7807c009f Use playerInventoryChanged instead of Take
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
2015-04-14 21:28:18 +02:00
Glowbal
af255604ac Switched to event based sync system for open wounds 2015-04-14 21:17:36 +02:00
Glowbal
3702679ee4 fixed wrong value for radio disabled on waking up 2015-04-08 21:31:59 +02:00
Glowbal
3d82cb8eac Removed deprecated onTreatmentCompleted event 2015-04-07 19:54:24 +02:00
Glowbal
12493f8595 Improved wounds configuration (missing maxDamage values added) 2015-04-07 00:57:05 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
esteldunedain
d090b3328c - Close interact_menu when the player falls unconscious
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
Glowbal
b399768798 Changed postInit wound sync to playerChanged eventhandler. 2015-04-03 00:04:41 +02:00