Marc Zinnschlag
6f64b1b9db
cmake option to use system tinyxml instead of embedded one
2013-09-13 15:11:17 +02:00
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
scrawl
6dc216af3d
Fix a typo, caused occasional white spots on local map render
2013-08-09 21:29:43 +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
14a2a26a56
Fullscreen resizing fix
2013-06-12 20:08:55 +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
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
scrawl
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
2013-05-22 21:01:05 +02:00
scrawl
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
2013-05-07 17:38:24 +02:00
scrawl
d6e9cb114e
Forgot to add directory
2013-05-04 23:12:05 +02:00
scrawl
062ff189a2
Merge branch 'master' into memory
2013-05-04 23:04:33 +02:00
Lukasz Gromanowski
6fbd940a2f
Fix warning issued by GCC 4.8 in oics/tinyxml.cpp
...
Fix warning issued by GCC 4.8 (and as far I remember 4.7 too)
about not supported "%lf" format string:
openmw/extern/oics/tinyxml.cpp: In member function ‘void TiXmlAttribute::SetDoubleValue(double)’:
openmw/extern/oics/tinyxml.cpp:1269:50: warning: ISO C++98 does not support the ‘%lf’ gnu_printf format [-Wformat=]
TIXML_SNPRINTF( buf, sizeof(buf), "%lf", _value);
^
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-05-04 07:53:03 +02:00
scrawl
75dcf52552
Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)
2013-05-03 13:55:57 +02:00
scrawl
23b477a938
Fix normal maps with spaces in filename not getting loaded
2013-04-12 04:36:28 +02:00
scrawl
5625d73d84
Bump texture support
2013-04-03 17:16:34 +02:00
scrawl
7f8d659f3c
Fix transparency sorting
2013-03-05 17:09:20 +01:00
scrawl
62c711d709
Small change to delete microcode cache more aggressively.
2013-02-11 02:28:02 +01:00
scrawl
814969dcae
Cache integrity check uses relative paths, so that changing the build folder works without reset
2013-02-07 02:23:41 +01:00
scrawl
a7d910614f
extern/shiny update: made caching more robust
2013-02-04 18:04:09 +01:00
scrawl
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
2013-02-04 18:03:03 +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
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
