Marc Zinnschlag
107bf818e7
Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83"
...
This reverts commit 27751db99a
2015-05-10 13:35:21 +02:00
Marc Zinnschlag
e4ffb985a1
Revert "Collision fix"
...
This reverts commit 60fffec345
2015-05-10 13:32:01 +02:00
Marc Zinnschlag
53c3df16e5
Merge remote-tracking branch 'origin/master'
2015-05-10 11:50:59 +02:00
Marc Zinnschlag
8e35ad54bd
temporarily remove the test for bullet version
2015-05-10 11:17:52 +02:00
scrawl
60fffec345
Collision fix
2015-05-05 16:08:01 +02:00
Marc Zinnschlag
0c27869089
Merge remote-tracking branch 'scrawl/bullet283'
2015-05-05 10:52:18 +02:00
scrawl
27751db99a
Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83
2015-05-04 16:23:33 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
Scott Howard
7c9104a291
fix -Wnewline-eof
2015-04-01 21:46:19 -04:00
Nikolay Kasyanov
3e45e9a48a
Remove no longer required strnlen wrapper
...
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49c
2015-03-18 23:37:54 +02:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
cc9cii
15b9a628ac
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
2015-03-14 19:41:55 +11:00
scrawl
16ddfbca14
Remove some outdated todo comments
2015-03-12 00:27:01 +01:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
scrawl
c7cd576002
Remove leftover of old tests
2015-03-05 23:12:47 +01:00
scrawl
2f2a95f735
Fix crash for terrain without data, part 2
2015-02-28 19:33:49 +01:00
scrawl
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
2015-01-27 23:05:19 +01:00
Marc Zinnschlag
a266dffb4b
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-20 15:53:48 +01:00
Marc Zinnschlag
e9af9b991d
Merge remote-tracking branch 'dteviot/master'
2015-01-18 09:50:56 +01:00
dteviot
b66937d630
add #include <stdint.h>
...
Required to get build to work on my configuration.
2015-01-17 15:35:58 +13:00
scrawl
b77558726a
Disable collision for placeable objects ( Fixes #1634 )
2015-01-17 00:10:49 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
2015-01-12 23:29:58 +01:00
scrawl
04d6cead3b
Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node ( Fixes #2133 )
2015-01-12 23:29:57 +01:00
scrawl
eecea4131f
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Marc Zinnschlag
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
2015-01-02 18:08:47 +01:00
Thoronador
3b00a24f3f
fix some uninitialized stuff in ShaderBasedRenderManager
2015-01-02 01:35:16 +01:00
mrcheko
60a74d5eb8
increase robustness for gamma to persist in the system;
...
use GMST strings for gamma interface
2014-12-31 18:40:01 +03:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
scrawl
5b2633588c
Add error handling for SDL_CreateWindow
2014-12-30 19:14:06 +01:00
mrcheko
04d95810d1
gamma/contrast system reworked
2014-12-30 18:33:11 +03:00
Sebastian Wick
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
2014-12-24 15:09:50 +01:00
Sebastian Wick
ec18a2cfa0
add support for borderless windows
2014-12-22 02:16:30 +01:00
scrawl
d3d5c1fd15
Disable debug drawing for raycasting shapes
...
This reduces performance too much, and seeing both shapes overlaid on top of each other is confusing anyway. This can be reintroduced via a setting if necessary.
2014-11-29 16:51:45 +01:00
cc9cii
f051fb65ff
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
2014-11-06 08:35:24 +11:00
scrawl
064f1964ba
More efficient water walking
2014-10-05 22:27:20 +02:00
scrawl
d790506525
Fix projectiles colliding with dead actors ( Fixes #1971 )
2014-10-05 17:41:56 +02:00
scrawl
4859c94c72
Ignore other actors in ActorTracer::findGround ( Fixes #1472 )
2014-10-03 15:37:32 +02:00
scrawl
db086a4d89
Remove unused PairCachingGhostObject
2014-10-02 17:23:43 +02:00
scrawl
d99e416208
Remove some unused methods from OEngine::Gui::Layout
2014-10-02 13:55:42 +02:00
scrawl
cd52002740
Remove some unneeded bits from collision mask
2014-10-02 00:27:04 +02:00
scrawl
bdab3fa321
Bullet optimization: Don't update AABBs of static objects every frame
2014-09-28 18:02:57 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
