Commit Graph

13548 Commits

Author SHA1 Message Date
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
f0279726ce Fixed typo (copy & paste remains) (#4673) 2016-11-15 16:14:35 +01:00
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
4bb02a320b Run attack profile even if no target 2016-11-14 20:19:24 -06:00
1d8030d196 Tweaked fatigue in water 2016-11-14 21:55:26 +01:00
e4a4d8f56d Tweaked prone animation duty 2016-11-14 21:54:51 +01:00
608f8bbfdc ATragMX - Added 7.62x39mm ammo to gun profile 2016-11-14 21:01:04 +01:00
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
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
7fcd7cf894 Use head direction for drawing microdag wp (#4670) 2016-11-14 12:44:12 -06:00
a4c6daef50 Fix AF for adjusted stances, fixes #4591 2016-11-14 19:24:21 +01:00
95699f267c Use head direction for drawing microdag wp 2016-11-14 12:13:41 -06:00
24ada4dab3 Clarify the maximumCardiacArrestTime setting 2016-11-13 21:45:38 +00:00
27728172ed Clarify the allowDeathMode setting 2016-11-13 21:27:40 +00:00
b4569f0a96 Fix bracket 2016-11-13 18:11:18 +01:00
d40c3fd2bf Merge pull request #4655 from acemod/fixStamBar
Hide advFatigue bar on map / spectator / in vehicles
2016-11-13 18:06:34 +01:00
27916e8455 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-11-13 18:03:12 +01:00
6f640ddc45 spaces 2016-11-13 10:56:45 -06:00
b3e313f52b Use vehicle eh to hide bar 2016-11-13 10:55:57 -06:00
e32bca3d14 Don't compile action menu for playable logics (#4666)
Fix #4664
2016-11-12 19:39:40 -06:00
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
d69b48bac5 Merge pull request #4629 from acemod/fixRefuelShooting
Prevent switching to weapon while carrying fuel nozzle
2016-11-13 00:13:48 +01:00
76eea8924f Invert logic for isRefueling 2016-11-12 16:37:41 -06:00
c4c98696e0 ACE_Chemlight_Shield not public (#4612)
Changed `ACE_Chemlight_Shield` to `public` from `protected`
2016-11-12 16:19:50 -06:00
ae0eab3a51 Use isEqualTo for checking seeker return 2016-11-12 16:15:42 -06:00
26ae3b8075 Hide bar when mounted 2016-11-12 15:51:44 -06:00
9e85508f0d Fix tagTestingThread error (#4662)
Close #4659
2016-11-12 15:46:29 -06:00
eec0c62dc5 FCS - removed dead code (#4663) 2016-11-12 17:36:21 +01:00
c66f9e5144 Merge pull request #4638 from acemod/cookoff_fixes
Fix ammo cook off with certain explosives
2016-11-11 17:41:42 +00:00
e086a33e4d Hide advFatigue bar on map / spectator 2016-11-10 17:49:18 -06:00
5bf8b642f7 Add cargo configs for some planes (#4650) 2016-11-10 12:05:08 -06:00
f15522a88f ATragMX - Estimate bullet length instead of using a fixed value (#4651) 2016-11-10 18:35:57 +01:00
0394ea56b4 Increment build 2016-11-09 22:07:07 +01:00
3417c433fd Prep v3.8.2 2016-11-09 22:06:48 +01:00
18218688a6 Merge branch 'release-v3.8.2'
Conflicts:
	addons/atragmx/XEH_postInit.sqf
	addons/atragmx/script_component.hpp
2016-11-09 21:59:54 +01:00
9e6ee0363d fix tripflares script error (#4647) 2016-11-09 21:56:57 +01:00
0975a4f004 MedicalAI - Fix treatment animion with no weapon (#4633) 2016-11-09 21:56:26 +01:00
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
6a910e7fe4 ballistics: Added 20 round 6.5 Lapua and Creedmoor 2016-11-09 21:55:35 +01:00
f2a85b63cf Fixed a typo 2016-11-09 21:54:20 +01:00
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
272ec37603 Fix Full Repair menu not shown when damage returns 0 (#4621) 2016-11-09 21:53:21 +01:00
c5322bff37 Fixes the ATragMX 'Done' button issue (#4617) 2016-11-09 21:52:32 +01:00
910f975276 Fix ubc 2016-11-09 21:51:11 +01:00
76dbdaaecf Add semi-colon 2016-11-09 21:51:08 +01:00
298a90b68a Updates the ATragMX gun list 2016-11-09 21:51:05 +01:00
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
661c22a04c 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-11-09 21:49:40 +01:00
eb6319641e Fix Kestrel4500 wind speed calculation (#4609) 2016-11-09 21:47:42 +01:00
5463e9dff8 Merge branch 'master' into medical-rewrite 2016-11-09 13:12:42 -06:00