Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
2015-06-17 22:47:39 +03:00
scrawl
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
2015-06-17 20:49:01 +02:00
scrawl
81a4a6da6b
Make better use of the available texture units (Bug #2702 )
...
Nvidia drivers only support a maximum of 4 fixed function texture units. To resolve this problem, bind texture units in order instead of binding to the NiTexturingProperty::TextureType unit.
2015-06-17 20:43:39 +02:00
scrawl
3ebfb4e0d9
Ignore particle systems in getScreenBounds
2015-06-17 18:22:31 +02:00
scrawl
b543308e3e
Remove an already resolved todo comment
2015-06-17 18:16:05 +02:00
scrawl
934166a853
Ignore the alpha value for particle materials (Bug #2699 )
2015-06-17 18:04:33 +02:00
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-17 15:56:01 +02:00
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
2015-06-17 15:13:41 +02:00
scrawl
7b35882814
RemoveParticlesVisitor fix
2015-06-17 15:13:17 +02:00
scrawl
6199c0bbc5
Use osgDB::SharedStateManager for sharing of StateSets across NIF files
2015-06-16 23:50:19 +02:00
Stanislav Bas
ed09424223
Correct the position of the colored rectangle in ColorEditor and ColorDelegate
2015-06-17 00:45:43 +03:00
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
2015-06-16 22:39:12 +03:00
scrawl
1c151f2f0a
Re-enable some outcommented sky code
2015-06-16 20:56:48 +02:00
Stanislav Bas
1e368de289
Adjust columns of nested tables when a dialog subview is opened
2015-06-16 21:47:27 +03:00
scrawl
3da8f6e62e
Water ripples
2015-06-16 20:36:48 +02:00
Stanislav Bas
6cfee630aa
Proper size hint for DataDisplayDelegate
2015-06-16 21:25:06 +03:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
scrawl
b73947033d
Rotate sky meshes
2015-06-16 16:33:31 +02:00
Stanislav Bas
2c1ca33a20
Refactor Enum- and DataDisplayDelegate code
2015-06-16 15:39:54 +03:00
Stanislav Bas
0ffb2bc6bc
Proper size hint for EnumDelegate
2015-06-16 14:18:47 +03:00
Marc Zinnschlag
62c5f185d7
Merge remote-tracking branch 'cc9cii/master'
2015-06-16 12:30:21 +02:00
Marc Zinnschlag
13112c6d04
Merge remote-tracking branch 'scrawl/aiwanderfix'
2015-06-16 12:28:34 +02:00
cc9cii
6a47ea9a67
fix typo
2015-06-16 13:09:44 +10:00
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
2015-06-16 12:48:45 +10:00
Stanislav Bas
d906a9d7d1
DataDisplayDelegate doesn't draw a text outside a table cell
2015-06-16 00:19:51 +03:00
scrawl
2d072aab2d
Broken bone references from .kf files are no longer a fatal error (Bug #2687 )
2015-06-15 22:42:14 +02:00
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
aad8e7b6d0
Light culling fix
2015-06-15 19:37:44 +02:00
scrawl
18f4eaa8dc
Preliminary handling for overflowing light lists
2015-06-15 18:56:40 +02:00
scrawl
acf9fc2d37
Enable per-frame light list updates (Bug #2638 , Bug #2654 )
...
The performance impact isn't so big anymore since the last commit.
2015-06-15 18:15:26 +02:00
scrawl
1d198a5592
Keep the light list StateSet cache for more than one frame
2015-06-15 18:09:01 +02:00
scrawl
609e146a22
Build fixes for windows
2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
2015-06-15 16:25:11 +02:00
Marc Zinnschlag
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
2015-06-15 16:22:48 +02:00
scrawl
07937c741a
Improve exception handling when starting a new game from the main menu
2015-06-15 16:19:05 +02:00
scrawl
d7a4a9fd66
Create NIF root nodes as Group instead of Transform when possible
2015-06-15 15:25:45 +02:00
cc9cii
6b28955f31
Fix attempt to erase using a const_iterator.
2015-06-15 10:26:16 +10:00
scrawl
b79ab1a3b8
Fix InverseWorldMatrix bug introduced by last commit
2015-06-15 02:22:52 +02:00
scrawl
ec25f1da95
Fix ParticleSystem bug introduced by last commit
2015-06-15 02:17:57 +02:00
scrawl
ad46ff7a98
Remove redundant Transform nodes for TriShapes/ParticleSystems with an identity transform
2015-06-15 02:06:04 +02:00
cc9cii
36aa4aa9bd
If a removed 'content=' item has comments, keep them in config file for later use.
2015-06-15 09:53:26 +10:00
scrawl
ab597f672e
State the filename in NIF loader warning messages
2015-06-15 01:49:46 +02:00
scrawl
6a788c3462
Minor cleanup
2015-06-15 01:29:32 +02:00
scrawl
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
2015-06-14 23:56:35 +02:00
scrawl
f017fd6860
Reduce includes in animation.hpp
2015-06-14 23:13:26 +02:00
scrawl
9e049894e8
Reduce the number of StateSets created for NIF scene graphs
...
The Material state is now set on the NiTriShape's node rather than the Geode, thus merged with other state like NiTexturingProperties, etc that are typically attached to the NiTriShape.
Effectively cuts in half the number of StatSets for a NIF file, resulting in big speedup (~10%) in the Cull and Draw phases.
2015-06-14 21:22:44 +02:00
scrawl
b204396b57
Minor fix
2015-06-14 21:04:59 +02:00
scrawl
98571148b0
Remove custom license for terrain code
...
Now that it's no longer a stand-alone component, there's not much point in custom licensing it.
2015-06-14 20:44:29 +02:00
scrawl
412e001edb
Fix simulation time reset in OpenCS when opening a new view
2015-06-14 19:19:23 +02:00
