scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
2016-02-15 14:34:59 +01:00
scrawl
83a9a164bc
Raise the required bullet version to 2.83
...
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587 ).
2016-02-15 00:33:17 +01:00
Marc Zinnschlag
dad38d901c
Merge remote-tracking branch 'rcutmore/feature-3043'
2016-02-14 17:38:20 +01:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
Rob Cutmore
25744aaadd
Update cell marker appearance
...
- Added bounding box around marker text. Box is black when cell exists
otherwise it is red.
- Changed format of marker text.
- Changed marker text's pivot point to be at center of text.
2016-02-14 10:28:41 -05:00
Marc Zinnschlag
29c2a99316
Merge remote-tracking branch 'scrawl/physics'
2016-02-13 16:20:48 +01:00
Marc Zinnschlag
d1d7804620
Merge remote-tracking branch 'origin/master'
2016-02-13 10:13:25 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
6fc6913424
Do not set the cursor when creating it
2016-02-13 03:34:09 +01:00
scrawl
796a4a795a
Avoid the 'spiral of death'
2016-02-13 03:09:28 +01:00
scrawl
383524c688
Run physics in fixed timesteps, use the remainder to interpolate between current and previous state
...
Based on http://gafferongames.com/game-physics/fix-your-timestep/
2016-02-13 03:03:34 +01:00
scrawl
d1375cd3a3
Crashcatcher: limit backtrace to a sensible number of stack frames
...
When a stack overflow occurs, trying to print the whole stack would cause the process to hang indefinitely.
2016-02-13 01:35:53 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00
scrawl
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
2016-02-12 14:55:00 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
2016-02-12 14:46:45 +01:00
scrawl
48ac0bef3e
Repair save games affected by bug #3080 ( Fixes #3160 )
2016-02-11 16:34:02 +01:00
scrawl
be6ea3d607
Account for UV coordinate flip in UVController ( Fixes #3203 )
2016-02-11 16:22:54 +01:00
scrawl
6bfeb118d7
Fix cleanup issue
2016-02-10 19:08:17 +01:00
scrawl
d3808580b0
Rename lightRoot to sceneRoot
2016-02-10 19:07:47 +01:00
scrawl
fb219fea17
Fix respawning of NPCs/creatures when they were moved to a different cell
2016-02-10 19:07:01 +01:00
Marc Zinnschlag
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
2016-02-10 16:23:38 +01:00
scrawl
5e876b1379
Add missing include
2016-02-10 15:34:06 +01:00
Rob Cutmore
61b6806a62
Allow toggling of cell markers
2016-02-09 20:23:00 -05:00
scrawl
98c5e072f2
Swap the terrain cache update order to make more sense
2016-02-09 21:17:10 +01:00
scrawl
9f729667fb
Remove debug output
2016-02-09 21:16:11 +01:00
scrawl
0865cea211
Preload terrain
2016-02-09 21:16:11 +01:00
scrawl
98848c752a
Make getLayerInfo thread safe
2016-02-09 20:26:58 +01:00
scrawl
8aba74e6ee
Remove GridElement
2016-02-09 20:23:53 +01:00
scrawl
596fe56bfd
Make Land::loadData thread safe
2016-02-09 20:21:56 +01:00
scrawl
1457a0de78
Use the UnrefQueue to delete BulletShapeInstances
2016-02-09 19:04:59 +01:00
scrawl
afe533e670
Accept a const Object in UnrefQueue
2016-02-09 19:00:30 +01:00
scrawl
3552b3a82c
Don't create a BulletShapeInstance for actors
2016-02-09 18:51:17 +01:00
scrawl
246566cef4
Preload instances in BulletShapeManager
2016-02-09 18:48:49 +01:00
scrawl
e28dc3e72f
Preload instances in SceneManager
2016-02-09 18:35:26 +01:00
scrawl
2e62298bd3
Clean up ObjectCache includes
2016-02-09 18:11:07 +01:00
scrawl
ce3cce24a5
Remove unneeded dynamic_cast
2016-02-09 16:39:05 +01:00
scrawl
8ece1885cd
Animation: don't create the NodeMap if we don't need it
2016-02-09 16:39:05 +01:00
scrawl
ae031b23d4
Do not detach NPC parts in destructor
2016-02-09 16:10:42 +01:00
scrawl
40a6e05e17
Use a deque instead of vector in UnrefQueue
2016-02-09 16:09:55 +01:00
scrawl
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
2016-02-09 15:45:35 +01:00
scrawl
f6f9eff9a6
Preload levelled creatures
2016-02-09 03:06:00 +01:00
scrawl
6806741d9b
Add settings for disabling the individual preloading types
2016-02-09 01:58:33 +01:00
scrawl
10a3e270a3
Preload fast travel destinations
2016-02-09 01:52:02 +01:00
scrawl
1cda2bf796
Preload sky & water from the main menu
2016-02-09 01:28:13 +01:00
scrawl
f9082502f8
Move construction of WorkQueue to RenderingManager
2016-02-09 01:02:40 +01:00
scrawl
d16450bff2
Fix correctActorModelPath in preloader not being used
2016-02-09 00:28:27 +01:00
scrawl
1b8e82e929
Preload NPC body parts
2016-02-09 00:26:22 +01:00
scrawl
84dcf59c50
Fix preloading of equipment parts that don't separate gender
2016-02-08 22:57:47 +01:00
scrawl
effe022bb2
Move preload model list to MWClass, preload NPC head/hair
2016-02-08 20:52:32 +01:00
scrawl
84f01b7527
Remove unneeded forward declaration
2016-02-08 16:27:28 +01:00