Commit Graph

11230 Commits

Author SHA1 Message Date
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
ace3mod
5f7f26ef18 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-11-17 08:12:16 +01:00
BaerMitUmlaut
f3a12259ff Merge pull request #4685 from acemod/addMelbFastrope
Add RHS MELB fastrope, add 3D debugging of mem points
2016-11-17 08:11:07 +01:00
PabstMirror
e67c9512ba Remove unneeded functions 2016-11-16 17:53:04 -06: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
db3b5d924c Scopes - Updated wiki framework (#4680)
* Update scopes-framework.md

Documented the changes to the scopes framework in this pull request: https://github.com/acemod/ACE3/pull/4642

* Clarified the bore height component descriptions
2016-11-16 11:20:07 +01: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
ace3mod
68901d9263 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-11-15 23:12:34 +01:00
ace3mod
73b940d3bf [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-11-15 23:12:22 +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
PabstMirror
7fcd7cf894 Use head direction for drawing microdag wp (#4670) 2016-11-14 12:44:12 -06: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