1
0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Commit Graph

400 Commits

Author SHA1 Message Date
Glowbal
aaa8171457 Implemented prevent instant death 2015-04-29 22:54:58 +02:00
Glowbal
614a93ef12 fixes 2015-04-29 22:04:46 +02:00
Glowbal
87465b8b10 fixes 2015-04-29 21:49:24 +02:00
Glowbal
a854b90b00 Increased level at which a lot of blood message gets shown in basic medical 2015-04-28 22:19:30 +02:00
Glowbal
f606c24854 fixes 2015-04-28 20:47:11 +02:00
Glowbal
95d83554da Added local treatment through remoteExec for basic 2015-04-28 20:32:02 +02:00
Glowbal
c38fe384e3 added default values for getvar's 2015-04-28 19:30:35 +02:00
Glowbal
450e324f7b adjusted damage handling (adv medical) 2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c adjusted damage parsing 2015-04-27 16:36:00 +02:00
Glowbal
b520a1072b Merge branch 'master' into medicalImprovements 2015-04-27 15:41:20 +02:00
commy2
6aea424f6d Merge pull request from acemod/muteuncon
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
8976b6983d mute unconsious units 2015-04-26 16:47:36 +02:00
bux578
b2dd065429 remove comment 2015-04-26 12:27:06 +02:00
bux578
171cea998e add most of the translations 2015-04-26 09:36:51 +02:00
Glowbal
11d86248a7 Reorganised module and settings 2015-04-25 22:20:28 +02:00
Glowbal
6799903e4b Also display different color for advanced 2015-04-25 12:45:04 +02:00
Glowbal
1415adc2bd removed local diagnose action. Added localization 2015-04-25 12:35:07 +02:00
Glowbal
4cef2a1fa4 Merge branch 'master' into streamlinedBasicDiagnosis 2015-04-25 12:12:24 +02:00
Glowbal
1df42b17c2 close all dialogs 2015-04-20 22:22:09 +02:00
Glowbal
f7719f0e0a tab 2015-04-20 22:08:31 +02:00
Glowbal
842bfe0b98 enabled advanced wounds setting 2015-04-20 22:00:11 +02:00
Glowbal
8be7ccaab7 setting for moving unit from group on unconscious 2015-04-20 21:37:30 +02:00
esteldunedain
7953919b89 Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis 2015-04-20 10:24:59 -03:00
esteldunedain
1e3b44e32e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis 2015-04-20 10:24:24 -03:00
Glowbal
17899db086 added some missing privates 2015-04-19 19:49:56 +02:00
Glowbal
5e82c51926 Merge branch 'master' into medicalFixes 2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785 Fixed: max litter scalar array, have internal values. 2015-04-19 09:04:42 -07:00
Glowbal
f6bbeb6bd6 switched back to old init method 2015-04-19 17:28:47 +02:00
Glowbal
8a7b3a1b33 Removed damage thresholds from basic medical 2015-04-19 13:08:28 +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
e54c68f7f9 handle cleanup 2015-04-18 11:37:06 -07:00
jaynus
852b4df61d Settings changes. createVehicleLocal derp. 2015-04-18 11:16:18 -07:00
jaynus
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
Glowbal
22456a4301 use pain instead 2015-04-18 19:49:29 +02: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
esteldunedain
c423e9d743 Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/ACE_Medical_SelfActions.hpp
2015-04-17 20:02:51 -03:00
esteldunedain
a5c3e86cd3 Fixes 2015-04-17 20:00:43 -03:00
esteldunedain
cce9e1f04c Simple diagnose 2015-04-17 19:38:03 -03:00
esteldunedain
1d208b4efc Modify Function for medical actions 2015-04-17 19:36:03 -03:00
Glowbal
d1a09ae7fc fixed vehicle crashes for adv 2015-04-17 23:15:41 +02:00
Glowbal
bc4d102d08 changed variable initialization - everything is now done local 2015-04-17 22:43:31 +02:00
Glowbal
f5effca216 fixed handleDamage basic 2015-04-17 22:21:15 +02:00
Glowbal
6d18e484c1 Cache condition for target instead of caller 2015-04-17 22:02:43 +02:00
Glowbal
fa7bb5f9c6 Added unconscious state check 2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76 fixes 2015-04-17 21:27:57 +02:00
Glowbal
eb731b1169 fixes 2015-04-17 21:07:09 +02:00
Glowbal
31bc09a9a3 fixed AI standing up before being killed
Doesn't matter if we enable AI again on dead units
2015-04-17 21:06:30 +02:00