Aesylwinn
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
2016-08-30 16:42:38 -04:00
Aesylwinn
3ae2fc17c6
Fix some issues with content file numbers in the editor.
...
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
2016-08-29 18:06:56 -04:00
Marc Zinnschlag
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
2016-08-18 09:13:43 +02:00
scrawl
341e3846c0
Use initial particle state to compute the initial bounding box ( Fixes #3500 )
2016-08-16 23:28:03 +02:00
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3
LocalMap no longer depends on osgViewer
2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb
Remove unneeded setGraphicsContext() calls
2016-08-16 19:33:09 +02:00
scrawl
0209c70583
Improve performance by skipping update if transform is unchanged
2016-08-16 17:50:59 +02:00
scrawl
4751e0e953
Improve performance of animateCollisionShapes by caching the node path
2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84
Revert "animateCollisionShape checks if the shape is really animated"
...
This reverts commit cbf344663f
.
Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
2016-08-16 17:50:59 +02:00
scrawl
b26478b860
Merge pull request #1028 from kpp/find_osg_plugins
...
Find osg_plugins
2016-08-16 17:05:44 +02:00
scrawl
ec14fe4d4c
Merge pull request #1026 from kpp/find_sphinx
...
Fix FindSphinx.cmake
2016-08-16 16:49:43 +02:00
scrawl
46d3845fb3
Merge pull request #1027 from kpp/find_sdl2
...
Find sdl2
2016-08-16 16:49:23 +02:00
scrawl
3ef9b3f44d
Merge pull request #1025 from Allofich/anim
...
Use loopfallback for idle animation groups
2016-08-16 16:30:55 +02:00
Roman Proskuryakov
0d83121a6f
Removes unused FindPkgMacros
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
ed2c2170f0
Rewrites FindSDL2 using LibFindMacros
2016-08-15 23:57:39 +03:00
Roman Proskuryakov
3df57b1833
Fixes LibFindMacros for libfind_process
2016-08-15 23:55:53 +03:00
Roman Proskuryakov
9d51e1966f
Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation
2016-08-15 23:55:53 +03:00
Roman Proskuryakov
2311969f05
Reduce the number of copypaste in FindSphinx.cmake
2016-08-15 22:29:07 +03:00
Aesylwinn
7125775648
Change free axis rotation.
2016-08-15 15:07:43 -04:00
scrawl
dae4a8353a
Merge pull request #1024 from kpp/kpp_travis_improvements
...
Improve Travis config
2016-08-15 20:05:33 +02:00
Allofich
c05782581e
Account for all instances of play()
2016-08-16 02:52:55 +09:00
Allofich
6163c7bb03
Use loopfallback for idle animation groups
2016-08-16 01:15:26 +09:00
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
Roman Proskuryakov
f4f81a14c9
Use Travis addons.apt.packages to install packages
2016-08-15 18:45:29 +03:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
2b860e2600
Reduce the number of if conditions in Travis config
2016-08-15 16:29:01 +03:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
Roman Proskuryakov
e0e69a8d8a
Rewrites FindMyGUI with LibFindMacros
2016-08-15 15:59:02 +03:00
Aesylwinn
3e4ac0c662
Potential fix for context sensitive select mode issues.
2016-08-14 14:43:29 -04:00
scrawl
71f786ff84
Delete the WorkQueue first
...
Fixes a potential crash on exit.
2016-08-14 18:10:29 +02:00
scrawl
3732979eec
Revert "Merge pull request #993 from mrcheko/pathfinding"
...
This reverts commit 5190275b37
, reversing
changes made to d7845012bf
.
2016-08-14 18:04:33 +02:00
scrawl
c3340ec143
Merge pull request #1022 from Allofich/anim
...
Make loopgroup loop correct number of times
2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5
Merge pull request #1023 from psi29a/small_fixes
...
small fixes
2016-08-14 16:49:26 +02:00
scrawl
513e1da8a3
Remove unneeded casts
2016-08-14 16:44:11 +02:00
scrawl
30b549124e
Fix use-after-free
2016-08-14 16:42:29 +02:00
scrawl
c65492193c
Use osg::clone
2016-08-14 16:41:44 +02:00
scrawl
33d27a2285
Use ref_ptr
2016-08-14 16:41:33 +02:00
scrawl
0fbc0d0da7
Attempt to silence warning
2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937
clang says that these must be in the MWWorld namespace
2016-08-14 16:17:09 +02:00
scrawl
0d439750a2
Clang warning fix
2016-08-14 15:20:52 +02:00
scrawl
8c44334409
Merge pull request #1021 from Allofich/weight
...
Corrections to tooltip displays of zero-weight items
2016-08-14 15:14:58 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
scrawl
698575dc1b
Merge pull request #1020 from Allofich/sound
...
Make zero-weight boots play light boot footsteps
2016-08-14 15:08:09 +02:00
Allofich
a381a15b19
Make loopgroup loop correct number of times
2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014
Allow showing value of zero-weight lights
2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff
Use getWeightString() to avoid casting to int
2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e
Allow weight tooltips for gold and keys if not 0
2016-08-14 19:32:43 +09:00
Allofich
caf025f93d
Don't show 0 weight tooltips except for potions
2016-08-14 19:27:59 +09:00