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,518 Commits 73 Branches 88 Tags 752 MiB
67f557de6a
Commit Graph

9476 Commits

Author SHA1 Message Date
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
SilentSpike
5976415b0d Add cook off 3den setting to ammo boxes 2016-11-17 20:02:11 +01:00
SilentSpike
47e1444747 Fix #4630 
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.

ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
 2016-11-17 20:02:07 +01:00
ulteq
c756537d3d ATragMX - Estimate bullet length instead of using a fixed value (#4651) 2016-11-17 20:00:34 +01:00
PabstMirror
da85fc1be5 Add RHS MELB fastrope, add 3d debuging of mem points 
Close #4683
Config from @Whigital
 2016-11-16 17:42:11 -06:00
PabstMirror
6fd561f1f0 Change mortar to ammo handling weapon on init (#4678) 
Fix #4649
 2016-11-16 11:00:50 -06:00
ulteq
ba097e719f Ballistics - AmmoBox update (Apex magazines) (#4675) 
* Added 20Rnd 6.5mm Lapua Scenar / Creedmor magazines
 2016-11-16 10:49:48 +01:00
BaerMitUmlaut
14cf9817b4 Merge pull request #4672 from acemod/af-tweaks 
Advanced Fatigue swimming/diving/crawling tweaks
 2016-11-16 06:05:48 +01:00
esteldunedain
4df561e13a Fix airburst ammo when the ACE_FCS is not enabled (the code is not reached anyway) 2016-11-15 23:11:34 +01:00
ulteq
9641d306e6 Reused already calculated initSpeed 2016-11-15 23:11:34 +01:00
esteldunedain
4854b963db Apply a correction to the FCS based on vanilla zeroing 2016-11-15 23:11:34 +01:00
ulteq
9fdf3ceb00 Refined the range card calculation abort conditions 
* Max. elevation now never exceeds 40 MRADs
* Min. velocity now also depends bullet stability (e.g. lower for .408 CheyTac)
 2016-11-15 23:11:22 +01:00
ulteq
16f3f2ca37 Optimized range card calculations 
* Removed dead code
 2016-11-15 23:11:22 +01:00
ulteq
69cd53de2a Optimized ATragMX solution calculations 2016-11-15 23:11:22 +01:00
ulteq
79d087e784 Reset scope adjustments when either the weapon or the scope change. 2016-11-15 23:11:22 +01:00
ulteq
8c49433b49 Added new ace_scopes module setting 'correctZeroing' (default on) 2016-11-15 23:11:22 +01:00
ulteq
2f23f1ca6c Bugfix - Fixes ace_scopes affecting under-barrel grenade launchers 2016-11-15 23:11:22 +01:00
ulteq
7fa73744e9 Cleanup - partly merged #4658 
* Removed getVariable QGVAR(Adjustment) boilerplate
* Less calls to setVariablePublic
* Removed vanilla zeroing element hiding (fixes warning in log file)
* Moved settings evaluation into ace_settingsInitialized event handler
 2016-11-15 23:11:22 +01:00
ulteq
10cc0ba951 Moved all zero angle calculations into the advanced_ballistics.dll 
* Speeds up ATragMX
* Speeds up RangeCards
* Speeds up Scopes
 2016-11-15 23:11:22 +01:00
ulteq
789a169b0e Allow using adjustment turrets on weapons with integrated scopes 2016-11-15 23:11:22 +01:00
ulteq
429bffd039 Moves the bore height calculation into FUNC(inventoryCheck) 2016-11-15 23:11:22 +01:00
ulteq
a687c49d2a Adds settings module for ace_scopes 
* Interconnects the rangecard and scopes modules
* Hides the zeroing text when the vanilla zeroing is overwritten
* Makes the scopes module fully compatible with any 3rd party weapon pack without the need for addition compat pbos (though their use is still recommended)
 2016-11-15 23:11:22 +01:00
ulteq
36c14c5dc4 Feature - Vanilla zeroing fix 2016-11-15 23:11:22 +01:00
BaerMitUmlaut
21502d7b7b Merge pull request #4562 from acemod/mgCleanup 
Missile Guidance Overhaul
 2016-11-15 19:16:04 +01:00
PabstMirror
b4315b6a65 Javelin overhaul (#4580) 
* Javelin overhaul

* header spelling fix
 2016-11-15 12:15:25 -06:00
SilentSpike
39582914f7 Add 10% variation to cardiac arrest time 
Gaussian distribution favours the average time setting. This introduces some unpredictability to cardiac arrest, but not enough to make users confused. Keeps the settings simple to again reduce confusion and improve overall UX.
 2016-11-15 17:00:22 +00:00
ulteq
f0279726ce Fixed typo (copy & paste remains) (#4673) 2016-11-15 16:14:35 +01:00
Remco Speekenbrink
324bf68614 Add Zeus utility modules 
- Add categories to zeus modules to group them based on their functionality
- Add new utility modules:
  1. Toggle simulation
  2. Update editable objects
- Clean up some of the zeus module code (standardise function headers, camel case, etc.)
 2016-11-15 12:07:48 +00:00
PabstMirror
4bb02a320b Run attack profile even if no target 2016-11-14 20:19:24 -06:00
BaerMitUmlaut
1d8030d196 Tweaked fatigue in water 2016-11-14 21:55:26 +01:00
BaerMitUmlaut
e4a4d8f56d Tweaked prone animation duty 2016-11-14 21:54:51 +01:00
ulteq
608f8bbfdc ATragMX - Added 7.62x39mm ammo to gun profile 2016-11-14 21:01:04 +01:00
ulteq
2e81f7c104 Ballistics - Overworked .408 CheyTac based on new JBM Ballistics data 
* Added 419gr and 305gr variants (vanilla ammo == 419gr)
* Muzzle velocities from http://www.cheytac.com
* G7 BCs from http://www.jbmballistics.com/
 2016-11-14 21:01:04 +01:00
BaerMitUmlaut
88596aaaf1 Merge pull request #4671 from acemod/fix-af-adj-stances 
Fix advanced fatigue for adjusted stances
 2016-11-14 19:59:27 +01:00
BaerMitUmlaut
a4c6daef50 Fix AF for adjusted stances, fixes #4591 2016-11-14 19:24:21 +01:00
PabstMirror
95699f267c Use head direction for drawing microdag wp 2016-11-14 12:13:41 -06:00
SilentSpike
24ada4dab3 Clarify the maximumCardiacArrestTime setting 2016-11-13 21:45:38 +00:00
SilentSpike
27728172ed Clarify the allowDeathMode setting 2016-11-13 21:27:40 +00:00
BaerMitUmlaut
b4569f0a96 Fix bracket 2016-11-13 18:11:18 +01:00
BaerMitUmlaut
d40c3fd2bf Merge pull request #4655 from acemod/fixStamBar 
Hide advFatigue bar on map / spectator / in vehicles
 2016-11-13 18:06:34 +01:00
BaerMitUmlaut
27916e8455 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-11-13 18:03:12 +01:00
PabstMirror
6f640ddc45 spaces 2016-11-13 10:56:45 -06:00
PabstMirror
b3e313f52b Use vehicle eh to hide bar 2016-11-13 10:55:57 -06:00
PabstMirror
e32bca3d14 Don't compile action menu for playable logics (#4666) 
Fix #4664
 2016-11-12 19:39:40 -06:00
Daniel Jupp
3935299e3c Fix cargo find nearest vehicle (#4592) 
* Inital Commit

* read function call change

added object to exclude to function call

* Removed TODO comment
 2016-11-12 17:52:17 -06:00
jonpas
d69b48bac5 Merge pull request #4629 from acemod/fixRefuelShooting 
Prevent switching to weapon while carrying fuel nozzle
 2016-11-13 00:13:48 +01:00
PabstMirror
76eea8924f Invert logic for isRefueling 2016-11-12 16:37:41 -06:00
Broström.A | Evul
c4c98696e0 ACE_Chemlight_Shield not public (#4612) 
Changed `ACE_Chemlight_Shield` to `public` from `protected`
 2016-11-12 16:19:50 -06:00
PabstMirror
ae0eab3a51 Use isEqualTo for checking seeker return 2016-11-12 16:15:42 -06:00
PabstMirror
26ae3b8075 Hide bar when mounted 2016-11-12 15:51:44 -06:00
PabstMirror
9e85508f0d Fix tagTestingThread error (#4662) 
Close #4659
 2016-11-12 15:46:29 -06:00
SilentSpike
c66f9e5144 Merge pull request #4638 from acemod/cookoff_fixes 
Fix ammo cook off with certain explosives
 2016-11-11 17:41:42 +00:00
PabstMirror
e086a33e4d Hide advFatigue bar on map / spectator 2016-11-10 17:49:18 -06:00
PabstMirror
5bf8b642f7 Add cargo configs for some planes (#4650) 2016-11-10 12:05:08 -06:00
ulteq
f15522a88f ATragMX - Estimate bullet length instead of using a fixed value (#4651) 2016-11-10 18:35:57 +01:00
Glowbal
0394ea56b4 Increment build 2016-11-09 22:07:07 +01:00
Glowbal
3417c433fd Prep v3.8.2 2016-11-09 22:06:48 +01:00
commy2
9e6ee0363d fix tripflares script error (#4647) 2016-11-09 21:56:57 +01:00
PabstMirror
0975a4f004 MedicalAI - Fix treatment animion with no weapon (#4633) 2016-11-09 21:56:26 +01:00
ulteq
a43b70fe89 Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags 
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
 2016-11-09 21:55:39 +01:00
William Giokas
6a910e7fe4 ballistics: Added 20 round 6.5 Lapua and Creedmoor 2016-11-09 21:55:35 +01:00
ulteq
f2a85b63cf Fixed a typo 2016-11-09 21:54:20 +01:00
ulteq
962a296710 Minor corrections in the ballistics module 
* Corrected AKS-U barrel length
* Corrected .338 250gr BC
* Corrected .338 API526 BC and muzzle velocity
* Slightly reduced 5.8x42mm muzzle velocity
 2016-11-09 21:54:16 +01:00
Dystopian
272ec37603 Fix Full Repair menu not shown when damage returns 0 (#4621) 2016-11-09 21:53:21 +01:00
ulteq
c5322bff37 Fixes the ATragMX 'Done' button issue (#4617) 2016-11-09 21:52:32 +01:00
PabstMirror
910f975276 Fix ubc 2016-11-09 21:51:11 +01:00
PabstMirror
76dbdaaecf Add semi-colon 2016-11-09 21:51:08 +01:00
ulteq
298a90b68a Updates the ATragMX gun list 2016-11-09 21:51:05 +01:00
ulteq
91def9396c Updates the ballistics module to support Apex 
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
 2016-11-09 21:51:01 +01:00
ulteq
eb6319641e Fix Kestrel4500 wind speed calculation (#4609) 2016-11-09 21:47:42 +01:00
PabstMirror
5463e9dff8 Merge branch 'master' into medical-rewrite 2016-11-09 13:12:42 -06:00
Dystopian
ff961a5bd6 Fix Full Repair menu not shown when damage returns 0 (#4621) 2016-11-09 13:11:47 -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
370e746068 fix tripflares script error (#4647) 2016-11-09 13:02:48 -06:00
PabstMirror
20f40f8c55 Use single queue for blood cleanup (#4586) 2016-11-09 13:00:18 -06:00
BaerMitUmlaut
dac4a4dc42 Merged instant death and execution into one setting 2016-11-09 19:01:55 +01:00
BaerMitUmlaut
08a378bb2d Added execution system, improved instant death 2016-11-08 19:37:56 +01:00
ulteq
0580bdcc8e Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags 
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
 2016-11-08 09:34:48 +01:00
William Giokas
8c2b88da85 ballistics: Added 20 round 6.5 Lapua and Creedmoor 2016-11-08 09:34:48 +01:00
BaerMitUmlaut
928ded0e66 Fixed instant death and PREP 2016-11-07 23:46:10 +01:00
BaerMitUmlaut
ba9fc9240c Removed traces of old state machine 2016-11-07 23:44:33 +01:00
BaerMitUmlaut
0427814961 Started transition to CBA state machine, removed revive in favour of extended cardiac arrest 2016-11-07 22:21:07 +01:00
BaerMitUmlaut
a65f1d19fa Added state machine debug functionality 2016-11-07 22:19:55 +01:00
ulteq
51c12dba1d Allow adding gun list entries via config 2016-11-07 16:40:34 +01:00
ulteq
3f4564605b ATragMX - Implemented missing features 
* Muzzle Velocity vs. Temperature Interpolation
* C1 Ballistic Coefficient vs. Distance Interpolation
* Coriolis and Spin drift output
* Options menu
* Truing Drop
---------------------------------
* Overworked default gun profiles
---------------------------------
* Fixed the Cancel buttons on the gun-, atmosphere- and target columns.
* Fixed some muzzle velocity entries in the default gun list.
* Fixed divide by zero error in the target range estimator
 2016-11-07 16:40:34 +01:00
SilentSpike
e399597678 Clean some cook off code 
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
 2016-11-06 12:29:37 +00:00
System98
6272b95acc Update chemlight translations 
- Add missing commas to some chemlight-strings
 2016-11-06 12:22:39 +01:00
System98
b0bf50c506 Unify and improve some german translations 
- unify and improve some german translations
- fix a few typos
 2016-11-06 10:10:36 +01:00
SilentSpike
5032619b9a Add cook off 3den setting to ammo boxes 2016-11-05 14:48:48 +00:00
SilentSpike
7de56ad9b5 Fix #4630 
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.

ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
 2016-11-05 14:20:48 +00:00
System98
38be06c28c Typo fix 
- fix another typo
 2016-11-05 13:50:26 +01:00
System98
5376a3045b Fix typo 
- Fiy typo in german translation
 2016-11-05 13:43:57 +01:00
System98
7efe752f3c Update german translation 
- Add missing german translations
 2016-11-05 13:42:55 +01:00
PabstMirror
0746264905 MedicalAI - Fix treatment animion with no weapon (#4633) 2016-11-04 00:01:58 +01:00
jonpas
14c9cffb6a Prevent switching to weapon while carrying fuel nozzle - fix #4601 2016-11-02 18:44:39 +01:00
ulteq
aef7010d67 Fixes the ATragMX 'Done' button issue (#4617) 2016-11-02 18:05:19 +01:00
ulteq
71fe9bde7d Fixed a typo 2016-11-02 14:27:26 +01:00
ulteq
6a60770470 Minor corrections in the ballistics module 
* Corrected AKS-U barrel length
* Corrected .338 250gr BC
* Corrected .338 API526 BC and muzzle velocity
* Slightly reduced 5.8x42mm muzzle velocity
 2016-11-02 13:54:22 +01:00
ulteq
510622dfc9 Adds realistic names for the QBZ-95 camo variants 
Green Hex and Hex variants of:
* QBZ-95-1
* QBZ-95-1 GL
* QBZ-95-1 LSW
 2016-10-31 20:35:38 +01:00
ulteq
b91c4acca8 Merge pull request #4613 from acemod/realisticnames-apex-update 
Adds realistic names for the QBZ-95 camo variants
 2016-10-31 19:58:46 +01:00
ulteq
22ce12ec57 Merge pull request #4609 from acemod/kestrel4500-typo-fix 
Fix Kestrel4500 wind speed calculation
 2016-10-31 12:57:24 +01:00
ulteq
2e94c40a46 Merge pull request #4616 from acemod/apex-weapon-ballistics 
Updates the ballistics module to support Apex
 2016-10-31 12:57:02 +01:00
PabstMirror
ebd31168f4 Fix bleeding hit logic for enabledFor = 1 2016-10-30 20:45:02 -05:00
PabstMirror
866612b974 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical_blood/XEH_postInit.sqf
 2016-10-30 20:38:30 -05:00
PabstMirror
ace24d0282 Fix ubc 2016-10-30 18:46:55 -05:00
PabstMirror
9f56ba50c1 Add semi-colon 2016-10-30 18:43:43 -05:00
jonpas
657c790ee3 Allow checking dogtags inside vehicles and when sitting (#4619) 
* Allow checking dogtag inside and when sitting

* Remove redundant format
 2016-10-30 21:53:14 +01:00
jonpas
2222834c43 Allow checking dogtags inside vehicles and when sitting (#4619) 
* Allow checking dogtag inside and when sitting

* Remove redundant format
 2016-10-30 18:54:54 +01:00
Rebel
9ac12aaee8 Blocks AI getting back into the vehicle on cookoff (#4587) 
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
 2016-10-30 18:11:17 +01:00
commy2
357d5c119b remove scrollbars from javelin scope (#4618) 2016-10-30 18:10:40 +01:00
commy2
18e5fa2849 remove scrollbars from javelin scope (#4618) 2016-10-30 14:46:31 +01:00
Rebel
e84cdef817 Blocks AI getting back into the vehicle on cookoff (#4587) 
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
 2016-10-30 13:33:28 +01:00
ulteq
c3f967e365 Updates the ATragMX gun list 2016-10-30 12:26:15 +01:00
ulteq
14af5577c6 Updates the ballistics module to support Apex 
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
 2016-10-30 09:02:55 +01:00
ulteq
0e364b0d48 Adds realistic names for the QBZ-95 camo variants 
Green Hex and Hex variants of:
* QBZ-95-1
* QBZ-95-1 GL
* QBZ-95-1 LSW
 2016-10-29 13:49:24 +02:00
ulteq
7b2d736ba3 Fix Kestrel4500 wind speed calculation 
* Cosine was applied twice (on some screens)
 2016-10-28 22:25:47 +02:00
PabstMirror
e1900d81bc Fix bleeding hit logic for enabledFor = 1 (#4585) 
* Fix bleeding hit logic for enabledFor = 1

* Handle RC

* fix
 2016-10-28 22:12:38 +02:00
PabstMirror
70439aaa9d Fix bleeding hit logic for enabledFor = 1 (#4585) 
* Fix bleeding hit logic for enabledFor = 1

* Handle RC

* fix
 2016-10-28 22:12:37 +02:00
commy2
eb38290aaf cookoff ammo selections default values (#4604) 
* cookoff ammo selections default values

* Add missing subTurret cache for Wheeled APCs
 2016-10-28 22:10:40 +02:00
commy2
416ab31610 cookoff ammo selections default values (#4604) 
* cookoff ammo selections default values

* Add missing subTurret cache for Wheeled APCs
 2016-10-28 22:10:31 +02:00
PabstMirror
7a95d66085 Remove repair locization warning (#4607) 2016-10-28 19:25:38 +02:00
PabstMirror
2df4a28145 Remove repair locization warning (#4607) 2016-10-28 12:16:23 -05:00
BaerMitUmlaut
60d98df5fc Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:55 +02:00
BaerMitUmlaut
945adf8fef Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:51 +02:00
PabstMirror
8c700cfd17 Cleanup map gesture sync / color mapping (#4486) 
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
 2016-10-27 19:55:08 +02:00
PabstMirror
aeb0614e7e Cleanup map gesture sync / color mapping (#4486) 
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
 2016-10-27 19:54:58 +02:00
Ozan Eğitmen
49b5a0ea86 Cleanup Frag Component (#4581) 
* Cleanup frag component

* Optimize fnc_addTrack

* Add additional cleanup

* Please work?

* Add more cleanup

* Fix script errors

* Fix/optimize spalling

* Add missing changes
 2016-10-27 00:16:31 +02:00
Ozan Eğitmen
029b68526f Cleanup Frag Component (#4581) 
* Cleanup frag component

* Optimize fnc_addTrack

* Add additional cleanup

* Please work?

* Add more cleanup

* Fix script errors

* Fix/optimize spalling

* Add missing changes
 2016-10-27 00:16:28 +02:00
Glowbal
a13441fa85 Merge branch 'release' 
Conflicts:
	addons/main/script_version.hpp
 2016-10-25 20:33:25 +02:00
Glowbal
e1aa5b4292 Increment build 2016-10-25 20:27:34 +02:00
Glowbal
27eb30bdd8 Prep 3.8.1 2016-10-25 20:16:16 +02:00
Glowbal
d2f485329f Update make.py to 0.8 (#4579) 2016-10-25 20:11:57 +02:00
jonpas
ffd1f0aff2 Update make.py to 0.8 (#4579) 
* Update make.py to 0.8

* Remove redundant extras folder obsolete handling

* Fix version updating in files when version changes number of digits

* Satisfy bux
 2016-10-25 20:11:05 +02:00
PabstMirror
eeb482eb7e #4557 - Fix warning about bad func type (#4582) 2016-10-22 10:57:49 +02:00
PabstMirror
fc15ab9cf0 #4557 - Fix warning about bad func type (#4582) 2016-10-22 10:56:26 +02:00
PabstMirror
23568609a6 Faster, non movment blocking gesture for tap shoulder (#4578) 
Close #4577
 2016-10-20 23:44:34 +02:00
Glowbal
1390b845d4 Prep 3.8.1 patch 2016-10-20 19:45:40 +02:00
PabstMirror
89d6fefff1 Sanatize damage value used for blood creation (#4574) 
Fix #4571
 2016-10-20 19:44:16 +02:00
PabstMirror
f2746891af Sanatize damage value used for blood creation (#4574) 
Fix #4571
 2016-10-20 19:43:52 +02:00
commy2
347be3c222 handle vehicle crashes and add wounds for fall damage 2016-10-20 15:02:24 +02:00
commy2
576a63c27e Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-20 13:56:56 +02:00
commy2
fc39ac14b7 don't knock out if pain is removed 2016-10-20 13:49:52 +02:00
commy2
be56b4d806 knock out due to pain 2016-10-20 13:46:28 +02:00
commy2
370faf9b48 cleanup 2016-10-20 13:38:26 +02:00
commy2
0370a34672 remove some debug 2016-10-20 12:43:57 +02:00
commy2
7e498ab762 setting for basic/advanced syringes 2016-10-20 02:14:11 +02:00
Glowbal
b150f440e6 Prep 3.8.0 Release 2016-10-18 21:57:40 +02:00
Glowbal
d867805406 Prepare v3.8.0 RC3 2016-10-18 20:25:45 +02:00
jonpas
877944ddce Fix 3rd party air and sea vehicle fuel capacity (#4554) 
* Fix fuel capacity for air vehicles

* Sea vehicles as well, minor empty classes cleanup
 2016-10-18 20:21:27 +02:00
classicarma
19fe4016e5 Japanese translations (#4553) 2016-10-18 20:19:29 +02:00
PabstMirror
63f3673a65 Missile Guidance Overhaul 2016-10-17 16:08:23 -05:00
PabstMirror
5ae8145234 Don't show dogtag ID in action menu (#4558) 
#4476
 2016-10-17 10:55:42 +02:00
commy2
519ea25fc7 cleanup 2016-10-15 13:48:13 +02:00
Glowbal
d9a199b942 Increment build number 2016-10-15 11:44:43 +02:00
Glowbal
8afb3c7279 Update CBA required version 2016-10-15 11:44:26 +02:00
PabstMirror
6fce923783 Fix mortar changes for laser shootRay changes 
Ref #4478
 2016-10-15 11:42:09 +02:00
PabstMirror
fe35e64696 Reset animation speed when not swimming (#4546) 2016-10-15 11:41:03 +02:00
commy2
633c6f0ce4 formating 2016-10-13 21:21:42 +02:00
commy2
6b84bd1ff6 fix misc. treatment actions 2016-10-13 21:11:13 +02:00
commy2
e03614757e fix misc. treatment actions 2016-10-13 21:08:41 +02:00
commy2
03fe2826dd remove some debug 2016-10-13 20:31:39 +02:00
commy2
f2dfc6dc0e fixes, tweaks 2016-10-13 20:17:21 +02:00
commy2
bc4c1787f9 show tourniquets in 3d menu 2016-10-13 19:05:29 +02:00
commy2
ba2d6fda8a treatment tweaks 2016-10-13 17:39:01 +02:00
commy2
fe2c6e8d85 basic <-> advanced 2016-10-13 17:14:43 +02:00
commy2
68d75beae6 manual merge 2016-10-13 16:56:57 +02:00
commy2
2d243d45f3 fix tourniquets 2016-10-13 10:28:28 +02:00
commy2
e1cbeeea16 fix tourniquets 2016-10-13 10:12:28 +02:00
commy2
18907adcd5 increase medical item mass to at least 100 grams 2016-10-13 09:48:58 +02:00
commy2
5965326ca1 merge basic and adv. bandage actions 2016-10-13 09:47:52 +02:00
commy2
b1f0af7e1c merge basic and adv. bandage actions 2016-10-13 09:10:08 +02:00
commy2
68d199c5b2 merge basic and adv. bandage actions 2016-10-13 02:05:14 +02:00
commy2
4a06d19ce4 merge basic and adv. bandage actions 2016-10-13 01:55:10 +02:00
commy2
fd6e46b622 make waking up rocket soldier kneel not stand 2016-10-13 01:42:32 +02:00
commy2
71884778dd animation fixes 2016-10-13 01:16:51 +02:00
commy2
e38845bf45 add ace_kill event handler 2016-10-12 23:20:22 +02:00
commy2
92fc4ec14b add a setting for 'basic' blood bags 2016-10-12 22:38:58 +02:00
commy2
a5d070f829 blood and unconsciousness fixes 2016-10-12 21:59:32 +02:00
commy2
be71e6fa7b Merge branch 'medical-rewrite-blood' into medical-rewrite 2016-10-12 04:05:50 +02:00
commy2
41dde51e8e Merge branch 'medical-rewrite-pain' into medical-rewrite 2016-10-12 03:19:48 +02:00
commy2
b0b9037f24 simplify lost some/much blood macros 2016-10-11 19:44:20 +02:00
commy2
d1df47919d support neg numbers to remove pain in addPain 2016-10-11 19:36:04 +02:00
commy2
1ea2a72f20 don't play scream by addPain function 2016-10-11 19:29:44 +02:00
commy2
ed6688c899 Merge remote-tracking branch 'origin' into medical-rewrite 2016-10-11 19:14:13 +02:00
Glowbal
84cbd50582 Merged branch master into release 2016-10-11 19:04:14 +02:00
commy2
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
jonpas
b8cc10fecb Fix #4523 - fuel nozzle disconnect at maximum hose distance 2016-10-11 18:57:58 +02:00
PabstMirror
5d610cf148 Always create namespace at preInit 2016-10-11 18:57:34 +02:00
commy2
130265fd9f add function to disable dogtags for factions, and disable for civilians 2016-10-11 18:57:34 +02:00
Glowbal
a98013c36e Merge branch 'master' into release 2016-10-11 18:51:05 +02:00
PabstMirror
cd79ebe3ce Bump REQUIRED_VERSION to 1.64 2016-10-11 18:49:31 +02:00
BaerMitUmlaut
2ba0137a1e Fix going unconscious while fastroping (#4531) 2016-10-11 18:48:20 +02:00
commy2
c390b6c1fc increase red laser alpha, close #4535 2016-10-11 18:47:52 +02:00
commy2
4fb5d230ac remove civilian rank icons from nametags (#4538) 2016-10-11 18:44:27 +02:00
commy2
d0df141cf7 add comment explaining why 6.0 were chosen 2016-10-10 18:22:46 +02:00
commy2
e2d174837a move IV transufsion rate macro to blood config 2016-10-10 18:20:58 +02:00
commy2
c2f7366d32 blood volume unit vitals 2016-10-10 17:46:17 +02:00
commy2
3438ea0946 use liters for blood volume variable 2016-10-10 17:30:42 +02:00
commy2
fc079abd46 function header 2016-10-10 16:53:25 +02:00
commy2
2ad7c4c4ea add addPain function, cap pain 2016-10-10 16:44:03 +02:00
commy2
3521bca00b change blood texture threshold 2016-10-10 15:22:59 +02:00
commy2
0f43829b63 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-10 14:29:50 +02:00
PabstMirror
a3bbc848a7 Fix ammo box cookoff strings (#4528) 2016-10-09 11:57:29 +02:00
Glowbal
8e72d89ef6 Prepare 3.80 RC1 2016-10-08 13:10:34 +02:00
Nicolás Badano
ab6fc8efca Laser guidance for all designators (#3308) 
* Fix laser and missileguidance over water

* Return a normalized vector in EFUNC(common,getTurretDirection)

* Make laser dispersion simulation optional, default off

* Prototype for ace_laser_designate

* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate

* Simplify laser into one module

Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate

* Cleanup missile guidance

* Headers, fix laser over water

* Cleanup

* Test

* Change setting to scalar, more cleanup

* Add seeker debug drawing
 2016-10-08 12:55:30 +02:00
commy2
74dfa6ca33 avoid PCTW error on certain vehicles (#4463) 
fix #4413
 2016-10-08 12:45:40 +02:00
commy2
4c96278bb4 fix fatigue when diving while sprinting, fix #4481 2016-10-08 12:44:37 +02:00
commy2
842279af9a setup hit-points LODs 2016-10-08 12:43:28 +02:00
commy2
d1db8899c1 fix damage materials of repair items 2016-10-08 12:43:28 +02:00
PabstMirror
de1c4bc4d9 Draw Straight Lines with maptool (#4410) 
* Draw Straight Lines

* Fix roamer sides, handle closing map mid-draw

* Add missing privates / formula notes
 2016-10-07 17:21:19 -05:00
PabstMirror
ef9fd92898 Show correct elev for mortar with no ammo (#4478) 
Fix #3757
 2016-10-07 17:06:04 -05:00
commy2
b0c0156d75 reduce some overhead 2016-10-07 05:10:43 +02:00
commy2
4bc1c1db56 handle blood visuals 2016-10-07 04:21:01 +02:00
commy2
b698a88dc1 move modifyAction func to menu component 2016-10-07 01:58:40 +02:00
commy2
d4dd1626a5 delete some unused/moved functions from medical main component 2016-10-07 00:19:51 +02:00
commy2
50eeebd30d add weapon sway by pain 2016-10-07 00:09:58 +02:00
commy2
f004504a53 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-06 23:44:31 +02:00
commy2
56c77fed94 prep for new pain aim sway method 2016-10-06 23:44:14 +02:00
PabstMirror
198f6c93e4 Fix FRIES attach point for unarmed wildcat (#4518) 
Close #4490
 2016-10-06 15:58:45 -05:00
commy2
673f3b4f9f implement arithmetic source for fatigue system (#4517) 2016-10-06 22:46:46 +02:00
commy2
e9586ebccc use common header file for medical components 2016-10-06 22:40:36 +02:00
Glowbal
059980b1a5 Add ammo cookoff (#4376) 
* Add Ammo cookoff

* Remove tabs

* Add initial ammo box cook-off

Does not include a fire effect, mostly just a proof of concept.

Should probably also add further potential cook-off conditons (if hit by tracer for example).

* Add burning effects to ammo box cook off

- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning

Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.

* Improve ammo cookoff

* Integrate ammo cookoff with the incendiary grenade

* Disable ammo cook off underwater

* Optimize fnc_detonateAmmunition

I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!

* Improve ammo box cook off

- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke

* Add tracer induced ammo box cook off

Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.

* Decrease amount of explosions from ammo cookoff

* Add is local check for remote event
 2016-10-06 22:37:38 +02:00
commy2
853c7db1dc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-10-06 10:20:10 +02:00
PabstMirror
dfa09d3161 Functions to perform arithmetic ops on sets (#4514) 
* Functions to perform arithmetic ops on a set

* fix spelling
 2016-10-06 10:18:14 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
commy2
2e147b37f0 fix formating of CBA version check (#4511) 2016-10-05 13:06:21 -05:00
PabstMirror
1779099b71 Cleanup old common macros (#4507) 2016-10-04 05:29:37 +02:00
commy2
bad01c3126 simplify blood splatter by using woundReceived event 2016-10-02 19:13:56 +02:00
commy2
6082020056 simplify blood splatter by using woundReceived event 2016-10-02 18:35:40 +02:00
commy2
5875f58604 use new macro 2016-10-02 17:50:17 +02:00
commy2
feac296f9c use a new macro 2016-10-02 13:06:47 +02:00