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
12,182 Commits 73 Branches 88 Tags 752 MiB
4b1672eaa0
Commit Graph

1579 Commits

Author SHA1 Message Date
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
classic
98ccd879f3 Japanese translation d02dacf (#5309) 
* add the Jpn translation for repair

add the Japanese translation for repair

* minor fix to Jpn translation for medical

minor fix to Jpn translation for medical
 2017-06-23 11:39:06 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02:00
SilentSpike
a53f68a347 Use getUnitTrait for medics, engineers and EOD (#5246) 2017-06-10 11:41:01 +01:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255) 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02:00
Cuel
5b9c70a738 Fix zeus RC units using player damage treshold (#5219) 
* Fix zeus RC units using player damage treshold

Closes #5218

* add pabstmirrors suggestion

use gvar
 2017-06-02 11:21:57 -05:00
PabstMirror
7bccf2f6be Fix IVs not showing in patient display (#5230) 
Fix #5192 for 3.10
 2017-06-01 10:28:47 -05:00
PabstMirror
0cdb2ce238 Increase max weapon index for large modsets (#5054) 2017-05-12 13:12:39 -05:00
classic
777d0e6fb0 Improve Japanese translation (#5133) 
* Add the Japanese translation for cargo

Add the Japanese translation for cargo, fix to html tag and few improvement

* fix the Japanese transltion

Fix the Japanese translation for attach. it was used wrong html tag.

* changed The Japanese translation

Changed the Japanese translation of azimuth angle

* fix The Japanese translation

Fix the Japanese translation for chemlights. it was used wrong html tag.

* fix The Japanese translation

Fix the Japanese translation for laserpointer. it was used wrong html tag.

* Fix the Japanese translation

Fix the Japanese translation for medical_blood. it was used wrong translation.

* Fix the Japanese translation

Fix the Japanese translation for rearm. it was used wrong translation.

* add The Japanese translation

add The Japanese translation to new words

* Improve The Japanese translation

Improve, fix and change The Japanese translation

* minor fix to Japanese translation

minor fix to Japanese translation. see b1b07c5
 2017-05-06 12:01:31 -05:00
11RDP-LoupVert
a0e1205e54 (Medical) French text - minor changes (#5043) 
Minor changes due to users feedback
 2017-04-12 08:40:31 +02:00
11RDP-LoupVert
fc860e7b43 French loc improvement (#5017) 
* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time
 2017-03-25 10:52:37 -05:00
PabstMirror
c49e5bcfa0 Reload medical configs into extension on save load (#4941) 2017-03-08 19:33:28 +01:00
sbng-PAPA
e2c04a80c4 More accurate Korean translate for medical (#4897) 2017-03-02 17:48:48 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
Mark Ruffner
0900bf964b Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-02-18 12:27:36 -06:00
NorXAengell
1be278fbda French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-02-11 15:16:56 -06:00
commy2
9d68fbf987 fix script error caused by new arguments passed to handleDamage (#4866) 
* fix script error caused by new arguments passed to handleDamage

* Copy array to not break other handleDamage ehs

* Resize to 7
 2017-02-02 13:03:13 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
Karan Singh
09b89a0bbc Fix typo in Eden Options (#4615) 
* Fix typo in Eden Options

This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp

* Fix L13
 2016-11-09 13:07:29 -06:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
eaf00c8340 translate medical 2016-09-28 01:15:38 +09:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395) 
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
 2016-09-18 22:00:13 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306) 
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
 2016-09-01 12:46:08 +02:00
Joko
927d8ead8f add Hiddenselection camo to bodybag for Retexturing (#4276) 
* add Hiddenselection camo to bodybag

* Add default texture

* Use macro
 2016-08-24 12:42:32 -05:00
Glowbal
83e78f1021 Merge pull request #4258 from acemod/reviveTimer 
Clear reviveState when calling setUnconscious
 2016-08-20 11:57:51 +02:00
Glowbal
167dc7735d Merge pull request #4197 from acemod/litterSimpleObject 
Use createSimpleObject for medical litter
 2016-08-20 11:53:43 +02:00
PabstMirror
b02e91e02e Clear reviveState when calling setUnconscious 
#4250
 2016-08-18 01:59:40 -05:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
PabstMirror
c46b2d09cf Heal hitpoint after bandage sets bodyPartStatus 2016-08-07 13:58:09 -05:00
PabstMirror
82cf18575c Minor tweaks to medical 
- decrease needed blood loss on selection to turn icon red. (Largest
wound bleedingRate is only 0.1)
- Don't print warning for basic medical bandage not having sub configs
 2016-08-03 13:14:12 -05:00
PabstMirror
02c308e141 Use createSimpleObject for medical litter 2016-08-01 16:20:13 -05:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
Glowbal
c8a54fd090 Merge branch 'release' 2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
PabstMirror
0281bc8f3d Fix 3den attribute layout for 1.62 2016-07-12 17:54:16 +02:00
Glowbal
ee8e03a1ae Merge pull request #3916 from acemod/merge-basic-and-advanced 
Merge basic and advanced injury systems
 2016-07-12 13:36:02 +02:00
Glowbal
0e740f00c3 Merge branch 'release' 2016-07-11 23:42:03 +02:00
Glowbal
d0c30577af Remove usage of setUnconscious 2016-07-11 19:18:40 +02:00
Glowbal
f86d8d113c Merge branch 'release' 2016-07-09 11:36:49 +02:00
PabstMirror
450b8dfedb Fix order of revive loop 
Fix #4035
Revive loop was killing heartrate before it exited
 2016-07-06 00:54:51 -05:00
Glowbal
e3f96b6594 Merge branch 'master' into merge-basic-and-advanced 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
 2016-06-30 11:27:51 +02:00
Glowbal
cd08e00c71 Merge pull request #3962 from acemod/dogtags 
Dogtags
 2016-06-29 22:19:02 +02:00
Glowbal
1d66d46501 Fix damaged array not being overwritten. 
This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.
 2016-06-27 19:55:00 +02:00
Glowbal
a9f3c2f784 Merge pull request #4012 from acemod/fix-medical-config-typo 
Fix incorrect values for bandage configuration
 2016-06-27 19:07:34 +02:00
Glowbal
c287223a08 Fix incorrect values for bandage configuration 2016-06-27 19:01:33 +02:00
PabstMirror
10a19b59e7 Swich EFUNC(common,waitAndExecute) to CBA 2016-06-26 22:18:53 -05:00
Glowbal
b84b532cfb Merge pull request #4001 from acemod/renameEvents 
Rename events
 2016-06-26 10:47:39 +02:00
esteldunedain
18f09b9310 Rename events: 
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo ->  ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess ->  ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
 2016-06-24 10:45:13 -03:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
PabstMirror
3972504d4a Add dogtag actions to body bags 2016-06-21 12:13:32 -05:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Josuan Albin
a04dec0c63 Update french translation 2016-06-19 15:16:43 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
d26f133733 Add missing french entries in stringtables and update older ones 
Take changes from #3480 and completed empty entries
 2016-06-19 01:18:12 +02:00
Glowbal
74da8cc36c Fix strange animation played when using PAK 
Fixes #1695
 2016-06-18 13:12:49 +02:00
Glowbal
f6b744e741 Merge pull request #3945 from acemod/fix-gray-screen-medical 
Fix no gray screen for advanced medical
 2016-06-18 11:59:14 +02:00
Glowbal
7dc76dee78 Fix no gray screen for advanced medical 
Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.
 2016-06-18 11:55:03 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
Glowbal
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +02:00
Glowbal
38cdd523f0 Clean up medical function private declares 2016-06-13 14:27:43 +02:00
Glowbal
58f43f8a51 Remove unneeded and deprecated functions from medical 2016-06-13 12:24:28 +02:00
Glowbal
6657bde921 Change basic medical to use advanced medical injury system 2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009 Change clean up privates in handleDamage code 2016-06-13 11:05:21 +02:00
Glowbal
8e59993d7a Change clean up medical code 2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65 Change formatting and private keywords in medical 2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7 Change minor clean up of handleUnitVitals 2016-06-13 02:11:21 +02:00
Glowbal
43a2b0ea29 Merge pull request #3909 from acemod/fix-bandaging-configuration 
Adjust bandage configuration
 2016-06-12 23:25:16 +02:00
PabstMirror
1997cb5199 Add maxDam for medium velocity wounds 
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
 2016-06-12 14:47:59 -05:00
Glowbal
fa1282406f Change bandage configurations 
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
 2016-06-12 20:40:45 +02:00
Butt4cak3
151d13244b Improved misleading translation of german bandages (#3810) 
* Improved misleading translation of german bandages

* Further improved german bandage names
 2016-06-11 21:35:22 +02:00
Glowbal
7f9257716e Merge pull request #2331 from acemod/323bloodyoverlay 
remove BI blood overlay
 2016-06-11 20:49:54 +02:00
PabstMirror
dc6d5f1367 Temp fix for change to handleDamage in dev branch 
Fix #3892
 2016-06-09 21:26:50 -05:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +02:00
commy2
a61e4b3a4e remove BI blood overlay 2016-06-06 14:14:45 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
PabstMirror
637b5e02e9 Update 3den attributes to use 1.60 scaling (#3857) 2016-06-02 09:26:57 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
commy2
e7fa02d0d9 Merge pull request #3812 from acemod/cbaDelayedExecFnc 
Use new CBA delayed execution functions and deprecate ACE functions
 2016-05-30 21:02:29 +02:00