Commit Graph

2615 Commits (openmw-37)

Author SHA1 Message Date
scrawl b204396b57 Minor fix 10 years ago
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.
10 years ago
scrawl 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
Marc Zinnschlag e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 10 years ago
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
10 years ago
scrawl 28caeadef4 Improve error message for not found records 10 years ago
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
10 years ago
scrawl c54a225467 Revert "Allow space characters in front of comments."
This reverts commit 4902c66792.
10 years ago
scrawl 3bfe167bc0 Revert "Fix loop where there was a potential for double entry."
This reverts commit a439f49c4d.
10 years ago
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
10 years ago
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. 10 years ago
scrawl 89c2a7e26b Fix for possibly missing library on windows 10 years ago
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.
10 years ago
scrawl c04f6cf167 Remove unused code 10 years ago
scrawl cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 10 years ago
scrawl fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 10 years ago
scrawl 712cef36b0 Minor cleanup 10 years ago
scrawl cdc47fa874 Remove BulletNifLoader dependency on keyframe manager
This will make threaded loading easier.
10 years ago
scrawl 8d6620b074 Assign an initial bounding box to particle systems 10 years ago
scrawl b5099324d1 Enable ParticleSystem's FreezeOnCull, big speed-up in Vivec 10 years ago
scrawl a1e74a35a2 Revert "Use the WorkQueue to update skinning"
This reverts commit d52d0d9640.

