Marc Zinnschlag
130141ecac
Merge remote-tracking branch 'corristo/master'
2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
66608d5c92
Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre
2013-07-31 22:30:52 +04:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
Marc Zinnschlag
a547c2584e
Merge remote-tracking branch 'swick/sdl2fix'
2013-07-29 13:51:00 +02:00
Sebastian Wick
0d2b357bdf
use SDL_WINDOWPOS_CENTERED_DISPLAY and SDL_WINDOWPOS_UNDEFINED_DISPLAY instead of coordinates
2013-07-29 12:38:57 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
Emanuel Guevel
e7459a04b1
Fix always false comparison
...
SDL_GetWindowWMInfo result of type SDL_bool (SDL_TRUE = 1 or
SDL_FALSE = 0) should not be compared to -1.
2013-07-26 10:24:15 +02:00
scrawl
50a0d16f8f
Pass only the X11 window to Ogre, otherwise it would treat it as parentWindowHandle instead of externalWindowHandle. parentWindowHandle does not seem to play nice with SDL and occasionally crashes with a GLXBadDrawable error on startup.
2013-07-07 20:22:41 +02:00
Sebastian Wick
72b7e113cc
only apply in fullscreen
2013-07-01 04:08:26 +02:00
Sebastian Wick
8bdc9ff3ae
set position of the window for multiple monitors
2013-07-01 03:56:33 +02:00
Nikolay Kasyanov
de2868c0a3
Fixed 64-bit OS X build
2013-06-16 21:47:26 +04:00
scrawl
c71da1a2ff
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-16 15:01:09 +02:00
Nikolay Kasyanov
50e5aa8976
Custom rendering loop on OS X again. Prevents default Ogre message pump
...
from stealing input events.
2013-06-16 16:25:13 +04:00
scrawl
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
2013-06-15 15:33:47 +02:00
Nikolay Kasyanov
6abb7a18b0
SDL2 input: seems to work on OS X, has some input issues though
2013-06-15 14:40:18 +04:00
Nikolay Kasyanov
3fded2d8bf
Removed custom Carbon message pump
2013-06-15 13:55:09 +04:00
Nikolay Kasyanov
adf54cb735
SDL2 input: compilation fixed
2013-06-15 13:54:24 +04:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
2013-06-12 12:34:33 +02:00
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
Chris Robinson
7191f6ed2a
Start a Nif-style particle emitter
...
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
2013-04-13 14:36:24 -07:00
Chris Robinson
5b30677e41
Add the start of a custom gravity affector
2013-04-12 14:39:06 -07:00
Chris Robinson
81615c1ae5
Add a custom GrowFade particle affector
2013-04-06 00:18:36 -07:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
scrawl
f84db69ade
Remove the background window trick, which currently doesn't serve any purpose
2013-03-18 19:46:20 +01:00
scrawl
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
2013-02-05 20:26:13 +01:00
scrawl
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
2013-02-05 19:22:08 +01:00
scrawl
5334934612
Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.
2013-02-03 18:03:09 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
Jordan Milne
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
2013-01-13 23:38:46 -04:00
Jordan Milne
043e29c620
Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)
2013-01-13 21:32:45 -04:00
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
2013-01-12 08:23:15 +01:00
Jordan Milne
917bbc4e11
Create static and non-discardable textures with the right parameters (should fix Issue 443)
2013-01-05 00:26:33 -04:00
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-20 09:01:58 +02:00
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
2012-09-19 19:34:02 +02:00
scrawl
4829f47a4f
rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI
2012-09-18 21:04:43 +02:00
Marc Zinnschlag
b96485284a
removed some unneeded return values
2012-09-17 13:41:15 +02:00
Brother Brick
05c3936797
Merge remote-tracking branch 'upstream/master' into static
2012-09-17 11:57:38 +02:00
Brother Brick
ff54508633
during cleanup we now delete all plugins created
2012-09-17 11:57:29 +02:00
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
2012-09-15 00:57:29 +02:00
Brother Brick
44c644dd7b
make it statically compilable
2012-09-14 15:30:48 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
Nikolay Kasyanov
2beaa9d9ae
Workaround to allow main loop to know Ogre::Root's mQueuedEnd value
...
This change is needed because of changes in exit handling
2012-08-11 23:26:20 +04:00
Nikolay Kasyanov
ebf1fe415e
tiny fix
2012-08-11 01:11:52 +04:00
Nikolay Kasyanov
225530c690
implemented better main loop for OS X (carbon version). Input feels far less laggy
2012-08-10 23:32:10 +04:00
Marc Zinnschlag
c251fbdf23
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
libs/openengine/ogre/renderer.cpp
2012-08-02 14:57:35 +02:00
Nikolay Kasyanov
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
2012-07-31 01:01:00 +04:00
gugus
d37d0b1947
build fix for windows
2012-07-30 19:45:40 +02:00
Nikolay Kasyanov
e9d4195500
removed cout spam
2012-07-28 02:03:34 +04:00