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
14,077 Commits 73 Branches 88 Tags
c60e4111d8
Commit Graph

1934 Commits

Author SHA1 Message Date
Dedmen Miller
6bd8542eed Move #includes before function headers () 2018-07-30 10:22:14 +01:00
Thomas Kooi
c9ad92e92d
Disable debugging () 2018-07-30 00:07:30 +02:00
Thomas Kooi
36f2c5fcc9 Minor code clean up () 
* Minor code clean up
* refactor(medical): shorten some code
* refactor(medical): use macros for tourniquets
* refactor(medical): pull cache expiry values into script_macros_medical
 2018-07-29 22:43:14 +01:00
Thomas Kooi
e22f35da37 Remove medkit () 
Due to be replaced by an alternative treatment option such as a split
 2018-07-26 17:14:11 +01:00
SilentSpike
873ed90cc1
Introduce bleedout condition and fix IV hemorrhage () 
* Introduce bleedout condition and fix IV hemorrhage
* Update patient info display hemorrhage values
* Update UI info hemorrhage values
 2018-07-25 11:40:37 +01:00
Thomas Kooi
f7f89725fe
Fix respawn not resetting variables () 2018-07-20 00:09:08 +02:00
TheMagnetar
3054803e44 Improvements to vitals and display () 
- Improvements to vitals and display
- Fixes some undeclared variables
- Adds advanced diagnose: hemorrhage classes.
- Original idea for displaying hemorrhage classes belongs to @Arcanum417
 2018-07-18 21:38:00 +02:00
SilentSpike
ec7a9a133e
Fix required addons in medical restructure () 2018-07-18 19:19:28 +01:00
SilentSpike
4466f9e785
Strip medical component () 
* Move litter to `treatment`
* Move eden object attributes to `treatment`
* Move treatment items to `treatment`
* Move bodybag handling to `treatment`
* Move state conditions to `statemachine`
* Move radio addon handling to `feedback`
* Move medical macros to `engine`
* Move medical extension to `damage`
* Fix texture and material paths after move
* Remove duplicate medical menu config
* Remove old faction class
* Remove a bunch of old code
 2018-07-18 19:13:25 +01:00
Thomas Kooi
c9c8d25017 Move vitals loop statemachine events into switch statement () 
- Induce cardiac arrest if unit blood volume drops below half
 2018-07-18 11:09:09 +01:00
TheMagnetar
bf4f54bce6 Fix settings in medical rewrite () 
* Fix settings in medical rewrite
* Raise spontaneousWakeUpChance to 0.05
 2018-07-17 15:49:14 +01:00
TheMagnetar
3bf3629047 Fixes state machine () 2018-07-16 23:25:54 +02:00
Magnetar
9b5c5bc866 Fix QGVAR medical variables 2018-07-16 15:35:34 +02:00
Glowbal
f552acd7da Fix incorrect macro usages with whitespace 2018-07-15 16:25:14 +02:00
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
Thomas Kooi
14db38e0f0 Fix various namespace issues with medical 2018-07-15 15:00:16 +02:00
Thomas Kooi
2a721cb8c8 Fix medical item icons not found error 2018-07-15 13:59:21 +02:00
Thomas Kooi
9c00c6ffb5 Fix bunch of script errors related to getVars on start up of game 2018-07-15 13:01:26 +02:00
alef
3673a6f56a Italian Translation Update () 
* Fix wrong order shown in addon category list

Just put 'ACE' at begin

* Typo

* Add/Fix: arsenal, nightvision and others.

common, explosives, maverick, gforces, pylons, hearing, marksers, repair,
flashlights, nametags, interaction, vehicles, medical_menu, medical_ai,
interact_menu, medical
 2018-07-11 10:17:13 -05:00
Josuan Albin
09855f133a Fix typo in med and issue related to unconsciousness () 
* Fix adenosine displayname being wrong in some medical interactions

* Fix unconscious units waking up while being carried staying muted
 2018-06-28 00:06:12 -05:00
Dissyu
e5a15d200f Traditional Chinese update () 
Traditional Chinese update
 2018-06-27 14:16:11 -05:00
maike1860
e3c5396593 Add Chinese translation Modify grammar () 
Translations-  Chinese: Modify grammar
 2018-06-22 19:14:11 -05:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions () 2018-05-30 16:48:19 -05:00
SilentSpike
54c398a007 Use macros for peripheral resistance 2018-05-23 10:52:47 +01:00
SilentSpike
52dbef84ab Fix incorrect macro variable 2018-05-23 10:27:12 +01:00
SilentSpike
de2d7f2fb8 Use macros for hemorrhage class tracking 2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
Thomas Kooi
58f4ca4581
Merge branch 'master' into armake 2018-05-20 11:08:58 +02:00
SilentSpike
563742bdd8 Fix heart rate and pain suppression adjustments 2018-05-11 16:11:01 +01:00
SilentSpike
1dc934e1b1 Use macros for unit variables 
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
 2018-05-11 15:28:25 +01:00
classic
2cd4615d5d Update Japanese translations () 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
 2018-05-11 08:39:32 -05:00
SilentSpike
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
33a5fb46f5 Fix patient information display 2018-05-08 14:51:32 +01:00
SilentSpike
4303a340de Fix stringtable duplicates and missing Key tag 2018-05-08 14:37:54 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
SilentSpike
65f57361a4 Add blood pressure status macro 2018-05-08 09:28:16 +01:00
SilentSpike
c92fd89c7a Fix pain percieved function calls 2018-05-08 08:47:03 +01:00
SilentSpike
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
SilentSpike
5bc57cd793 Remove missing function PREPs 2018-04-27 15:32:11 +01:00
SilentSpike
d08cf4bdb7 Fix preprocessor includes 2018-04-27 15:21:49 +01:00
SilentSpike
5bd4cfcf59 Fix status macros 2018-04-24 20:19:47 +01:00
SilentSpike
e065ee239e Merge branch 'medical-rewrite' into medical-rewrite-restructure 2018-04-24 20:07:05 +01:00
SilentSpike
535e285c2c
Fix cardiac arrest time scale () 
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
 2018-04-18 23:25:44 +01:00
SilentSpike
895f08a215
Reset triage card on full heal () 2018-04-11 20:34:32 +01:00
PabstMirror
85cf4424f9
Fix german medical translation () 2018-04-02 00:59:47 -05:00
lugubrioushatchling
e1241da4a9 Fixes for portuguese translation of ACE medical () 
* Update stringtable.xml

* Update AUTHORS.txt

* Update stringtable.xml

* Update stringtable.xml
 2018-04-02 00:35:27 -05:00
Orbis2358
5bb27a28a7 Korean translations fix () 
* Korean translations fixed

Avulsion: 적출상
Laceration: 열상
Crush: 압궤상
Puncture Wound: 자상

* Update AUTHORS.txt
 2018-02-18 02:31:34 +01:00
Whigital
f214b884a2 Settings strings () 
* [hearing] Update strings

* [medical] Update strings

* [medical_ai] Update strings

* [medical_menu] Update strings

* [nametags] Update strings

* [nametags] Use existing DisplayName entries

* [medical_menu] Correct spelling

* [medical] Disable unreferenced setting

* [medical] Overdosing strings

* [medical_menu] Correct key IDs

* [repair] Update strings

* [medical] Correct spelling
 2018-02-13 13:30:38 -06:00
jonpas
2ac412a406 Merge branch 'master' into armake 2018-02-06 14:34:07 +01:00