Commit Graph

79 Commits (celladd)

Author SHA1 Message Date
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
10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
dteviot 45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
10 years ago
scrawl 0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 10 years ago
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
10 years ago
scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
10 years ago
Digmaster e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl 60f722b0a9 Treat the first mouse motion event as non-relative
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
10 years ago
scrawl f931ba2efc Fix some static analysis issues (coverity) 10 years ago
Digmaster c37881ead1 Joystick Support 10 years ago
sylar 964e42ab02 fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android 10 years ago
scrawl 7f95e1e6c2 Don't warn about SDL_CLIPBOARDUPDATE events 10 years ago
Corporama ccca6db865 Compile fixes for Linux 10 years ago
scrawl 3d47f2ceb0 Fix bad indentation 10 years ago
scrawl fc0465eeb0 Add missing header to CMakeLists 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 9757ad4031 fixed code 10 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 7cd2d4809c android-build 11 years ago
slothlife 9ea22324f7 Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
scrawl 162549b7af Remove a wrong comment 11 years ago
scrawl fcab53b3f7 Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified 11 years ago
cc9cii fd758bacd3 Remove #ifdef guards. 11 years ago
cc9cii 76bf774485 Small changes for compiling with MSVC 2013. 11 years ago
scrawl eff648e3ab Show unhandled SDL events in hexadecimal (easier to compare with the enum) 11 years ago
scrawl e7b9b6d87a Fix a confusing variable name 11 years ago
scrawl a3dffd5d57 Add some missing SDL to MyGUI key translations.
Most importantly to allow numpad enter as alternative to return key.
11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
scrawl 439018e706 Get rid of useless return values 11 years ago
scrawl c004fb778f Get rid of underscore defines. They are reserved by the standard. 11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
scrawl 7f735c2c4c Release and show the cursor when focus lost 11 years ago
Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
scrawl 2fb059e2fa Don't destroy the SDL window twice 11 years ago
Marc Zinnschlag b737d958e1 Merge remote-tracking branch 'kcat/master'
Conflicts:
	extern/sdl4ogre/cursormanager.hpp
11 years ago
Chris Robinson 1026e89810 Don't assume TexturePtr is a class 11 years ago
scrawl f12d5b728a Ogre 1.9 compatibility changes 12 years ago
scrawl d3d6dfbde8 Refactored loading screen
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
12 years ago
Nikolay Kasyanov e7500b22ba Fixed listener call issue spotted by @scrawl 12 years ago
Marc Zinnschlag b8cd3f3915 Merge remote-tracking branch 'corristo/master' 12 years ago
Nikolay Kasyanov 3849c8488c Use SDL_False instead of -1 12 years ago
Nikolay Kasyanov 4e9ef31375 Added missing(?) break 12 years ago
Nikolay Kasyanov 98216544de screw tabs 12 years ago
Marc Zinnschlag 130141ecac Merge remote-tracking branch 'corristo/master' 12 years ago
Nikolay Kasyanov e552eccaa4 Fixed endless message loop after trying to resize window on OS X 12 years ago