mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-04 09:45:33 +00:00
Code Issues Releases Wiki Activity
14507 commits 38 branches 54 tags 122 MiB
Commit graph

2535 commits

Author SHA1 Message Date
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
scrawl
668d365ef9 MorphGeometry copy fix 2015-05-29 21:47:43 +02:00
scrawl
261ed1f4e5 Revert "Enable culling for particle emitters & programs" 
This reverts commit 8b206e0aed.
 2015-05-29 20:31:26 +02:00
scrawl
1cdb440b77 glReadPixels *is* available on OpenGL ES 2015-05-28 17:23:06 +02:00
scrawl
9ee63dc3f4 Change stats viewer key to f3 2015-05-28 16:28:48 +02:00
scrawl
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
scrawl
fe439e53ff Bullet include cleanup 2015-05-27 22:32:11 +02:00
cc9cii
5fd107a95c Fix crash with array out of bounds when refNum index is incorrect. 2015-05-27 10:19:26 +10:00
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
5de24552a8 Leak fix 2015-05-26 19:12:29 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
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
 2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
7882c3d7f0 Fix incorrect rotation for meshes with BoneOffset 2015-05-20 04:09:21 +02:00
scrawl
8d033f0558 Fix UpdateRigBounds not being copied properly 2015-05-20 03:12:42 +02:00
scrawl
8b768f4377 Minor fix for behaviour with non-existing LightManager 2015-05-18 21:06:42 +02:00
scrawl
314c1161ae Minor addition to reading display 2015-05-18 21:05:17 +02:00
scrawl
99eb78fc19 Fix $DISPLAY not being accounted for in cursor decompression context 2015-05-17 22:16:14 +02:00
scrawl
737c2114dc Change viewer stats keybinding to F9 2015-05-15 19:43:48 +02:00
scrawl
49df07ea7f Implement UI scaling factor 2015-05-15 00:41:21 +02:00
scrawl
24bb2e152c Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6 Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
scrawl
b6cb73e6e8 Fix deep copying of controllers 
This fixes the cell loading crash.
 2015-05-14 15:07:58 +02:00
scrawl
a18663c8b3 Improve MyGUI texture updates 2015-05-14 01:26:10 +02:00
scrawl
5dd1b2ae86 Readded HW cursor rotation 2015-05-14 01:06:33 +02:00
scrawl
c775cbbbaa Silence an annoying message 2015-05-14 00:40:51 +02:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef Create the GraphicsWindowSDL2 directly 2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0 Readded window icon 2015-05-13 15:03:21 +02:00
cc9cii
7f12fc4770 Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank(). 2015-05-13 13:39:04 +10:00
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.
 2015-05-13 02:53:09 +02:00
scrawl
82316105de BulletShapeManager kf loading fix 2015-05-12 16:49:53 +02:00
scrawl
65f0195c71 Readded animated collision shape support 2015-05-12 16:26:11 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
Marc Zinnschlag
107bf818e7 Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83" 
This reverts commit 27751db99a.

Conflicts:

	libs/openengine/bullet/physic.cpp
 2015-05-10 13:35:21 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
