commy2
a83267b2ff
manual merge
2016-12-05 20:15:16 +01:00
ulteq
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
ulteq
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
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
eec0c62dc5
FCS - removed dead code ( #4663 )
2016-11-12 17:36:21 +01:00
Glowbal
b4ab15bb47
Use hitpoints in medical extension ( #4494 )
2016-10-02 09:41:17 +02:00
Glowbal
6abe937488
Update extensions
2016-06-21 18:17:24 +02:00
Glowbal
b52c1c8ce3
Merge branch 'master' into fix-c4996
...
Conflicts:
extensions/clipboard/ace_clipboard.cpp
2016-06-12 17:35:19 +02:00
jonpas
816da2aef1
Normalize to LF line endings
2016-05-30 18:37:03 +02:00
novichiv
955333b0bc
Fixed strncpy in parse_imagepath
2016-03-06 22:06:11 +03:00
looterz
f0f7f14093
Fixed linux compilation support
2016-02-19 12:24:08 -06:00
looterz
a1224c5ca6
Fixed several issues with ace_clipboard's implementation
2016-02-17 20:06:24 -06:00
looterz
051973a546
Cleaned up and patched ace_clipboard.
2016-02-17 17:07:06 -06:00
looterz
8b16912ad7
Patched advanced_ballistics extension
2016-02-17 16:51:09 -06:00
looterz
aae0709772
Patched medical extension
2016-02-17 16:26:14 -06:00
looterz
1f95c0f021
Patched fcs, parse_imagepath extensions
2016-02-17 16:19:23 -06:00
looterz
2309a52671
Fixed c4996 compiler warning/error due to use of strncpy
2016-02-17 15:31:12 -06:00
PabstMirror
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
fr89k
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
PabstMirror
bba908fcae
Better fix for M_PI definition
...
Just use #define _USE_MATH_DEFINES for cmath
2015-12-20 13:50:13 -06:00
PabstMirror
683f45682a
Fix Eotvos effect
2015-12-20 02:16:29 -06:00
Thomas Kooi
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
Glowbal
0c25f9d8fb
Added error handling and debug printing to the medical extension
2015-09-19 11:51:41 +02:00
TheMagnetar
2b80285ad7
Removed pedantic errors. Mainly extra ';' in namespace definitions
2015-09-08 21:53:29 +02:00
TheMagnetar
dd76a67783
Added pedantic errors to compiling flags
2015-09-08 21:52:50 +02:00
TheMagnetar
4ad124d1fe
M_PI was redefined in extensions/common/shared.hpp
2015-09-08 21:47:16 +02:00
PabstMirror
8cb0b8a30c
Rebuild dlls for 3.2
2015-07-26 23:29:07 -05:00
PabstMirror
5e80f9d8d3
Merge branch 'master' into userActionPrototype
2015-07-01 15:04:40 -05:00
Glowbal
6374a39edb
Fixed extra [
2015-06-16 17:08:39 +02:00
Glowbal
154cf9d032
strcpy instead of sprintf
2015-06-16 08:03:11 +02:00
PabstMirror
4a8344e1a4
Merge branch 'master' into userActionPrototype
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
addons/interact_menu/stringtable.xml
extensions/CMakeLists.txt
2015-06-13 15:05:57 -05:00
Glowbal
d448c9e7c0
Fixed select new injuryToAdd always selects first
...
It should not always take the first injury in the list. That would with the current configuration almost always be the same injury as in `highestSpot`.
This might need to be expanded with something that prefers higher damage types.
2015-06-13 12:37:41 +02:00
Glowbal
b8b980bd92
Changed speed of sound to double
2015-05-31 14:21:25 +02:00
Glowbal
552b2f390f
Merge pull request #1256 from acemod/medicalExtension
...
Medical Extension for handleDamage wounds
2015-05-29 23:16:00 +02:00
ulteq
1ec37aabed
Merge pull request #1424 from acemod/barometricPressureFix
...
Fixed incorrect barometric pressure calculation
2015-05-29 12:40:17 +02:00
ulteq
abf0149b1d
Added speed of sound calculation:
...
* Influences the advanced ballistics transonic instability
* Influences the ATragMX range card output
2015-05-29 11:36:37 +02:00
ulteq
69b9d0e122
More in-depth barometric pressure calculation:
...
* Temperature is now taken into account
2015-05-29 11:18:40 +02:00
ulteq
83f2e35907
Fixed incorrect unit conversion in the barometric pressure calculation
2015-05-29 10:30:30 +02:00
PabstMirror
08aeda11df
Merge branch 'master' into userActionPrototype
2015-05-27 12:33:20 -05:00
Glowbal
4945f22f3e
Merge branch 'master' into medicalExtension
2015-05-26 22:42:26 +02:00
jaynus
f74eb31bbc
cross-platform compat integration for medical (history rewrite from gay merge).
2015-05-21 08:43:02 -07:00
KoffeinFlummi
f16f282abd
Merge remote-tracking branch 'origin/release' into master-fix
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
extensions/common/p3d/animation.cpp
extensions/common/p3d/compressed.cpp
extensions/common/p3d/compressed.hpp
extensions/common/pbo/archive.cpp
extensions/common/pbo/search.cpp
extensions/common/pbo/search.hpp
extensions/common/shared.hpp
extensions/common/simplepipe_win32.cpp
extensions/common/simplepipe_win32.hpp
extensions/common/simulation/object.cpp
extensions/common/simulation/object.hpp
extensions/common/targetver.h
extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
PabstMirror
d6946f6e8f
Fix min/max defines in extensions
...
Error C2589 '(': illegal token on right side of '::' from std::min
because windows.h defines
2015-05-18 22:15:16 -05:00
jaynus
710db5a492
Changed: Disable snprintf_s usage to get around auto-vectorization in the 2015 STL strnlen implementation
2015-05-18 20:59:16 +02:00
jaynus
98df03ca27
Changed: checkFiles extension check prints version returned by extension
...
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-18 20:59:00 +02:00
jaynus
e4fb652dd2
initial pick from vehicledamage for new extension build process.
2015-05-18 20:58:32 +02:00
jaynus-linux
1dd8dc3bfb
cross platform macros and port added for linux for all extensions. Should be transparent
2015-05-17 10:10:02 -07:00
PabstMirror
e78c2fd676
Extension framework changes
2015-05-17 04:05:43 -05:00
Glowbal
2544cdef4a
Clean up
2015-05-17 09:48:59 +02:00
PabstMirror
78dec5debc
Merge branch 'master' into userActionPrototype
...
Conflicts:
addons/interact_menu/XEH_preInit.sqf
2015-05-16 22:49:09 -05:00
