8cb0b8a30c
Rebuild dlls for 3.2
2015-07-26 23:29:07 -05:00
5e80f9d8d3
Merge branch 'master' into userActionPrototype
2015-07-01 15:04:40 -05:00
6374a39edb
Fixed extra [
2015-06-16 17:08:39 +02:00
154cf9d032
strcpy instead of sprintf
2015-06-16 08:03:11 +02:00
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
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
b8b980bd92
Changed speed of sound to double
2015-05-31 14:21:25 +02:00
552b2f390f
Merge pull request #1256 from acemod/medicalExtension
...
Medical Extension for handleDamage wounds
2015-05-29 23:16:00 +02:00
1ec37aabed
Merge pull request #1424 from acemod/barometricPressureFix
...
Fixed incorrect barometric pressure calculation
2015-05-29 12:40:17 +02:00
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
69b9d0e122
More in-depth barometric pressure calculation:
...
* Temperature is now taken into account
2015-05-29 11:18:40 +02:00
83f2e35907
Fixed incorrect unit conversion in the barometric pressure calculation
2015-05-29 10:30:30 +02:00
08aeda11df
Merge branch 'master' into userActionPrototype
2015-05-27 12:33:20 -05:00
4945f22f3e
Merge branch 'master' into medicalExtension
2015-05-26 22:42:26 +02:00
f74eb31bbc
cross-platform compat integration for medical (history rewrite from gay merge).
2015-05-21 08:43:02 -07:00
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
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
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
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
e4fb652dd2
initial pick from vehicledamage for new extension build process.
2015-05-18 20:58:32 +02:00
1dd8dc3bfb
cross platform macros and port added for linux for all extensions. Should be transparent
2015-05-17 10:10:02 -07:00
e78c2fd676
Extension framework changes
2015-05-17 04:05:43 -05:00
2544cdef4a
Clean up
2015-05-17 09:48:59 +02:00
78dec5debc
Merge branch 'master' into userActionPrototype
...
Conflicts:
addons/interact_menu/XEH_preInit.sqf
2015-05-16 22:49:09 -05:00
bd440f5af9
adjusted random
2015-05-17 00:07:41 +02:00
f26cb0a666
Now handles input and output
2015-05-16 23:20:17 +02:00
4b6b0621da
Implemented handleDamage wounds fully
2015-05-16 23:19:50 +02:00
b334d8c52e
Added woundID for open wounds
2015-05-16 23:18:58 +02:00
eb2383a6f0
tabs
2015-05-14 18:56:23 +02:00
5756c8530f
Ported over handleDamage_wounds
2015-05-14 18:52:12 +02:00
e98c7cd1b7
Made handleDamage a singleton
2015-05-14 17:41:50 +02:00
a48b6c9426
Fixed namespace issues. Removed static
2015-05-14 17:36:58 +02:00
4dbacbead8
Merge branch 'master' into medicalExtension
2015-05-14 16:43:12 +02:00
99c04d0ed3
Fixed: shared_ptr vs. unique_ptr behavior in VS2013
2015-05-14 07:42:21 -07:00
b68f02333e
Merge branch 'master' into medicalExtension
2015-05-14 16:27:41 +02:00
7c03ec913b
double all the things (ints)
2015-05-14 16:23:01 +02:00
8ec57a985c
Merge branch 'master' into medicalExtension
2015-05-14 16:05:11 +02:00
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
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
3ff9ea230a
initial pick from vehicledamage for new extension build process.
2015-05-13 08:34:14 -07:00
58ee797a94
Merge branch 'master' into userActionPrototype
2015-05-13 00:00:55 -05:00
3e6c203655
size+1
2015-05-08 06:57:19 -07:00
027a3dd4ac
AB map tweaking. Just a bit of optimization and crash checking.
2015-05-07 12:52:19 -07:00
e6889f1634
Merge branch 'master' into userActionPrototype
2015-05-04 14:21:49 -05:00
92bca1f857
tabs
2015-05-04 00:32:44 +02:00
c2388aa80c
Initial work on medical extension
2015-05-04 00:02:39 +02:00
bdc967d3a9
Extension to parse text for image path
2015-05-03 13:44:02 -05:00
13bc1e0058
Replaced deprecated airFriction calculation
2015-05-03 12:31:30 +02:00
29fdd63432
Use the constants
2015-05-03 12:07:13 +02:00
d07cb0e6ed
Got rid of the newline braces
2015-05-03 11:51:30 +02:00
