krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
6962 commits 35 branches 0 tags 65 MiB
Commit graph

170 commits

Author SHA1 Message Date
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
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
Jordan Milne
02ccb75894 Wrap the mouse to the window (except in debug mode) 
Grab the mouse when not in the main menu (except in debug mode)
Always hide the cursor when it's over the window
Allow warping the mouse around
Handle ^C properly
 2013-01-09 06:10:05 -04:00
Jordan Milne
f85679db93 Merge branch 'master' into sdl_input 2013-01-09 00:04:55 -04:00
Jordan Milne
00a2a5c358 remove some more of my mess 2013-01-08 21:04:36 -04:00
Jordan Milne
3b1d285cf3 fix compile errors, work with unmodified SDL 2013-01-08 21:01:58 -04:00
scrawl
e18cf452d4 Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012 2013-01-08 13:24:40 +01:00
Jordan Milne
884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 2013-01-08 06:19:05 -04:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
scrawl
693eeabeca shiny: fix GLSL texture units when shaders were disabled 2012-11-19 13:55:26 +01:00
scrawl
7b35b82833 adding shiny 2012-11-06 19:09:44 +01:00
scrawl
fb3ac6ad4a no submodule 2012-11-06 19:08:15 +01:00
scrawl
94f2937c8f missed a warning 2012-10-09 19:28:10 +02:00
scrawl
d97184cd4d fixing some warnings 2012-10-09 17:48:44 +02:00
scrawl
1f087645a7 update shiny to auto-delete the corresponding cache if a shader was edited 2012-10-01 17:02:14 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
b516813b28 fix a problem with older boost versions 2012-09-09 15:08:11 +02:00
Marc Zinnschlag
21a8dc5ae7 silenced a completely pointless warning 2012-09-06 11:43:04 +02:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
Michael Mc Donnell
d7572d815e Do not define OIS_DYNAMIC_LIB in ICSPrerequisites.h 
Fixes http://bugs.openmw.org/issues/381
 2012-08-28 15:32:12 -04:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
scrawl
6077965d27 fix the directx startup issue on windows 2012-07-26 23:09:46 +02:00
scrawl
d5384403f3 forgot something else 2012-07-23 15:46:18 +02:00