Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
This commit is contained in:
scrawl 2015-02-27 22:21:02 +01:00
commit 97cc2522c0
504 changed files with 12728 additions and 6272 deletions
Download patch file Download diff file Expand all files Collapse all files

3
extern/oics/ICSInputControlSystem.cpp vendored
View file

@ -36,6 +36,9 @@ namespace ICS
, mDetectingBindingControl(NULL)
, mLog(log)
, mXmouseAxisBinded(false), mYmouseAxisBinded(false)
, mClientHeight(1)
, mClientWidth(1)
, mDetectingBindingDirection(Control::STOP)
{
ICS_LOG(" - Creating InputControlSystem - ");