Moving to branch
10 years ago
scrawl 9c86d4f8bc Race condition fix 10 years ago
scrawl 35b2d91fb3 Throw error when failing to create graphics context 10 years ago
scrawl d52d0d9640 Use the WorkQueue to update skinning 10 years ago
scrawl cc71e894e1 Add WorkQueue class 10 years ago
cc9cii 8e8da724f5 Remove unnecessary comment entry in the config file. 10 years ago
scrawl c621d0400c Fix error handling for out-of-range NIF roots (found in Bosmora, TR) 10 years ago
scrawl db16cdad02 Add a comment 10 years ago
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.
10 years ago
scrawl 93ee11c5e7 Fix particlesystem nested RenderBin issue (Bug #2631) 10 years ago
scrawl fc8e5dde3b Fix crash when OSG_STEREO is enabled 10 years ago
scrawl 347c9b57b8 Copy constructor signature fix 10 years ago
scrawl 10457c1b28 Include fix 10 years ago
scrawl 5edf457ab7 Build fix 10 years ago
scrawl 9c9b83f8e2 Changes to compile with osg-svn 3.3.8 10 years ago
scrawl ab626ca7b9 Improve MyGUI widget creation performance 10 years ago
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
10 years ago
scrawl 0a411cbd7c Enable particle lighting 10 years ago
scrawl 68e322f969 Restore data directory verbose output that got lost 10 years ago
cc9cii a439f49c4d Fix loop where there was a potential for double entry. 10 years ago
cc9cii 4902c66792 Allow space characters in front of comments. 10 years ago
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
10 years ago
scrawl 0afc03b6b7 Build fix 10 years ago
scrawl d8d43f94b9 Fix a typo 10 years ago
scrawl e23775e338 Fix -Woverloaded-virtual clang warnings 10 years ago
scrawl 231b217664 Build fix for MyGUI 3.2.1 10 years ago
scrawl e046119487 Fix for unnecessary terrain texture coordinate arrays 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl b70383d127 Remove last remains of Ogre math 10 years ago
scrawl 2eec0caca0 Remove dependency on Ogre::StringConverter 10 years ago
scrawl 0cc9b1bb40 Remove dependency on OgrePlatform.h 10 years ago
scrawl dd23981eab Font workaround for older MyGUI versions, works with 3.2.2 now 10 years ago
scrawl bd0233ce68 Error handling improvement 10 years ago
scrawl e642f20a65 Restore screenshot key functionality 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl cd47dff196 Minor cleanup 10 years ago
scrawl b978153edb Enable VBO sharing for terrain geometry 10 years ago
scrawl 5666e02546 Fix for dark terrain in some cases 10 years ago
scrawl cdd0623009 Terrain rendering 10 years ago
scrawl 10f938ff87 Add comment 10 years ago
scrawl 5a7f2a4f1f Restore light attenuation settings 10 years ago
scrawl 01944c33f5 Basic water rendering 10 years ago
Marc Zinnschlag 67f04e0ba1 Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag ee2763f2d4 Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591) 10 years ago
Stanislav Bas 6cb221f8d0 Some minor changes to MWList 10 years ago
Stanislav Bas 959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 10 years ago
Stanislav Bas 5350ce59ef MWList doesn't scroll to the very bottom when it's shown for first time 10 years ago
scrawl de8e5f0db1 Restore projectiles 10 years ago
scrawl c85764b654 Wireframe mode 10 years ago
scrawl 7f9f9a32d2 InitWorldSpaceParticles fix 10 years ago
scrawl b0b55e2037 Delete niftest as it's currently broken 10 years ago
Stanislav Bas 5dc6cdeb99 Scroll to the top of the topic list when dialog is started 10 years ago
scrawl a066b24303 Restore WeaponAnimation 10 years ago
Marc Zinnschlag d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 10 years ago
scrawl 0f8f19958a NifLoader: Fix empty StateSets being created in some cases 10 years ago
scrawl fd50be0fb8 Restore various gameplay 10 years ago
scrawl 6231cd8557 RigGeometry clone fix 10 years ago
scrawl a56d0e9cc3 ControllerVisitor fix 10 years ago
scrawl 668d365ef9 MorphGeometry copy fix 10 years ago
scrawl 261ed1f4e5 Revert "Enable culling for particle emitters & programs"
This reverts commit 8b206e0aed.
10 years ago
scrawl 1cdb440b77 glReadPixels *is* available on OpenGL ES 10 years ago
scrawl 9ee63dc3f4 Change stats viewer key to f3 10 years ago
scrawl 025a1a7866 Restore savegame screenshot display 10 years ago
scrawl fe439e53ff Bullet include cleanup 10 years ago
cc9cii 5fd107a95c Fix crash with array out of bounds when refNum index is incorrect. 10 years ago
scrawl 723beb1cac Move IncrementalCompileOperation to SceneManager 10 years ago
scrawl 5de24552a8 Leak fix 10 years ago
scrawl 3dcb167066 Map rendering 10 years ago
scrawl da24e298ee Fix -Wreorder warnings 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 7882c3d7f0 Fix incorrect rotation for meshes with BoneOffset 10 years ago
scrawl 8d033f0558 Fix UpdateRigBounds not being copied properly 10 years ago
scrawl 8b768f4377 Minor fix for behaviour with non-existing LightManager 10 years ago
scrawl 314c1161ae Minor addition to reading display 10 years ago
scrawl 99eb78fc19 Fix $DISPLAY not being accounted for in cursor decompression context 10 years ago
scrawl 737c2114dc Change viewer stats keybinding to F9 10 years ago
scrawl 49df07ea7f Implement UI scaling factor 10 years ago
scrawl 24bb2e152c Apply texture filter setting changes 10 years ago
scrawl 5442bf23a6 Apply video mode & gamma setting changes 10 years ago
scrawl b6cb73e6e8 Fix deep copying of controllers
This fixes the cell loading crash.
10 years ago
scrawl a18663c8b3 Improve MyGUI texture updates 10 years ago
scrawl 5dd1b2ae86 Readded HW cursor rotation 10 years ago
scrawl c775cbbbaa Silence an annoying message 10 years ago
scrawl 9ea416b852 Readded HW cursor manager (no image rotation yet) 10 years ago
scrawl 39fb46601a Readded input & event handling 10 years ago
scrawl 298b3ed2ef Create the GraphicsWindowSDL2 directly 10 years ago
scrawl 0498e6e5f0 Readded window icon 10 years ago
cc9cii 7f12fc4770 Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank(). 10 years ago
scrawl 375b736e74 Use SDL to create the window
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
10 years ago
scrawl 82316105de BulletShapeManager kf loading fix 10 years ago
scrawl 65f0195c71 Readded animated collision shape support 10 years ago
scrawl 47758c11cd Readded collision objects and movement physics 10 years ago
Marc Zinnschlag 107bf818e7 Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83"
This reverts commit 27751db99a.

