mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 03:53:54 +00:00
Code Issues Releases Wiki Activity
14509 commits 108 branches 66 tags 133 MiB
Commit graph

2537 commits

Author SHA1 Message Date
scrawl
fabc5126f3 Include cleanup 2015-06-18 00:30:51 +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
934166a853 Ignore the alpha value for particle materials (Bug #2699) 2015-06-17 18:04:33 +02:00
scrawl
b648722d3b Don't use the ParticleSystem for computing placeable bounds (Bug #2700) 2015-06-17 15:13:41 +02:00
scrawl
6199c0bbc5 Use osgDB::SharedStateManager for sharing of StateSets across NIF files 2015-06-16 23:50:19 +02: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
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
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
Marc Zinnschlag
8fc0bdfac7 Merge remote-tracking branch 'cc9cii/keep-config-comments' 2015-06-15 16:22:48 +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
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
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
cc9cii
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
 2015-06-14 14:51:01 +10:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
scrawl
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.

Conflicts:
	components/config/gamesettings.cpp
 2015-06-13 23:50:12 +02:00
scrawl
c54a225467 Revert "Allow space characters in front of comments." 
This reverts commit 4902c66792.
 2015-06-13 23:49:29 +02:00
scrawl
3bfe167bc0 Revert "Fix loop where there was a potential for double entry." 
This reverts commit a439f49c4d.
 2015-06-13 23:49:29 +02:00
scrawl
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
 2015-06-13 21:11:24 +02:00
cc9cii
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. 2015-06-13 14:37:47 +10:00
scrawl
89c2a7e26b Fix for possibly missing library on windows 2015-06-12 15:22:19 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
scrawl
c04f6cf167 Remove unused code 2015-06-12 01:58:13 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
scrawl
712cef36b0 Minor cleanup 2015-06-11 18:01:00 +02:00
scrawl
cdc47fa874 Remove BulletNifLoader dependency on keyframe manager 
This will make threaded loading easier.
 2015-06-11 17:59:49 +02:00
scrawl
8d6620b074 Assign an initial bounding box to particle systems 2015-06-11 02:37:49 +02:00
scrawl
b5099324d1 Enable ParticleSystem's FreezeOnCull, big speed-up in Vivec 2015-06-10 20:35:59 +02:00
scrawl
a1e74a35a2 Revert "Use the WorkQueue to update skinning" 
This reverts commit d52d0d9640.

Moving to branch
 2015-06-10 19:08:56 +02:00
scrawl
9c86d4f8bc Race condition fix 2015-06-10 19:02:33 +02:00
scrawl
35b2d91fb3 Throw error when failing to create graphics context 2015-06-10 18:46:51 +02:00
scrawl
d52d0d9640 Use the WorkQueue to update skinning 2015-06-10 18:16:02 +02:00
scrawl
cc71e894e1 Add WorkQueue class 2015-06-10 18:15:31 +02:00
cc9cii
8e8da724f5 Remove unnecessary comment entry in the config file. 2015-06-10 08:23:38 +10:00
scrawl
c621d0400c Fix error handling for out-of-range NIF roots (found in Bosmora, TR) 2015-06-09 18:22:18 +02:00
scrawl
db16cdad02 Add a comment 2015-06-09 03:16:41 +02:00
scrawl
5921e70625 Build a kdtree for terrain geometry 
Improves intersection testing performance, shaving off ~2ms of frame time in exteriors.

Also increases terrain loading time by ~1ms per cell, so will have to look into background loading soon.
 2015-06-09 02:29:56 +02:00
scrawl
93ee11c5e7 Fix particlesystem nested RenderBin issue (Bug #2631) 2015-06-08 21:21:09 +02:00
scrawl
fc8e5dde3b Fix crash when OSG_STEREO is enabled 2015-06-08 03:26:36 +02:00
scrawl
347c9b57b8 Copy constructor signature fix 2015-06-08 01:59:42 +02:00
scrawl
10457c1b28 Include fix 2015-06-08 01:14:26 +02:00
scrawl
5edf457ab7 Build fix 2015-06-08 01:13:23 +02:00
scrawl
9c9b83f8e2 Changes to compile with osg-svn 3.3.8 2015-06-07 23:51:54 +02:00
scrawl
ab626ca7b9 Improve MyGUI widget creation performance 2015-06-07 18:57:26 +02:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
scrawl
0a411cbd7c Enable particle lighting 2015-06-07 04:41:55 +02:00
scrawl
68e322f969 Restore data directory verbose output that got lost 2015-06-07 01:47:19 +02:00
cc9cii
a439f49c4d Fix loop where there was a potential for double entry. 2015-06-07 07:38:52 +10:00
cc9cii
4902c66792 Allow space characters in front of comments. 2015-06-07 07:21:15 +10:00
cc9cii
15fe5d88e2 Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- controlled via a checkbox in launcher settings
 2015-06-06 20:35:55 +10:00
scrawl
0afc03b6b7 Build fix 2015-06-05 16:56:38 +02:00
scrawl
d8d43f94b9 Fix a typo 2015-06-05 02:06:13 +02:00
scrawl
e23775e338 Fix -Woverloaded-virtual clang warnings 2015-06-04 20:31:28 +02:00
scrawl
231b217664 Build fix for MyGUI 3.2.1 2015-06-04 17:13:42 +02:00
scrawl
e046119487 Fix for unnecessary terrain texture coordinate arrays 2015-06-04 16:15:26 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0 Remove dependency on Ogre::StringConverter 2015-06-03 19:59:54 +02:00
scrawl
0cc9b1bb40 Remove dependency on OgrePlatform.h 2015-06-03 18:49:52 +02:00
scrawl
dd23981eab Font workaround for older MyGUI versions, works with 3.2.2 now 2015-06-03 18:00:45 +02:00
scrawl
bd0233ce68 Error handling improvement 2015-06-03 18:00:34 +02:00
scrawl
e642f20a65 Restore screenshot key functionality 2015-06-03 17:25:18 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cd47dff196 Minor cleanup 2015-06-03 03:03:16 +02:00
scrawl
b978153edb Enable VBO sharing for terrain geometry 2015-06-03 02:24:09 +02:00
scrawl
5666e02546 Fix for dark terrain in some cases 2015-06-03 02:22:04 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
10f938ff87 Add comment 2015-06-03 01:18:03 +02:00
scrawl
5a7f2a4f1f Restore light attenuation settings 2015-06-02 17:02:56 +02:00
scrawl
01944c33f5 Basic water rendering 2015-06-02 16:35:35 +02:00
Marc Zinnschlag
67f04e0ba1 Merge remote-tracking branch 'origin/master' 2015-06-02 14:44:27 +02:00
Marc Zinnschlag
ee2763f2d4 Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591) 2015-06-02 14:43:38 +02:00
Stanislav Bas
6cb221f8d0 Some minor changes to MWList 2015-06-02 11:55:09 +03:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
Stanislav Bas
5350ce59ef MWList doesn't scroll to the very bottom when it's shown for first time 2015-06-01 22:42:41 +03:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
c85764b654 Wireframe mode 2015-06-01 17:02:44 +02:00
scrawl
7f9f9a32d2 InitWorldSpaceParticles fix 2015-06-01 16:29:42 +02:00
scrawl
b0b55e2037 Delete niftest as it's currently broken 2015-06-01 02:48:15 +02:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
scrawl
0f8f19958a NifLoader: Fix empty StateSets being created in some cases 2015-05-30 04:26:00 +02:00
scrawl
fd50be0fb8 Restore various gameplay 2015-05-30 01:00:24 +02:00
scrawl
6231cd8557 RigGeometry clone fix 2015-05-30 00:59:34 +02:00
scrawl
a56d0e9cc3 ControllerVisitor fix 2015-05-29 23:39:52 +02:00