1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
502cc852da
Handle encoding conversions when saving TES3 header ( Fixes #2727 )
10 years ago
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
10 years ago
1d76607005
Add ORI (ObjectReferenceInfo) alias for BetaComment ( Fixes #2723 )
10 years ago
ea0339d471
Make the string argument to BetaComment optional
10 years ago
5ac502d104
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
d3ef075952
Fix an uninitialized variable
10 years ago
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
2ce269c0fc
Werewolf stats compatibility with old save files
10 years ago
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
10 years ago
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
10 years ago
efad4efe19
Star fading (Bug #2693 )
10 years ago
7a5f220ac5
GlowTexture keeps the alpha channel from the previous texture stage
10 years ago
39539603bf
Re-enable a warning message
10 years ago
a7c5beb7c5
Remove redundant allocations for NIF meshes
10 years ago
43384596d4
Style fix
10 years ago
fabc5126f3
Include cleanup
10 years ago
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.
10 years ago
934166a853
Ignore the alpha value for particle materials (Bug #2699 )
10 years ago
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
10 years ago
6199c0bbc5
Use osgDB::SharedStateManager for sharing of StateSets across NIF files
10 years ago
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
10 years ago
aad8e7b6d0
Light culling fix
10 years ago
18f4eaa8dc
Preliminary handling for overflowing light lists
10 years ago
acf9fc2d37
Enable per-frame light list updates (Bug #2638 , Bug #2654 )
...
The performance impact isn't so big anymore since the last commit.
10 years ago
1d198a5592
Keep the light list StateSet cache for more than one frame
10 years ago
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
10 years ago
d7a4a9fd66
Create NIF root nodes as Group instead of Transform when possible
10 years ago
6b28955f31
Fix attempt to erase using a const_iterator.
10 years ago
b79ab1a3b8
Fix InverseWorldMatrix bug introduced by last commit
10 years ago
ec25f1da95
Fix ParticleSystem bug introduced by last commit
10 years ago
ad46ff7a98
Remove redundant Transform nodes for TriShapes/ParticleSystems with an identity transform
10 years ago
36aa4aa9bd
If a removed 'content=' item has comments, keep them in config file for later use.
10 years ago
ab597f672e
State the filename in NIF loader warning messages
10 years ago
6a788c3462
Minor cleanup
10 years ago
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
10 years ago
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.
10 years ago
b204396b57
Minor fix
10 years ago
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.
10 years ago
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
10 years ago
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
10 years ago
28caeadef4
Improve error message for not found records
10 years ago
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
10 years ago
c54a225467
Revert "Allow space characters in front of comments."
...
This reverts commit 4902c66792
10 years ago
3bfe167bc0
Revert "Fix loop where there was a potential for double entry."
...
This reverts commit a439f49c4d
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
10 years ago
scrawl
cc9cii
Marc Zinnschlag