mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity
11,070 Commits 17 Branches 65 Tags 492 MiB
c5fa7bf7c2
Commit Graph

32 Commits

Author SHA1 Message Date
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
cc9cii
36e380c6be Merge remote-tracking branch 'upstream/master' 2014-06-11 21:58:10 +01:00
scrawl
41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202 
Note: breaks compatibility with input.xml, so the filename was changed.
 2014-06-11 19:47:42 +02:00
Fil Krynicki
cd693b6d37 Fixed mouse closing containers, and injection/gui test order 
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.

Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.

And fixed a comment.
 2014-06-07 20:08:29 -04:00
Fil Krynicki
97caa1f8a4 Alternative fix strategy by checking for binding state 2014-06-06 22:25:23 -04: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
Fil Krynicki
bbb7ceab43 Merge branch 'master' into bug1196jumpdialog 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86 1196/1217 fix 
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
 2014-05-31 19:51:21 -04:00
scrawl
afc1fa49f6 Use mouse release instead of press for binding actions 
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
 2014-05-29 20:35:57 +02:00
greye
663d5c314e be more verbose on change reasons 2014-05-22 16:35:57 +04:00
greye
1b7ed98325 fix typos, reset memory before using 2014-05-20 12:41:45 +04:00
greye
a46662043a tinyxml convert path to UTF-16 on Windows 2014-05-20 09:17:32 +04:00
cc9cii
5539c75ef0 Typo fix to avoid divide by zero. 2014-03-05 22:12:59 +11: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
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
Marc Zinnschlag
6f64b1b9db cmake option to use system tinyxml instead of embedded one 2013-09-13 15:11:17 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
scrawl
14a2a26a56 Fullscreen resizing fix 2013-06-12 20:08:55 +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
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
Jordan Milne
b6ec64485c fix includes for Windows 2013-01-12 17:52:26 -04:00
Jordan Milne
a030c03513 support the printscreen button properly 2013-01-10 23:53:19 -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
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
Jordan Milne
884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 2013-01-08 06:19:05 -04:00
Marc Zinnschlag
21a8dc5ae7 silenced a completely pointless warning 2012-09-06 11:43:04 +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