dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings ...

Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp

2015-03-08 18:29:12 +13:00

..

CMakeLists.txt

Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs

2015-03-06 02:36:12 +01:00

cursormanager.hpp

Get rid of underscore defines. They are reserved by the standard.

2014-01-05 18:22:29 +01:00

events.h

Merge branch 'master' of https://github.com/OpenMW/openmw into joystick

2015-02-27 22:37:22 +01:00

imagerotate.cpp

Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs

2015-03-06 02:36:12 +01:00

imagerotate.hpp

Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs

2015-03-06 02:36:12 +01:00

OISCompat.h

Get rid of underscore defines. They are reserved by the standard.

2014-01-05 18:22:29 +01:00

osx_utils.h

Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre

2013-07-31 22:30:52 +04:00

osx_utils.mm

screw tabs

2013-08-01 10:52:50 +04:00

sdlcursormanager.cpp

Merge remote-tracking branch 'OpenMW/master' into FixWarnings

2015-03-08 18:29:12 +13:00

sdlcursormanager.hpp

Include cleanup

2015-02-05 04:18:42 +01:00

sdlinputwrapper.cpp

fixed MSVC 2013 warning C4800

2015-03-06 23:19:57 +13:00

sdlinputwrapper.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into joystick

2015-02-27 22:37:22 +01:00

sdlwindowhelper.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

sdlwindowhelper.hpp

Restored window resizing

2013-07-29 02:32:08 +02:00