mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Code Issues Releases Wiki Activity
13403 commits 38 branches 54 tags 122 MiB
Commit graph

79 commits

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
 2015-03-08 18:29:12 +13:00
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
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
scrawl
0fda1cdd53 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
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
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
 2015-02-27 22:21:02 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
scrawl
60f722b0a9 Treat the first mouse motion event as non-relative 
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
 2015-01-27 23:05:19 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00
sylar
964e42ab02 fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android 2014-10-11 21:21:23 +04:00
scrawl
7f95e1e6c2 Don't warn about SDL_CLIPBOARDUPDATE events 2014-09-02 15:16:26 +02:00
Corporama
ccca6db865 Compile fixes for Linux 2014-08-30 23:11:09 +02:00
scrawl
3d47f2ceb0 Fix bad indentation 2014-08-26 03:06:29 +02:00
scrawl
fc0465eeb0 Add missing header to CMakeLists 2014-08-09 15:42:54 +02:00
root
3cd98e5259 fix code v5 2014-09-06 02:02:39 +04:00
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
9757ad4031 fixed code 2014-09-04 23:27:14 +04:00
root
8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 2014-09-04 22:47:03 +04:00
root
7cd2d4809c android-build 2014-08-04 19:50:53 +04:00
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.
 2014-06-23 01:13:30 -05:00
scrawl
162549b7af Remove a wrong comment 2014-06-13 22:23:24 +02:00
scrawl
fcab53b3f7 Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified 2014-06-13 22:21:44 +02:00
cc9cii
fd758bacd3 Remove #ifdef guards. 2014-06-06 19:58:05 +10:00
cc9cii
76bf774485 Small changes for compiling with MSVC 2013. 2014-06-06 03:52:41 +10:00
scrawl
eff648e3ab Show unhandled SDL events in hexadecimal (easier to compare with the enum) 2014-05-03 16:16:27 +02:00
scrawl
e7b9b6d87a Fix a confusing variable name 2014-05-02 23:07:01 +02:00
scrawl
a3dffd5d57 Add some missing SDL to MyGUI key translations. 
Most importantly to allow numpad enter as alternative to return key.
 2014-04-18 14:13:29 +02:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
7f735c2c4c Release and show the cursor when focus lost 2013-11-20 16:07:14 +01:00
Marc Zinnschlag
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
scrawl
c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 2013-11-05 03:02:28 +01:00
scrawl
e6960d915a Add simple Ogre widget 2013-11-02 02:51:38 +01:00
scrawl
2fb059e2fa Don't destroy the SDL window twice 2013-10-13 18:20:55 +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
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