Commit graph

1936 commits

Author SHA1 Message Date
scrawl
52a4456cf7 LoadingScreen update 2015-05-09 00:02:38 +02:00
scrawl
5db0639983 IncrementalCompileOperation tweak 2015-05-08 16:20:40 +02:00
scrawl
cf0fc43004 GUI shutdown fix 2015-05-08 15:10:17 +02:00
scrawl
483dc9de45 Stop viewer threading before changing MyGUI textures 2015-05-07 23:17:47 +02:00
scrawl
00f4f78717 Give a name to video streams for logging purposes 2015-05-07 23:08:52 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02: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
f0789352c6 Silence error message 2015-05-04 00:34:30 +02:00
scrawl
5a759f8b0d GUI cleanup fix 2015-05-03 18:35:29 +02:00
scrawl
9de575ad42 Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
2015-05-03 18:16:54 +02:00
scrawl
37e3118d21 FontLoader cleanup fix 2015-05-03 17:52:50 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
31ead3a9f4 Increase loading screen FPS
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
2015-05-03 17:04:21 +02:00
scrawl
351fd842fd Port loading screen 2015-05-03 16:58:05 +02:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
scrawl
d772da3720 Main menu background videos 2015-05-02 18:15:00 +02:00
scrawl
dc9b27acfe Create manual GUI textures 2015-05-02 18:06:54 +02:00
scrawl
8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 2015-05-02 17:48:24 +02:00
scrawl
82c4d01b37 Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02:00
scrawl
b0804734e5 Port VideoWidget 2015-05-01 03:03:44 +02:00
scrawl
223e3a53f5 Move OEngine::Gui::Layout to MWGui 2015-05-01 02:22:51 +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
db7fe1952d Move MyGUI texture to a separate file 2015-05-01 01:44:21 +02:00
scrawl
62847f0489 Use node masks to separate Scene and GUI 2015-05-01 01:44:21 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
a27446c8fb Remove unused headers 2015-04-28 16:02:29 +02:00
scrawl
7809caf9dc Dead code removal 2015-04-25 15:53:11 +02:00
scrawl
15164e20f7 Cleanup fix 2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
dteviot
fe69dc2863 Made LineInfo a struct, as requested by Scrawl. 2015-04-05 14:56:29 +12:00
dteviot
52de622e97 provide incremental update of SpellWindow (Fixes #2411)
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d removed redundant calls. 2015-04-03 13:45:13 +13:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
scrawl
5cb61fa01c Don't mark gold as stolen, adjust stolen tooltip (Fixes #2465) 2015-03-22 17:28:27 +01:00
scrawl
d573458896 Fix case sensitivity bug in default head/hair selection (Fixes #2453) 2015-03-16 17:42:15 +01:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f consolidate random number logic
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
scrawl
f603a68144 Allow binding Hand To Hand in quick keys menu (Fixes #2024) 2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2 CharacterCreation refactoring 2015-03-12 00:43:28 +01:00
scrawl
48ea6286fd Book/scroll window refactoring 2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00