Commit Graph

55 Commits (a6467c9c47a08a18f9bc5a3bc4f9581f3409eb17)

Author SHA1 Message Date
Roman Proskuryakov 28c63aea72 Uses FindTinyXML to find package 9 years ago
Bret Curtis 2c90b0b78d fix a few spelling mistakes 9 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
Marc Zinnschlag d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 39fb46601a Readded input & event handling 10 years ago
k1ll 96d9afec38 More header case fixes 10 years ago
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 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
Digmaster 1e4a845b6f Minor code cleanup 10 years ago
scrawl 6b2df95167 Fix for some coverity defects 10 years ago
scrawl f931ba2efc Fix some static analysis issues (coverity) 10 years ago
Digmaster e076e8a9bd Fixed error when downgrading openmw versions 10 years ago
Digmaster bb6ed06a4e read gamecontrollerdb file location from settings file 10 years ago
Digmaster a7a211860a Fixed binding controls to A on joystick 10 years ago
Digmaster ad54e09593 Inital value for joysticks is 0.5 10 years ago
Digmaster c37881ead1 Joystick Support 10 years ago
scrawl f9b6cc468d Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960) 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
scrawl 319f4e0547 Bind to scancodes instead of keycodes 10 years ago
scrawl 24e5a90bab Fix crash when input settings contain extra channels 10 years ago
Marc Zinnschlag 2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 11 years ago
cc9cii 36e380c6be Merge remote-tracking branch 'upstream/master' 11 years ago
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.
11 years ago
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.
11 years ago
Fil Krynicki 97caa1f8a4 Alternative fix strategy by checking for binding state 11 years ago
cc9cii fd758bacd3 Remove #ifdef guards. 11 years ago
cc9cii 76bf774485 Small changes for compiling with MSVC 2013. 11 years ago
Fil Krynicki bbb7ceab43 Merge branch 'master' into bug1196jumpdialog
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
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.
11 years ago
scrawl afc1fa49f6 Use mouse release instead of press for binding actions
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
11 years ago
greye 663d5c314e be more verbose on change reasons 11 years ago
greye 1b7ed98325 fix typos, reset memory before using 11 years ago
greye a46662043a tinyxml convert path to UTF-16 on Windows 11 years ago
cc9cii 5539c75ef0 Typo fix to avoid divide by zero. 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
Lukasz Gromanowski bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag 6f64b1b9db cmake option to use system tinyxml instead of embedded one 11 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl 14a2a26a56 Fullscreen resizing fix 12 years ago
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
12 years ago
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>
12 years ago
Jordan Milne b6ec64485c fix includes for Windows 12 years ago
Jordan Milne a030c03513 support the printscreen button properly 12 years ago
Jordan Milne ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 12 years ago
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
12 years ago
Jordan Milne 00a2a5c358 remove some more of my mess 12 years ago