fe15f31f3e Remove strings.h wrapper 2015-05-10 00:36:04 +02:00
scrawl
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
scrawl
48ffeab191 Remove old BulletShapeManager 2015-05-09 01:06:55 +02:00
scrawl
0da1e0e905 Add comment 2015-05-09 00:17:08 +02:00
scrawl
d432a3ed08 Fix MyGUI rendering not taking DataVariance of textures into account 2015-05-09 00:13:22 +02:00
scrawl
af7cbb2e3b Leak fix 2015-05-08 17:52:35 +02:00
scrawl
483dc9de45 Stop viewer threading before changing MyGUI textures 2015-05-07 23:17:47 +02:00
scrawl
604580d75d Move toMatrix to Nif::Node 2015-05-07 21:17:15 +02:00
scrawl
f760aebc92 Disable MyGUI VBOs due to crashes (will look into proper fix) 2015-05-05 17:55:38 +02:00
Marc Zinnschlag
0c27869089 Merge remote-tracking branch 'scrawl/bullet283' 2015-05-05 10:52:18 +02:00
scrawl
100d6e5fff Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance 2015-05-05 02:38:59 +02:00
scrawl
ee60df1e27 Split MyGUI rendering into Update, Cull and Draw stages 2015-05-04 22:17:28 +02:00
scrawl
27751db99a Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83 2015-05-04 16:23:33 +02:00
dteviot
b0c4be2316 Multi-select + context menu. (Fixes #2480) 
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
 2015-05-04 14:52:47 +12:00
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
 2015-05-04 02:41:50 +02:00
scrawl
a37a83eaea Use interleaved vertex data in MyGUI render manager, avoiding redundant copies 2015-05-03 22:15:53 +02:00
scrawl
5a759f8b0d GUI cleanup fix 2015-05-03 18:35:29 +02:00
scrawl
140e67036c Flip non-dds textures vertically 
Fixes the up-side down loading screens.
 2015-05-03 17:10:50 +02:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
scrawl
1a5407af98 Reduce texture memory usage in OpenMW 2015-05-02 19:36:36 +02:00
scrawl
dc9b27acfe Create manual GUI textures 2015-05-02 18:06:54 +02:00
scrawl
1b78acc2c0 Remove manual allocation for images 2015-05-02 18:06:17 +02:00
scrawl
cac288d5be Remove OgreInit 2015-05-01 21:49:36 +02:00
scrawl
d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 2015-05-01 21:43:21 +02:00
scrawl
82c4d01b37 Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02:00
scrawl
9f74be8fcb Add back the custom MyGUI log facility for utf8 paths on windows 2015-05-01 02:04:24 +02:00
scrawl
6afb0e43ef Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69 2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7 Move MyGUI platform to components 2015-05-01 01:44:21 +02:00
scrawl
15bdb7db01 transformBoundingSphere optimization 2015-05-01 01:44:21 +02:00
scrawl
a98dc78cc5 Bounds fix 2015-04-30 15:46:16 +02:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
k1ll
8e094d6fa5 Add static bullet to components 2015-04-29 18:31:29 +02:00
k1ll
b194af4ab2 Add static qt to components 2015-04-29 18:31:29 +02:00
k1ll
a230050ec8 Boost tr1 unordered map does not work with mingw 2015-04-29 18:31:29 +02:00
k1ll
00b7712a59 Fix shlwapi include case and add the lib for linking when building for windows 2015-04-29 18:31:28 +02:00
Marc Zinnschlag
ba57a648db Merge remote-tracking branch 'rohit-n/reorder' 2015-04-29 12:09:55 +02:00
Marc Zinnschlag
607a16eb01 removed leftover ignoreRefNum argument 2015-04-29 12:09:30 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
Marc Zinnschlag
f1c0847897 Merge remote-tracking branch 'cc9cii/moveref' 2015-04-28 14:07:18 +02:00
Marc Zinnschlag
e69687b0f2 silenced a warning (potentially unintialised variable) 2015-04-28 14:06:52 +02:00
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.
 2015-04-27 15:41:34 +02:00
cc9cii
7673be6d0f Loading of moved refs complete. 2015-04-26 12:18:23 +10:00
scrawl
b4a06bd78d Improve skinning performance 2015-04-25 19:32:07 +02:00
cc9cii
e668b35b02 Fix typo. 2015-04-25 17:51:31 +10:00
cc9cii
dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 2015-04-25 17:20:02 +10:00
cc9cii
acb800b8f9 Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
scrawl
372a54bbc7 Dead code removal 2015-04-25 01:28:01 +02:00
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
 2015-04-25 06:52:53 +10:00
scrawl
09742d5b95 Animation playback works, no movement accumulation yet 2015-04-23 20:41:31 +02:00
scrawl
6fada6acf8 Remove tests for no longer existing code 2015-04-23 20:02:18 +02:00
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.
 2015-04-23 17:15:30 +02:00
scrawl
cd7808fc11 Cleanup in preparation for animation port 
Scrapped previous idea for multiple animation sources, better approach incoming.
 2015-04-22 23:16:08 +02:00
scrawl
148c041a43 Nif loader cleanup - forcing a skeleton is no longer needed 2015-04-22 19:16:49 +02:00
scrawl
1a19cd3607 Some cleanup 2015-04-22 19:08:56 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
04accb7652 Add LightController 2015-04-22 17:37:39 +02:00
scrawl
5fbcf8a859 Mesh filtering fix 2015-04-22 16:59:23 +02:00
scrawl
a254877abe Clone fix 2015-04-21 22:53:28 +02:00
scrawl
28643660d3 Change triangle indices to unsigned 2015-04-21 20:56:16 +02:00
scrawl
102eadf91c Add some comments 2015-04-21 20:42:50 +02:00
scrawl
10644544ab Dead code removal 2015-04-21 20:31:20 +02:00
scrawl
eaa4316ff8 Move skinning code to SceneUtil 2015-04-21 20:30:48 +02:00
scrawl
9246a668b9 Skeleton update fix 2015-04-21 20:22:32 +02:00
scrawl
bd88758962 Use the new skinning system in OpenMW 2015-04-21 18:54:03 +02:00
scrawl
111e3eb6db Slightly improve bounding box for skinned meshes 2015-04-21 18:29:28 +02:00