Commit Graph

141 Commits

Author SHA1 Message Date
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
Glowbal
bd440f5af9 adjusted random 2015-05-17 00:07:41 +02:00
Glowbal
f26cb0a666 Now handles input and output 2015-05-16 23:20:17 +02:00
Glowbal
4b6b0621da Implemented handleDamage wounds fully 2015-05-16 23:19:50 +02:00
Glowbal
b334d8c52e Added woundID for open wounds 2015-05-16 23:18:58 +02:00
Glowbal
eb2383a6f0 tabs 2015-05-14 18:56:23 +02:00
Glowbal
5756c8530f Ported over handleDamage_wounds 2015-05-14 18:52:12 +02:00
Glowbal
e98c7cd1b7 Made handleDamage a singleton 2015-05-14 17:41:50 +02:00
Glowbal
a48b6c9426 Fixed namespace issues. Removed static 2015-05-14 17:36:58 +02:00
Glowbal
4dbacbead8 Merge branch 'master' into medicalExtension 2015-05-14 16:43:12 +02:00
jaynus
99c04d0ed3 Fixed: shared_ptr vs. unique_ptr behavior in VS2013 2015-05-14 07:42:21 -07:00
Glowbal
b68f02333e Merge branch 'master' into medicalExtension 2015-05-14 16:27:41 +02:00
Glowbal
7c03ec913b double all the things (ints) 2015-05-14 16:23:01 +02:00
Glowbal
8ec57a985c Merge branch 'master' into medicalExtension 2015-05-14 16:05:11 +02:00
jaynus
bf732a2a02 Changed: Disable snprintf_s usage to get around auto-vectorization in the 2015 STL strnlen implementation 2015-05-13 11:17:43 -07:00
jaynus
9f3a57bf32 Changed: checkFiles extension check prints version returned by extension
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-13 09:57:24 -07:00
jaynus
3ff9ea230a initial pick from vehicledamage for new extension build process. 2015-05-13 08:34:14 -07:00
PabstMirror
58ee797a94 Merge branch 'master' into userActionPrototype 2015-05-13 00:00:55 -05:00
jaynus
3e6c203655 size+1 2015-05-08 06:57:19 -07:00
jaynus
027a3dd4ac AB map tweaking. Just a bit of optimization and crash checking. 2015-05-07 12:52:19 -07:00
PabstMirror
e6889f1634 Merge branch 'master' into userActionPrototype 2015-05-04 14:21:49 -05:00
Glowbal
92bca1f857 tabs 2015-05-04 00:32:44 +02:00
Glowbal
c2388aa80c Initial work on medical extension 2015-05-04 00:02:39 +02:00
PabstMirror
bdc967d3a9 Extension to parse text for image path 2015-05-03 13:44:02 -05:00
ulteq
13bc1e0058 Replaced deprecated airFriction calculation 2015-05-03 12:31:30 +02:00
ulteq
29fdd63432 Use the constants 2015-05-03 12:07:13 +02:00
ulteq
d07cb0e6ed Got rid of the newline braces 2015-05-03 11:51:30 +02:00
ulteq
e5a81bfe37 Deterministic random numbers for the transonic instability calculation 2015-05-03 11:46:30 +02:00
jaynus
717d7c874f Data chunking. Feature complete. 2015-05-02 15:28:40 -07:00
jaynus
bb429e7704 i hate @esteldunedain 2015-05-02 14:20:37 -07:00
jaynus
c192d7eadc Return version. 2015-05-02 14:18:42 -07:00
jaynus
433bb21ccc ACE clipboard extension to bypass clipboard limit of arma. Close #991 2015-05-02 13:13:24 -07:00
ulteq
3bfbf8b64e Got rid of the math include in the ab extension 2015-05-02 18:22:06 +02:00
KoffeinFlummi
984a1fe337 Rename breakLine to break_line 2015-05-01 02:14:23 +02:00
ulteq
ebbcb8e5e7 Fixed a rarely occurring calculation error. 2015-04-27 19:28:46 +02:00
jaynus
e96ba88351 count type correction. 2015-04-21 16:50:01 -07:00
jaynus
93bcf7e9a1 Added versioning to build process and automated version/git integration. 2015-04-21 16:49:30 -07:00
Nicolás Badano
b86d148fe4 Merge pull request #304 from acemod/linearMenuExperiment
Add Optional List form for the Interact Menus
2015-04-18 11:22:41 -03:00
firefly2442
c81fa61f2e match to exact directory name (case-sensitive) 2015-04-14 22:34:58 -05:00
esteldunedain
6f4bb48489 Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
jaynus
f85fc12fc8 string overflow fix, perf fix for pass-by-ref. 2015-04-14 14:24:50 -07:00
esteldunedain
3d4a94a264 Make the fcs extension compile without C++11 2015-04-12 00:42:58 -03:00
esteldunedain
df17df61f9 Improve the way lines are split 2015-04-11 23:39:06 -03:00
esteldunedain
d06e1b4a2a Break line extension 2015-04-11 22:22:19 -03:00
ulteq
b4e36b5fab Replaced TABs with 4 spaces 2015-04-11 22:24:32 +02:00
jaynus
2261225ad3 Extension moved into cmake, extensions rebuilt. 2015-04-09 09:52:57 -07:00
ulteq
b5b15ba591 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-08 21:29:17 +02:00
jaynus
3f84a08494 Update FCS iteration limit for accuracy over range. 2015-04-08 12:09:11 -07:00
ulteq
96ba28afa3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 20:34:21 +02:00
esteldunedain
b20f3e5b81 Fix for the fcs 2015-04-06 18:43:32 -03:00
esteldunedain
b8c493a495 Merge branch 'master' into AdvancedBallistics 2015-04-05 19:05:12 -03:00
ulteq
19bbc164b1 Added the AdvancedBallistics dll extension source code 2015-04-05 22:16:51 +02:00
jaynus
1ae6f2daba Why doesnt flummi's work? 2015-04-03 15:41:29 -07:00
jaynus
caecf9b21b Cmake framework for cross-platform extensions and building. 2015-04-03 13:46:53 -07:00
KoffeinFlummi
075d1d6d9e Refine bullet tracing in FCS extension
Gradually increase simulation step as the projectile approaches the
target and improve the calculation of the final bullet drop.

Untested.

(#65)
2015-02-17 10:24:03 +01:00
KoffeinFlummi
4978bb5294 Move FCS calculation to extension 2015-01-18 20:02:37 +01:00