Marc Zinnschlag
|
b737d958e1
|
Merge remote-tracking branch 'kcat/master'
Conflicts:
extern/sdl4ogre/cursormanager.hpp
|
2013-09-02 10:54:18 +02:00 |
|
Chris Robinson
|
1026e89810
|
Don't assume TexturePtr is a class
|
2013-08-29 17:41:20 -07:00 |
|
scrawl
|
f12d5b728a
|
Ogre 1.9 compatibility changes
|
2013-08-29 17:14:25 +02:00 |
|
scrawl
|
d3d6dfbde8
|
Refactored loading screen
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
|
2013-08-27 15:48:13 +02:00 |
|
Nikolay Kasyanov
|
e7500b22ba
|
Fixed listener call issue spotted by @scrawl
|
2013-08-01 07:16:00 -07:00 |
|
Marc Zinnschlag
|
b8cd3f3915
|
Merge remote-tracking branch 'corristo/master'
|
2013-08-01 09:06:34 +02:00 |
|
Nikolay Kasyanov
|
3849c8488c
|
Use SDL_False instead of -1
|
2013-08-01 10:54:53 +04:00 |
|
Nikolay Kasyanov
|
4e9ef31375
|
Added missing(?) break
|
2013-08-01 10:53:28 +04:00 |
|
Nikolay Kasyanov
|
98216544de
|
screw tabs
|
2013-08-01 10:52:50 +04:00 |
|
Marc Zinnschlag
|
130141ecac
|
Merge remote-tracking branch 'corristo/master'
|
2013-07-31 22:17:14 +02:00 |
|
Nikolay Kasyanov
|
e552eccaa4
|
Fixed endless message loop after trying to resize window on OS X
|
2013-07-31 23:26:46 +04: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 |
|
scrawl
|
6164e5bae6
|
Restored window resizing
|
2013-07-29 02:32:08 +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 |
|
scrawl
|
b16bc69479
|
Removed the no longer needed --debug switch
|
2013-06-16 20:39:40 +02:00 |
|
scrawl
|
b16c92c2f5
|
Better handle SDL_TEXTINPUT events
|
2013-06-16 19:43:59 +02:00 |
|
scrawl
|
03682184c6
|
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
|
2013-06-16 18:06:55 +02:00 |
|
scrawl
|
88acebf808
|
Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts
|
2013-06-16 17:10:30 +02:00 |
|
scrawl
|
5252ffa104
|
More cleanup
|
2013-06-15 17:06:27 +02:00 |
|
scrawl
|
6958940131
|
Ignore repeated keystrokes, except for text input events
|
2013-06-15 16:15:45 +02: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 |
|
scrawl
|
4fb32f7f05
|
Moved window resize messages to sdlinputwrapper
|
2013-06-15 13:22:29 +02: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 |
|
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 |
|
Jordan Milne
|
b6ec64485c
|
fix includes for Windows
|
2013-01-12 17:52:26 -04:00 |
|
Jordan Milne
|
eb08f407d3
|
Oops, remove resource leak in the input wrapper.
|
2013-01-12 15:38:22 -04:00 |
|
Jordan Milne
|
5a6589af01
|
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
|
2013-01-12 11:57:29 -04:00 |
|
scrawl
|
d71b583855
|
fix const cast, fix comment
|
2013-01-11 22:25:34 +01:00 |
|
Jordan Milne
|
651a654985
|
clean up our cursors during destruction
|
2013-01-11 10:09:26 -04:00 |
|
Jordan Milne
|
eeacb04fe2
|
Fully working hardware cursors (if you compile SDL2 with XCursor support)
|
2013-01-11 09:32:29 -04:00 |
|
Jordan Milne
|
f9b064d1bc
|
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
|
2013-01-11 08:27:59 -04:00 |
|
Jordan Milne
|
1117105039
|
fix compile error with boost includes
|
2013-01-11 00:37:04 -04:00 |
|
Jordan Milne
|
a030c03513
|
support the printscreen button properly
|
2013-01-10 23:53:19 -04:00 |
|
Jordan Milne
|
403b6756f5
|
remove dependency on boost::locale, use system mouse position in in-game menus
|
2013-01-10 23:29:51 -04:00 |
|
Jordan Milne
|
601d79ef3f
|
fix the mouse wheel in mygui
|
2013-01-10 17:59:49 -04:00 |
|
Jordan Milne
|
ed644259ce
|
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
|
2013-01-10 17:21:47 -04:00 |
|