Commit Graph

133 Commits

Author SHA1 Message Date
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
c42e0107e8 Update to latest version number 2018-11-18 20:50:07 +01:00
ef2c8c9502 Remove copying of inexisting userconfig, Bring version number up to date 2018-05-22 18:55:12 +02:00
40de340d82 Revert changes that shouldn't be changed 2018-05-22 17:17:05 +02:00
7df35808b6 Update version number in extensions 2018-02-06 14:53:08 +01:00
4db844e596 merge 2017-12-23 01:47:43 +01:00
77fd2007ea Advanced Ballistics - Fixed faulty wind attenuation (#5869)
* Advanced Ballistics - Fixed faulty wind attenuation
* Only relevant at very low altitudes above ground (below 1.6 m)
* Also fixes the Kestrel 4500 readout

* Kestrel 4500 - Minor optimization / fix
* Avoids possible math error 'ln(0)'

* Rebuild Dills
2017-12-08 10:44:12 -06:00
6b68ff426f Scopes - Fixed zero angle prediction
* Corrects the prediction of the (hair-raising!) zero angle calculation in the vanilla-game
2017-11-12 12:21:03 +01:00
3fae70bf80 More accurate zero calculation 2017-11-10 17:10:27 +01:00
f26dfb0495 Advanced Ballistics - Utilize vector library 2017-11-10 17:10:14 +01:00
fecc77e225 Advanced Ballistics - Improved random seed generator 2017-11-08 15:26:43 +01:00
fb0a60b018 Gravity correction
* ArmA is using 9.8066
2017-11-08 15:26:39 +01:00
1997edb62e Advanced Ballistics - More advanced drag update routine
* Handles greater 'simulationIntervals' much better:
* 'simulationInterval=0.00' -> Error (at 2km): 0.004 MILs
* 'simulationInterval=0.05' -> Error (at 2km): 0.030 MILs
* 'simulationInterval=0.10' -> Error (at 2km): 0.070 MILs
* Almost completely FPS invariant
2017-11-08 15:15:50 +01:00
502648fae3 Advanced Ballistics - Disable BC degradation in the transonic zone
* Does not do justice to reality
2017-11-08 15:15:50 +01:00
048b076f1d Advanced Ballistics - Removed duplicate code 2017-10-30 10:07:38 +01:00
4bfc956e1a Advanced Ballistics - Fixes bug in the vanilla drag removal routine
* More accurate bullet drop at extreme long ranges
* Fixes Client FPS affecting the trajectory
2017-10-30 10:07:37 +01:00
805d5c8b09 Extensions - Reduce warning level from /Wall to /W4 2017-10-29 13:04:15 +01:00
a5b73d2c29 Optimize vector math (#5705) 2017-10-29 09:43:31 +01:00
c4f9b6c19b Removed/disable unused stuff (#5694)
C++17 compat by removing stuff that was deprecated in C++14
2017-10-28 21:39:46 +02:00
5c4dbdcbda Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_adjustPainLevel.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/stringtable.xml
	addons/medical_ai/functions/fnc_healUnit.sqf
	addons/medical_ai/functions/fnc_isInjured.sqf
	addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf
2017-10-24 16:13:12 -05:00
be482ea097 Advanced Ballistics - Drag model revamp & Spin drift correction (#5566)
* Advanced Ballistics - Drag model revamp
- Moved away from using the drag tables from the GNU exterior ballistics library
- The drag functions are now based off this data from JBM Ballistics: http://www.jbmballistics.com/ballistics/downloads/text/
- The differences are minor, but some players might still appreciate the additional authenticity

* The Mach number is now calculated in relation to the air temperature.

* Improved speed of sound calculation accuracy.

* Advanced Ballistics - DLL update

* Advanced Ballistics - Added drag function reference (JBM Ballistics)

* Advanced Ballistics - Fixed calculation error in the spin drift simulation
- The error was introduced with this PR (https://github.com/acemod/ACE3/pull/4708)

* More descriptive variable names

* Minor performance optimizations

* Fixed some minor issues

* DLL rebuild

* Utilize new 'toFixed' script command
- Small performance improvement

* Fixed a typo

* Use correct reference speed for the drag compensation

* Updated all 'airFriction' values to match the new drag model

* 'Default' atmosphere now equals the ICAO standard atmosphere

* Update reference humidity to meet the ICAO standard
2017-10-06 13:05:20 -05:00
ddf72d5878 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/CfgWeapons.hpp
	addons/medical/data/model.cfg
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/stringtable.xml
2017-09-23 11:25:58 -05:00
49f549013d Update AB dll for 3.11 changes (#5538) 2017-09-22 10:53:42 -05:00
ecd688647c AdvancedBallistics - Utilize 'parseSimpleArray' (#5496)
- Decent performance improvement compared to the old 'call compile' approach
2017-09-16 11:08:25 +02:00
ddccfe563b Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
2017-06-03 12:37:28 -05:00
ff212d5b3d Fix AB water vapor pressure calc (#4956)
* Fix AB water vapor pressure calc

* Fix calc in weather

* Cleanup usage of constant

* Add RVExtensionVersion, Rebuild AB DLLs
2017-05-29 12:55:26 -05:00
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
8afc4083d0 Advanced Ballistics - Improved spin drift calculation (#4755) 2016-12-09 13:22:53 -06:00
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
8f16702e64 Advanced Ballistics - Performance improvement (#4708)
* Up to 16% faster frame times with 200 simultaneously flying projectiles
2016-11-25 19:25:03 +01:00
e70a23d93a Greatly improves the plausibility of the transonic flight simulation (#4652)
* Transonic flight now induces yawing and pitching of the nose of the bullet instead of modifying the bullet velocity directly
* The ballistic coefficient now starts to decreases once the bullet goes transonic
2016-11-22 10:20:02 +01:00
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
eec0c62dc5 FCS - removed dead code (#4663) 2016-11-12 17:36:21 +01:00
b4ab15bb47 Use hitpoints in medical extension (#4494) 2016-10-02 09:41:17 +02:00
6abe937488 Update extensions 2016-06-21 18:17:24 +02:00
b52c1c8ce3 Merge branch 'master' into fix-c4996
Conflicts:
	extensions/clipboard/ace_clipboard.cpp
2016-06-12 17:35:19 +02:00
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
955333b0bc Fixed strncpy in parse_imagepath 2016-03-06 22:06:11 +03:00
f0f7f14093 Fixed linux compilation support 2016-02-19 12:24:08 -06:00
a1224c5ca6 Fixed several issues with ace_clipboard's implementation 2016-02-17 20:06:24 -06:00
051973a546 Cleaned up and patched ace_clipboard. 2016-02-17 17:07:06 -06:00
8b16912ad7 Patched advanced_ballistics extension 2016-02-17 16:51:09 -06:00
aae0709772 Patched medical extension 2016-02-17 16:26:14 -06:00
1f95c0f021 Patched fcs, parse_imagepath extensions 2016-02-17 16:19:23 -06:00
2309a52671 Fixed c4996 compiler warning/error due to use of strncpy 2016-02-17 15:31:12 -06:00
f1797feead Make wound assignment consistent for dll/sqf
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
7f0821dd12 Added the correct preprocessor macro for parse_imagepath, so that the source can now be compiled on Linux. 2016-01-29 12:21:46 +01:00
bba908fcae Better fix for M_PI definition
Just use #define _USE_MATH_DEFINES for cmath
2015-12-20 13:50:13 -06:00
683f45682a Fix Eotvos effect 2015-12-20 02:16:29 -06:00
60684c584a Merge pull request #2382 from TheMagnetar/master
Removed pedantic errors and redefinition of M_PI variable
2015-11-26 16:14:09 +01:00