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
11,710 Commits 73 Branches 88 Tags 752 MiB
fe16b72837
Commit Graph

9624 Commits

Author SHA1 Message Date
jonpas
f0977a18ac Fix multiple slideshows sub-actions, Add set name setting (#4904) 
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
 2017-03-13 20:20:23 +01:00
PabstMirror
32c5d1c80c Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-03-13 20:19:51 +01:00
PabstMirror
d3bfcf0aa9 Fix MUL macros (#4888) 
Conflicts:
	addons/frag/functions/fnc_frago.sqf
 2017-03-13 20:19:16 +01:00
jonpas
5ef06590cc Fix double single quote to single double quote (#4876) 2017-03-13 20:16:56 +01:00
PabstMirror
796eba5297 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-03-13 20:16:35 +01:00
commy2
d2bcfe02b5 fix HK416 name, fix #4873 (#4874) 2017-03-13 20:15:40 +01:00
jonpas
43dc1f020e Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-11 22:49:54 -06:00
PabstMirror
d313d53b02 Fix gforce avg on switching to aircraft (#4955) 
* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array
 2017-03-09 16:49:50 -06:00
PabstMirror
f3d2833b28 Fix rangecard not showing wind/lead (#4964) 2017-03-08 19:40:48 +01:00
PabstMirror
d900871da4 Pass map gestures draw by reference (#4914) 2017-03-08 19:34:58 +01:00
PabstMirror
c49e5bcfa0 Reload medical configs into extension on save load (#4941) 2017-03-08 19:33:28 +01:00
PabstMirror
110bce763f Fix intergrated scopes (#4945) 2017-03-08 19:31:26 +01:00
PabstMirror
19af072c99 Give options menu list focus (#4965) 2017-03-08 19:26:05 +01:00
Mark Ruffner
acf422b774 Add validation on group id for map gesture color mapping (#4976) 2017-03-08 09:58:29 -06:00
PabstMirror
0841c05a6d Cleanup use of ACE_HashLocation (#4975) 2017-03-08 10:15:15 +01:00
PabstMirror
d403f20d71 Adjust addDamageToUnit for rewrite 2017-03-06 15:06:01 -06:00
PabstMirror
2e47bad280 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-02 18:01:40 -06:00
PabstMirror
8ad3571d19 Merge branch 'master' into medical-rewrite 2017-03-02 18:00:34 -06:00
sbng-PAPA
e2c04a80c4 More accurate Korean translate for medical (#4897) 2017-03-02 17:48:48 -06:00
Ozan Eğitmen
3aa55b1452 New Function to Show BIS Style Curator Messages (#4844) 
* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args
 2017-03-02 17:47:49 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
J3aLeiNe
6ce9ede1b5 Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-02 14:00:18 -06:00
J3aLeiNe
dd76a91844 Update CfgWeapons.hpp (#4893) 2017-02-28 19:14:01 -06:00
jonpas
b9fa3e404d Require CBA v3.2.1 (#4954) 2017-02-27 14:22:45 -06:00
jonpas
bc70571765 Use CBA Accessory Functions for Laser mode switching (#4855) 
* Use CBA Accessory Functions for Laser mode switching

* Use CBA ACC EH to prevent switching to unusable lzr (#4860)

* Use CBA ACC EH to prevent switching to unusable lzr

* Re-call CBA_accessory_fnc_switchAttachment

* Require CBA 3.2.0
 2017-02-25 17:16:40 +01:00
PabstMirror
287d3b475b Add RHS GREF compat for RKG-3 grenade (#4944) 2017-02-24 19:21:42 -06:00
PabstMirror
0bc1e12775 Verify params in atragmx profile gunlist (#4917) 2017-02-24 19:20:27 -06:00
PabstMirror
02ea214ade Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-02-24 19:19:39 -06:00
PabstMirror
e41fbcb0fd Fix lost magazines when restoring gunbag mags (#4942) 2017-02-24 19:19:05 -06:00
jonpas
1590948b92 Fix multiple slideshows sub-actions, Add set name setting (#4904) 
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
 2017-02-24 14:08:18 +01:00
PabstMirror
97ec22bd9a Switch heartbeat to waitAndExec, allow switching pain settings 2017-02-18 22:11:40 -06:00
PabstMirror
34f87f89bb Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-02-18 18:24:03 -06:00
PabstMirror
0d4aa8197a Fix moved KR wounds strings 2017-02-18 18:22:23 -06:00
PabstMirror
c7b60d1777 Merge branch 'master' into medical-rewrite 2017-02-18 18:17:37 -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
PabstMirror
9d128152a3 Hide earplug actions if setting disabled (#4913) 
* Hide earplug actions if setting disabled

* Add lines that are new
 2017-02-16 10:16:46 -06:00
Glowbal
19d5fa0a4e Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-02-14 16:53:35 -06:00
Glowbal
283c372291 Merge branch 'release' 2017-02-14 22:43:31 +01:00
Glowbal
df693d69b6 Prepare v3.9.0 release 2017-02-14 21:25:22 +01:00
PabstMirror
dfca4fdcf8 Pass functions by "reference" to bis event handlers (#4898) 
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix
 2017-02-14 10:54:37 -06:00
PabstMirror
036bb0ecd4 Use createSimpleObject to create tags (#4892) 2017-02-14 10:54:21 -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
PabstMirror
33b19f7b4c Fix MUL macros (#4888) 2017-02-11 15:07:10 -06:00
PabstMirror
f678f4a3b1 Fix getPos order (#4889) 2017-02-10 21:23:33 -06:00
PabstMirror
159e762576 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-02-10 13:03:12 -06:00
PabstMirror
78a55d4436 Generic cycle attack profile key for missile guidance (#4787) 
* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup
 2017-02-10 13:01:17 -06:00
PabstMirror
70f4dd3e6b Fix passenger actions - Ensure order of MainActions (#4883) 2017-02-10 12:49:10 -06:00
commy2
97a0624375 Optimize Laserpointer (#4859) 
* only process one unit every 0.1 seconds

* exitWith to keep indentation low

* use event to determine isIR and isTI

* correctly remove units with turned on lights from their arrays

* handle weaponAccessories command reporting nil
 2017-02-10 12:47:08 -06:00
PabstMirror
3ce0865913 Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-02-10 12:34:51 -06:00
Ozan Eğitmen
d2ee1e987a Frag Superanal Cleanup (#4803) 
* Minimal frag cleanup

* Why did this even happen in the first place
 2017-02-10 12:28:27 -06:00
Dedmen Miller
5351b43ff3 Cache Nametags onDraw3D flags. (#4847) 
* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header
 2017-02-10 12:19:14 -06:00
PabstMirror
4433f6eb38 Merge branch 'master' into medical-rewrite 2017-02-08 10:32:22 -06:00
PabstMirror
231346a199 Fix Javelin for AI (#4857) 2017-02-05 23:01:48 +01:00
commy2
10756ff02d fix HK416 name, fix #4873 (#4874) 2017-02-05 23:01:06 +01:00
jonpas
4d872b84b7 Fix double single quote to single double quote (#4876) 2017-02-05 23:00:35 +01:00
Glowbal
c0c41667e7 prep v3.9.0 2017-02-05 13:48:09 +01:00
Dystopian
06f99f044c Fix deprecated AW159 and CH-47I config (#4726) 2017-02-02 17:45:32 -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
BaerMitUmlaut
0c6eec8485 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-01-30 21:34:51 +01:00
BaerMitUmlaut
60c57a7f20 Fix unconscious state in cardiac arrest 2017-01-30 21:22:10 +01:00
BaerMitUmlaut
9d3807e7c2 Fixed div by zero 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
7ff753c3c2 Fixed missing semicolon 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
20cf30a7c6 Moved heart beat sounds to medical ui 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
ecbe429f9d Fixed missing private 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
e447d5c222 Added bleeding effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9cef8ea591 Save pain next tick in GVAR instead of on unit 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
1dc301e023 Added ACE2 like repeated eye opening when unconscious, fixed going into Zeus while waking up 2017-01-29 21:59:24 +01:00
ulteq
04b720f5bc Make use of EFUNC(medical,getPainLevel) 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
57cacf63fa Rewrote unconscious effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
26627a451e Tweaked pain effect (longer flashes/pulses) 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
13ef6b0d29 Fixed blood volume effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
751c7ff959 Fixed default blood volume 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9eba2bd448 Added visual effects 2017-01-29 21:59:24 +01:00
Dorbedo
aa393ccf92 typo in ace_interaction_fnc_getDoorAnimations (#4854) 2017-01-28 13:43:42 -06:00
Dystopian
b30705661c add real name for civilian kamaz trucks (#4851) 2017-01-23 12:14:55 -06:00
Neviothr
9b36ccadcc Aircraft cleanup (#4818) 
* Cleanup

* Returned lines between classes

* Add files via upload
 2017-01-23 12:13:37 -06:00
PabstMirror
e9b5bde371 Add ace_setting for scaling cookoff effect length (#4842) 
* Add getVar for scaling cookoff effect length

* Switch to ace_setting

* Add notes about merging settings
 2017-01-23 12:13:02 -06:00
Dystopian
7cdf2d75a3 fix win newline in repo (#4849) 2017-01-23 00:56:52 +01:00
Dystopian
d5d8413ee9 fix kamaz medical can repair (#4850) 2017-01-22 10:39:02 -06:00
ViperMaul
ba810a22e6 Tab clean up. 2017-01-19 18:38:51 -06:00
ViperMaul
ad2e3719b4 Adding Normal to Common stringtable 2017-01-19 17:31:29 -06:00
ViperMaul
567c9129b2 cleanup 2017-01-19 17:23:54 -06:00
ViperMaul
59c58b1269 Add settings function handler 2017-01-19 17:19:54 -06:00
ViperMaul
8db5d8f2ae Change Setting from Basic to Normal and Stringtable moves 2017-01-19 15:46:44 -06:00
ViperMaul
6972af9d0b Settings and string changes 2017-01-19 15:30:27 -06:00
ViperMaul
1078913d2a Stringtable changes. 2017-01-19 15:29:33 -06:00
ViperMaul
69dc3ba12e Add Settings to Medical Settings Module 2017-01-19 11:48:34 -06:00
jonpas
b7f36ffd12 Add orange map chemlight entry (#4839) 2017-01-18 18:18:28 -06:00
PabstMirror
120ddd94de Merge branch 'master' into medical-rewrite 2017-01-17 18:03:28 -06:00
ViperMaul
5deb305906 Fix ace_gunbag track named properties (#4838) 2017-01-17 18:03:27 -06:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821) 
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
 2017-01-17 15:33:22 -06:00
PabstMirror
4f3f847930 Fix ace_track named properties (#4837) 
* Fix ace_track named properties

* Fix 4 more
 2017-01-17 15:32:14 -06:00
jonpas
3ac00f2e21 Fix medical typo 'to' -> 'too' (#4824) 2017-01-17 15:26:07 -06:00
PabstMirror
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
Neviothr
ade87adf46 Modules Cleanup (#4813) 
* Cleanup

* Added newlines
 2017-01-14 15:47:03 -06:00
bux
3f00da7365 decrease concertina "dismount" time, use ace checks (#4812) 
IRL it’s just pushing them together again
 2017-01-13 13:43:54 -06:00
Dedmen Miller
6c12444d85 Fixes #4814 (#4815) 
Doesn't fix the core issue behind #4814 but it fixes the issue that bothered me so much that i reported this.
 2017-01-11 15:54:03 -06:00
PabstMirror
39181fdea5 Simplify huntIR configs using += (#4521) 
* Add huntIR magazine to GL_3GL_F via sub config

* Cleanup RHS 40mm huntIR GL config

* Add huntir to standalone m320 - #4199
 2017-01-09 12:11:31 -06:00
PabstMirror
8752b03c12 Hearing - player only event handlers (#4727) 2017-01-09 12:10:52 -06:00
PabstMirror
bce0913019 Cookoff - add function to get ammo (#4779) 
* Cookoff - add function to get ammo

Fix #4565 - Function adds virtual ammo for rearm vehicles
Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition
Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just
the current mag
Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false

* Fix header

* Cleanup getting ammo from turrets
 2017-01-04 15:35:54 -06:00
classic
0046ba4bbb fix Japanese translation for #4785 (#4804) 
"j" is replace by a "J"
 2017-01-04 16:37:00 +01:00
J3aLeiNe
2dcd79fd1d Update MapData (#4786) 
* Update Map data

 - Add IFA3LITE maps
 - Add CSA38 map
 - Add Beketov map
 - Add Winter Panthera map
 - Add Nam and Mogadishu maps
 - Add Uhao island map

* Update fnc_getMapData.sqf

 - Add X-Cam-Taunus map
 - Add Unsung 3.1 Delta maps
 2017-01-02 21:32:58 -06:00
BaerMitUmlaut
0a05401e74 Fix cookoff locality issues (#4799) 
* Fix locality issue with box cookoff

* Add grenade fired EHs on hcs and dedis
 2017-01-02 17:55:44 -06:00
classic
9d37d91c71 Jpn translation for overpressure #4770 (#4785) 
Japanese translation for #4770
 2017-01-02 17:54:51 -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
jonpas
e296c12b30 Remove duplicated Zeus strings 2017-01-02 16:16:37 +01:00
Skully71
9b22f94374 Ensure movingToInjured is false whenever _target no longer needs healing, fixes #4797 (#4800) 2017-01-02 14:02:43 +01:00
markooff
0c069a6bd2 polish translations (#4734) 
* some extra polish translations

for details see polish_translations_readme_markooff.txt

* file was deleted as it wasn't the part of the mod (only for information reason)
 2017-01-02 13:21:47 +01:00
PabstMirror
3cd80a42d7 Fix cruise heigh on close shots (#4795) 2016-12-29 15:04:19 -06:00
PabstMirror
c22fce273f Overpressure changes (#4770) 
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
 2016-12-22 13:29:05 -06:00
bux578
886e23791f Merge pull request #4774 from classicarma/fix-jpn-translate-v383 
Fix jpn translate v383
 2016-12-17 15:59:50 +01:00
classic
6a93f58b52 added missing localization in jpn translation 
added missing localization in jpn translation
 2016-12-17 20:50:19 +09:00
classic
552e9ecd87 fix jpn translation for ballistics 
fix html tag in the japanese translation.
 2016-12-17 20:39:57 +09:00
PabstMirror
988c5b0a25 Minor wind deflection optimization (#4762) 2016-12-16 08:08:10 +01:00
bux578
d8fec7fbe3 improve german translation for entrenchment tool (#4769) 2016-12-15 13:42:13 -06:00
ulteq
1e79f35e43 Always visualize bandaged wounds 
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
 2016-12-15 15:01:02 +01:00
ulteq
0ddfd5eb16 Disable wound reopening when advanced bandages are disabled 2016-12-15 14:51:24 +01:00
ulteq
70a2dc30e7 Refactored 'showPainInMenu' setting 
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
 2016-12-15 14:45:58 +01:00
ulteq
cc19499e8f fieldDressing -> FieldDressing 2016-12-15 14:06:09 +01:00
ulteq
9ddaa01462 Always allow the use of tourniquets 
* Even when advanced bandages are turned off
 2016-12-15 14:05:08 +01:00
ulteq
91cbc0e4d4 Added new setting 'advancedDiagnose' 
* Which allows to choose between the old basic- and advanced diagnose actions
 2016-12-15 14:00:09 +01:00
classic
0842481c2f fix for jpn translate in medical_menu 
Delete unnecessary the HTML tags in line 134
 2016-12-15 20:58:21 +09:00
ulteq
0de405fe2a Fix morphine when advanced medication is disabled 2016-12-15 12:58:06 +01:00
Ozan Eğitmen
ef4d289836 Add Zeus Module for FRIES (#4597) 
* Initial commit

* Revert unrelated changes

* Add newline

* Fix undefined var, localize text

* Shorten strings, add missing parameters

* Fix logical error

* Fix capitalization, Update string, Only add EH on server

* Add missing uses of the private command

* Remove excess formatting

* Add module category
 2016-12-14 23:55:06 -06:00
Dedmen Miller
c009000bd9 Use new private syntax for winddeflection PFH (#4761) 2016-12-14 23:29:07 -06:00
ulteq
65f0f56474 Implemented 'showPainInMenu' 2016-12-14 21:30:28 +01:00
ulteq
8146cb427e Revert "Implemented 'showPainInMenu' logic" 
This reverts commit 964711a38b.
 2016-12-14 21:23:26 +01:00
ulteq
0d0cf38028 Fix bandage reopening classname/category lookup 2016-12-14 21:17:39 +01:00
PabstMirror
5379503772 Fix deadman range, fix clacker transfer, use setShotParents (#4689) 2016-12-14 14:06:32 -06:00
ulteq
e817e13cfd Only call 'handleIncapacitation' when it makes sense 
* Minor injuries should not trigger incapacitation
 2016-12-14 21:02:24 +01:00
ulteq
964711a38b Implemented 'showPainInMenu' logic 2016-12-14 20:55:03 +01:00
ulteq
196a3999a4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-14 20:44:22 +01:00
ulteq
151d4a4bfe Settings overhaul 
New settings:
* allowSelfIV
* showPainInMenu

Converted CBA -> ACE Settings:
* advancedBandages
* advancedMedication
* fatalInjuryCondition
* cardiacArrestTime

Fixed settings:
* useLocation_Epi
* medicSetting_Epi
* painCoefficient
 2016-12-14 20:44:06 +01:00
Dystopian
4f20d1f7c6 add rearm to Vehicle Ammo boxes (#4750) 2016-12-14 13:18:04 -06:00
Dystopian
cc3b669fcd Fix missing refuel menu on static fuel stations (#4533) 
* fix static fuel stations

* Directly compile menus and remove XEH from buildings
 2016-12-14 12:48:00 -06:00
PabstMirror
af4b3e31e1 Minor iv optimization 2016-12-14 11:50:31 -06:00
ulteq
dafefda04a Fixed typo 
Closes: https://github.com/acemod/ACE3/pull/4697
 2016-12-14 18:33:36 +01:00
ulteq
a2b964a993 Fixed bandage config lookup 2016-12-14 18:04:56 +01:00
ulteq
5d3f97ace7 Fix IV Bags work on limbs with a tourniquet applied 2016-12-14 12:36:51 +01:00
Glowbal
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c Prep 3.8.3 2016-12-12 19:50:16 +01:00
PabstMirror
06caea825b AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-12 19:33:34 +01:00
commy2
757ab78191 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-12 19:33:05 +01:00
PabstMirror
11b464b585 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-12 19:32:23 +01:00
PabstMirror
de34d57d5b Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
PabstMirror
14c7e9af17 AF - Remove setVar when removing eh 2016-12-12 19:30:58 +01:00
Glowbal
b72541df23 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-12-12 19:29:58 +01:00
ulteq
6b611ffbbd Cleanup: 'handleBandageOpening' 2016-12-10 16:36:36 +01:00
ulteq
a3fd916d21 Do not restore blood volume in partial heal 2016-12-10 16:30:05 +01:00
ulteq
1bc1865313 Minor cleanup: 'treatmentBandageLocal' 2016-12-10 15:39:03 +01:00
ulteq
852f78b801 Classify the perceived pain intensity on all patient information outputs 
Fixes: #2117
 2016-12-10 15:24:20 +01:00
PabstMirror
a451ad356e Close patient display when interaction menu closes 2016-12-09 21:35:26 -06:00
PabstMirror
c2f9010183 opps 2016-12-09 21:29:23 -06:00
PabstMirror
3907d2dc9f Cleanup moved functions 2016-12-09 21:27:42 -06:00
PabstMirror
b87bdfe14a Fix body-bag action / cleanup 2016-12-09 21:03:52 -06:00
PabstMirror
ee864b2c46 Fix medkit string, fix overpressure 2016-12-09 13:48:54 -06:00
ulteq
05b9208d3c Change debug 2016-12-09 18:43:32 +01:00
ulteq
03f9ba1bad Improved simulation of tourniquet pain: 
* Made use of the new pain level helper function
 2016-12-09 17:48:27 +01:00
ulteq
ada43148e9 Removed deprecated revive settings 2016-12-09 17:07:05 +01:00
ulteq
bfda932384 Different max. bleeding rates for different body parts 2016-12-09 15:54:33 +01:00
ulteq
0a81baf498 Better and simpler bleeding rate calculation 2016-12-09 14:11:07 +01:00
ulteq
a809047ac4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-09 12:57:42 +01:00
ulteq
82e88061fc Added 'DEFAULT_HEART_RATE' constant 2016-12-09 12:57:27 +01:00
PabstMirror
cc6150303f Add setting for blood bag flow rate (#4751) 2016-12-09 11:33:01 +01:00
ulteq
31bc54ff33 Further improved the wound merging logic 2016-12-09 10:55:24 +01:00
PabstMirror
c431a7d236 Ignore UAV AI hitpoints 2016-12-08 15:53:52 -06:00
ulteq
c486f17539 Implemented Medkit (works like in ACE2) 2016-12-08 18:11:24 +01:00
BaerMitUmlaut
a48d271368 Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits 
Introduce small variation to length of cardiac arrest
 2016-12-08 14:22:11 +01:00
ulteq
3b82510751 Merge new wounds into existing wounds whenever possible 
* Todo: separate 'amountOf' into two variables (wound count and bandage percentage)
 2016-12-08 12:59:30 +01:00
ulteq
b81a5adcb9 Renamed 'healTime' calculation helper 2016-12-08 12:30:59 +01:00
ulteq
9dee5a9083 Don't remove wounds on partial heal 2016-12-08 12:16:11 +01:00
ulteq
beb1c7036c Removed todo flag 2016-12-08 11:55:38 +01:00
ulteq
280943cb4d Fixed occluded medication (tourniquet removal logic) 2016-12-08 11:54:59 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00
ulteq
627ea0ebdc Dynamically translate different wound types 
* Brings back minor, medium, large wounds
 2016-12-07 21:56:13 +01:00
ulteq
89c68364ef Fix pain suppression not affecting 'setCustomAimCoef' 2016-12-07 19:51:28 +01:00
ulteq
708ac207fd Make Avulsions even less likely 2016-12-07 19:10:12 +01:00
ulteq
6ce1910a96 Fix partial heal 2016-12-07 18:53:12 +01:00
ulteq
66803a4b4d Fix damage coloring 2016-12-07 18:53:04 +01:00
ulteq
8c5da66c43 Increase "basic medication" effectiveness of morphine 2016-12-07 18:41:42 +01:00
ulteq
74fefb6f69 New body part colors: 
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
 2016-12-07 18:28:35 +01:00
ulteq
7f1678b7e6 Increased wake up chance 2016-12-07 18:19:35 +01:00
ulteq
0c8ebd6441 Slightly increase Tourniquet 'treatmentTime' 2016-12-07 17:56:59 +01:00
ulteq
4da07bd2a4 Attemp to reduce 'Avulsion' likelihood 2016-12-07 17:47:02 +01:00
ulteq
09f6f2284b Tweaked morphine config 2016-12-07 17:46:16 +01:00
ulteq
45aa80bed7 Fix leg damage always counted as #vehiclecrash 2016-12-07 16:39:22 +01:00
ulteq
03f7451c99 Fixed incorrect debug output 2016-12-07 11:41:58 +01:00
ulteq
5db75ac746 Fixed check blood pressure did not always account for tourniquets 2016-12-07 11:32:01 +01:00
ulteq
ab7af04530 Overhauled the medication system: 
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
 2016-12-06 20:42:10 +01:00
ulteq
b2838557fa Removed dead code 'hrCallback' 2016-12-06 18:55:54 +01:00
ulteq
02ac4c4084 Fixed minor bug in the heart rate calculation 2016-12-06 17:40:05 +01:00
ulteq
faa2b619ab Removed overly verbose debug logs 2016-12-06 17:35:52 +01:00
ulteq
fa77fb7194 Various fixes: 
* Fixed medication (morphine, epinephrine, ...)
* Fixed CPR
* Improved heart rate simulation
* Removed deprecated ace settings
 2016-12-06 17:26:11 +01:00
ulteq
978a81fb0a Removed dead code 2016-12-06 14:37:48 +01:00
ulteq
92da5c80a0 Partly fixed Medication 
* Brings the heart rate adjustment (due to medication) back to life
* Restores the medication effect loop (needs testing)
 2016-12-06 12:58:12 +01:00
ulteq
7d6edd6c41 Brought the SQF variant of the woundsHandler back (for linux servers) 2016-12-06 10:59:29 +01:00
ulteq
db547a53b7 Increased unconsciousness wake up interval 2016-12-06 10:58:43 +01:00
PabstMirror
c47772eddc Fix stringtables 2016-12-05 19:40:26 -06:00
ulteq
46340fe8d8 Fixed accident 2016-12-05 23:03:25 +01:00
ulteq
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00
ulteq
624315524e Fixed typo 2016-12-05 21:39:47 +01:00
ulteq
a5ce5b4a34 Medical Rewrite - Continued (#4744) 2016-12-05 21:34:20 +01:00
commy2
9cba0baade manual merge 2016-12-05 20:18:15 +01:00
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
PabstMirror
8d1f988f5d AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-02 12:44:39 -06:00
commy2
d75eeac1e4 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-02 10:09:48 -06:00
PabstMirror
4eba77f328 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-01 20:36:10 -06:00
ulteq
3e0f85b4f1 RangeCard - Take bore height into account (#4715) 2016-12-01 21:20:51 +01:00
PabstMirror
3566e6e7f5 Update SMG_02 base class for 1.66 (#4718) 2016-12-01 12:05:28 -06:00
PabstMirror
321bb0bc57 Add frag definitions for remaining ammo (#4736) 
Remove rpt warning
Close #342
 2016-12-01 11:01:55 -06:00
ulteq
448dcddc55 ATragMX - cleanup and some fixes (#4714) 
* ATragMX - Improved the default gun profiles
* Recalculated all muzzle velocities (based on 15 degrees Celsius)
* Recalculated all scope base angle (based on the new muzzle velocities)

* ATragMX - Removed lots of duplicate code
* Introduced dynamic simulation interval (based on muzzle velocity)

* ATragMX - Fixed simulation interval for the truing drop feature
 2016-12-01 10:23:03 +01:00
ulteq
50e144672f Ballistics - Cleanup (#4721) 
* Ballistics - Removed 'caliber', 'hit' and 'typicalSpeed' entries
* from all vanilla ammo types

* Removed all unused ammo types

* Ballistics - Removed more unnecessary config entries
 2016-12-01 10:21:59 +01:00
William Giokas
b9fbd2723a Realisticweights: Updated cyrus weight 
Cyrus was set to weigh 300 units (~30lb?). The NATO equivalent, the Noreen
Bad News (or MAR-10) weighed 130, or 13lbs, equivalent to it's real life
counterpart. This just changes the weight to 140, similar to that of the
SVDK, a possible real-life counterpart for this rifle.
 2016-12-01 01:27:02 -06:00
BaerMitUmlaut
ac28bce578 Fixed state machine not running for units 2016-11-29 12:35:26 +01:00
PabstMirror
bc89a260ff AF - Remove setVar when removing eh 2016-11-27 16:38:33 -06:00
ulteq
dff577d5d1 ATragMX - Simplified Coriolis calculation (#4716) 2016-11-27 09:56:23 +01:00
classic
05ddca5b90 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-11-25 18:50:07 +01:00
ulteq
aaebdc3752 ATragMX - Minimize the integration error (#4703) 
* The goal is to keep the error below 0.1 MRAD
 2016-11-25 10:29:49 +01:00
ulteq
7d22fce8da Advanced Ballistics - New default simulation interval (#4707) 2016-11-25 00:15:41 +01:00
ulteq
b2ba95913a ATragMX - Truing Drop fix (#4704) 
* Fixes a bug in the truing drop feature that occurs when the zero range is greater than the truing range
 2016-11-25 00:15:04 +01:00
Glowbal
050384e960 Merge branch 'release' 
Conflicts:
	docs/_config.yml
	docs/_config_dev.yml
 2016-11-25 00:08:32 +01:00
ulteq
87b9671757 AdvancedBallistics - Abort after adjusting the muzzle velocity (#4700) 
* Always adjust the muzzle velocity when advanced ballistics is enabled
 2016-11-24 00:11:25 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
Glowbal
9d08ad8238 Prep 3.8.2 release 2016-11-22 18:38:58 +01:00
ulteq
dcd4137491 Fixed several bugs in the unit conversion code 
* Proper min, max capping for both metric and imperial units
* Fixed unit conversion issues on the interpolation table input fields
 2016-11-21 21:20:48 +01:00
ulteq
cb3693f664 ATragMX - Fixes possible divison through zero 2016-11-21 21:20:48 +01:00
ulteq
dbb59c8fd1 New 'overwriteZeroRange' setting 2016-11-20 09:05:42 +01:00
ulteq
bb71885b42 Added config settings to optic_Nightstalker, optic_NVS and optic_TWS 2016-11-20 09:05:42 +01:00
ulteq
273e603cad Fix 'ACE_ScopeZeroRange' setting being ignored when placed in weapon classes 
* Only relevant for weapons with integrated scopes
 2016-11-20 09:05:42 +01:00
ulteq
1f364da0df Fix 'forceUseOfAdjustmentTurrets` affecting all scopes including iron sights 2016-11-20 09:05:42 +01:00
ulteq
f94b1a7a10 ATragMX - Improved gun list readability (#4674) 
* Reduced the gun list font size
* Redesigned the listbox scrollbars (new colors, smaller width)
* Added a negative offset for the horizontal text position in the gun list
* Limited the max. allowed length of custom gun names to 14 characters
 2016-11-19 18:05:26 +01:00
PabstMirror
491aaa89cb Update laser code if laser is already on (#4677) 2016-11-17 13:28:25 -06:00
PabstMirror
0137009060 Add RHS MELB fastrope, add 3d debuging of mem points 
Close #4683
Config from @Whigital
 2016-11-17 20:11:18 +01:00
PabstMirror
3fc8774d49 Change mortar to ammo handling weapon on init (#4678) 
Fix #4649
 2016-11-17 20:10:54 +01:00
BaerMitUmlaut
b08270742d Tweaked fatigue in water 2016-11-17 20:10:06 +01:00
BaerMitUmlaut
60651fcb1e Tweaked prone animation duty 2016-11-17 20:10:02 +01:00
BaerMitUmlaut
264fddd1c4 Fix AF for adjusted stances, fixes #4591 2016-11-17 20:09:10 +01:00
ulteq
f679b1d6bb Ballistics - AmmoBox update (Apex magazines) (#4675) 
* Added 20Rnd 6.5mm Lapua Scenar / Creedmor magazines
 2016-11-17 20:08:35 +01:00
PabstMirror
d14127ba4f Use head direction for drawing microdag wp 2016-11-17 20:08:09 +01:00
PabstMirror
0669dd6568 spaces 2016-11-17 20:07:20 +01:00
PabstMirror
054831f370 Use vehicle eh to hide bar 2016-11-17 20:07:17 +01:00
PabstMirror
948442fafb Hide bar when mounted 2016-11-17 20:07:14 +01:00
PabstMirror
8d9bd5005b Hide advFatigue bar on map / spectator 2016-11-17 20:07:10 +01:00
PabstMirror
0909d5727e Don't compile action menu for playable logics (#4666) 
Fix #4664
 2016-11-17 20:06:19 +01:00
Daniel Jupp
fa36955ffb Fix cargo find nearest vehicle (#4592) 
* Inital Commit

* read function call change

added object to exclude to function call

* Removed TODO comment
 2016-11-17 20:05:42 +01:00
PabstMirror
ed061d66ba Invert logic for isRefueling 2016-11-17 20:04:53 +01:00
jonpas
c2e933355d Prevent switching to weapon while carrying fuel nozzle - fix #4601 2016-11-17 20:04:43 +01:00
Broström.A | Evul
e73d20f3c3 ACE_Chemlight_Shield not public (#4612) 
Changed `ACE_Chemlight_Shield` to `public` from `protected`
 2016-11-17 20:03:50 +01:00
PabstMirror
1f6ce7ff81 Fix tagTestingThread error (#4662) 
Close #4659
 2016-11-17 20:03:08 +01:00
SilentSpike
27cc4ed7c0 Clean some cook off code 
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
 2016-11-17 20:02:14 +01:00