Conflicts:

	libs/openengine/bullet/physic.cpp
10 years ago
scrawl c31b416ba1 Move physicssystem to a new mwphysics module 10 years ago
scrawl fe15f31f3e Remove strings.h wrapper 10 years ago
scrawl c843cfc8e2 Physics stub in preparation for rewrite 10 years ago
scrawl 48ffeab191 Remove old BulletShapeManager 10 years ago
scrawl 0da1e0e905 Add comment 10 years ago
scrawl d432a3ed08 Fix MyGUI rendering not taking DataVariance of textures into account 10 years ago
scrawl af7cbb2e3b Leak fix 10 years ago
scrawl 483dc9de45 Stop viewer threading before changing MyGUI textures 10 years ago
scrawl 604580d75d Move toMatrix to Nif::Node 10 years ago
scrawl f760aebc92 Disable MyGUI VBOs due to crashes (will look into proper fix) 10 years ago
Marc Zinnschlag 0c27869089 Merge remote-tracking branch 'scrawl/bullet283' 10 years ago
scrawl 100d6e5fff Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance 10 years ago
scrawl ee60df1e27 Split MyGUI rendering into Update, Cull and Draw stages 10 years ago
scrawl 27751db99a Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83 10 years ago
dteviot b0c4be2316 Multi-select + context menu. (Fixes #2480)
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
10 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
10 years ago
scrawl a37a83eaea Use interleaved vertex data in MyGUI render manager, avoiding redundant copies 10 years ago
scrawl 5a759f8b0d GUI cleanup fix 10 years ago
scrawl 140e67036c Flip non-dds textures vertically
Fixes the up-side down loading screens.
10 years ago
Marc Zinnschlag 83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 1a5407af98 Reduce texture memory usage in OpenMW 10 years ago
scrawl dc9b27acfe Create manual GUI textures 10 years ago
scrawl 1b78acc2c0 Remove manual allocation for images 10 years ago
scrawl cac288d5be Remove OgreInit 10 years ago
scrawl d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 10 years ago
scrawl 82c4d01b37 Add back resource handling workarounds to the gui code 10 years ago
scrawl 9f74be8fcb Add back the custom MyGUI log facility for utf8 paths on windows 10 years ago
scrawl 6afb0e43ef Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69 10 years ago
scrawl a59940a2c7 Move MyGUI platform to components 10 years ago
scrawl 15bdb7db01 transformBoundingSphere optimization 10 years ago
scrawl a98dc78cc5 Bounds fix 10 years ago
scrawl 83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 10 years ago
k1ll 8e094d6fa5 Add static bullet to components 10 years ago
k1ll b194af4ab2 Add static qt to components 10 years ago
k1ll a230050ec8 Boost tr1 unordered map does not work with mingw 10 years ago
k1ll 00b7712a59 Fix shlwapi include case and add the lib for linking when building for windows 10 years ago
Marc Zinnschlag ba57a648db Merge remote-tracking branch 'rohit-n/reorder' 10 years ago
Marc Zinnschlag 607a16eb01 removed leftover ignoreRefNum argument 10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
Marc Zinnschlag f1c0847897 Merge remote-tracking branch 'cc9cii/moveref' 10 years ago
Marc Zinnschlag e69687b0f2 silenced a warning (potentially unintialised variable) 10 years ago
scrawl 63b69db617 Port skeleton based bounding boxes to the new skinning system
Not sure if going to keep this, there's a noticable performance impact.
10 years ago
cc9cii 7673be6d0f Loading of moved refs complete. 10 years ago
scrawl b4a06bd78d Improve skinning performance 10 years ago
cc9cii e668b35b02 Fix typo. 10 years ago
cc9cii dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 10 years ago
cc9cii acb800b8f9 Resolve merge issues and fix typos. 10 years ago
scrawl 372a54bbc7 Dead code removal 10 years ago
cc9cii f1a58994c6 Merge branch 'master' into moveref
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
10 years ago
scrawl 09742d5b95 Animation playback works, no movement accumulation yet 10 years ago
scrawl 6fada6acf8 Remove tests for no longer existing code 10 years ago
scrawl 12f3198f68 Node name lookups should be case insensitive
Concerns "AttachLight", "BoneOffset" and equipment part attachment points, that are all case insensitive in vanilla MW.
10 years ago
scrawl cd7808fc11 Cleanup in preparation for animation port
Scrapped previous idea for multiple animation sources, better approach incoming.
10 years ago
scrawl 148c041a43 Nif loader cleanup - forcing a skeleton is no longer needed 10 years ago
scrawl 1a19cd3607 Some cleanup 10 years ago
scrawl 8c810e3620 Move rng to components 10 years ago
scrawl 04accb7652 Add LightController 10 years ago
scrawl 5fbcf8a859 Mesh filtering fix 10 years ago
scrawl a254877abe Clone fix 10 years ago
scrawl 28643660d3 Change triangle indices to unsigned 10 years ago
scrawl 102eadf91c Add some comments 10 years ago
scrawl 10644544ab Dead code removal 10 years ago
scrawl eaa4316ff8 Move skinning code to SceneUtil 10 years ago
scrawl 9246a668b9 Skeleton update fix 10 years ago
scrawl bd88758962 Use the new skinning system in OpenMW 10 years ago
scrawl 111e3eb6db Slightly improve bounding box for skinned meshes 10 years ago
scrawl 4ea6d4aa01 Rewrite of skinning code
Goals:
- get rid of the mesh pre-transform (this requires supporting different bind matrices for each mesh)
- bounding box should be relative to the bone the mesh is attached to, ideally we can then get rid of the expensive skeleton-based bounding boxes
- update bone matrices in CullCallback instead of UpdateCallback

Works OK, though the bounding boxes are not correct yet.
10 years ago
scrawl 167ae600c5 Implement gravity decay (previously unknown float) 10 years ago
scrawl 68f93294da Port EffectManager 10 years ago
scrawl f7d2a28930 Port BoneOffset 10 years ago
scrawl 1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/view/render/cell.cpp
10 years ago
scrawl edc5cad79e Port Animation::addEffect 10 years ago
dteviot 4607c4b581 Add Modified DateTime to plug-in tooltip. (Fixes #2479) 10 years ago
scrawl 20af2b67a8 Change the triangle pattern used for terrain (Fixes #2459) 10 years ago
scrawl 083c41c950 Environment map for enchanted objects 10 years ago
scrawl 8f6d4fb3e0 Fix filtering bug 10 years ago
scrawl 57fd18b161 Fix frontface bug 10 years ago
scrawl c334a76a6f Fix skinning bug 10 years ago
scrawl f7da979669 Add FrameSwitch (geometry "double buffering") for efficient updates of RigGeometry & MorphGeometry 10 years ago
scrawl c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 10 years ago
scrawl de2c85e0f8 Port nifloader to the more efficient StateSetController 10 years ago
scrawl 5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 10 years ago
scrawl 987e923790 LightManager optimization 10 years ago
scrawl 61aaf0cf70 Attach light lists to the object base nodes instead of each renderable
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
10 years ago
scrawl c92592493e OpenMW: create a window and render the starting cell(s) 10 years ago
scrawl a0b43f426e Avoid setting DYNAMIC DataVariance on StateSets 10 years ago