1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 10:19:55 +00:00
Commit graph

261 commits

Author SHA1 Message Date
scrawl
a8cb4e807b Warning fix 2015-03-03 11:24:23 +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
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0 Fix activating every frame when action is bound to a trigger 2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
3ce22d31d8 Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up 2015-01-13 05:37:44 +01:00
scrawl
579f5d232f Move interactive messageBox to separate function 2015-01-10 23:23:48 +01:00
scrawl
2ac23008f5 Remove an old workaround (Fixes #2263)
The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.
2015-01-10 00:07:55 +01:00
scrawl
935cccf974 Implement weapon/spell cycling hotkeys (Fixes #1024) 2014-12-15 16:23:08 +01:00
Digmaster
bb6ed06a4e read gamecontrollerdb file location from settings file 2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a Fixed binding controls to A on joystick 2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593 Inital value for joysticks is 0.5 2014-12-09 11:16:17 -06:00
Digmaster
073a2f0674 Fixed issue with walking 2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00
scrawl
14ae6d28b0 Fix being able to jump when overencumbered 2014-12-03 18:28:35 +01:00
scrawl
6960cac5eb Disable third person zoom feature by default due to usability issues (Fixes #2129) 2014-12-01 23:09:46 +01:00
scrawl
ea8f617508 Add missing player control enabled checks (Fixes #2152) 2014-11-28 15:54:38 +01:00
scrawl
414f7ea02c Ignore mouse movements during video playback (Fixes #2139) 2014-11-22 12:59:31 +01:00
scrawl
fe4d74a6cb Fix not being able to move with 0/0 encumbrance (Fixes #1979) 2014-10-05 15:52:33 +02:00
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) 2014-10-01 17:54:18 +02:00
scrawl
ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 2014-09-28 18:02:49 +02:00
scrawl
319f4e0547 Bind to scancodes instead of keycodes 2014-09-13 20:39:59 +02:00
scrawl
dc1e8d4e22 Don't trigger any mouse button bindings while in the settings menu 2014-09-13 20:39:59 +02:00
scrawl
ebab911e44 Add a hack to support binding the console to a printable key (Fixes #371) and change default console key to morrowind default (GRAVE) 2014-09-10 18:13:39 +02:00
scrawl
cf355d0fcb Change Always Run key default to Caps Lock, as in vanilla
A poor choice, but it's still what players coming from vanilla MW will expect.
2014-09-10 18:09:05 +02:00
scrawl
17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 2014-08-26 17:01:35 +02:00
scrawl
dd77954512 Don't pass key to input binder if it was consumed by text editor (Fixes #1845) 2014-08-26 03:06:30 +02:00
scrawl
dcddd9a07c Use MyGUI clipboard events for MyGUI 3.2.1+ (Fixes #1846)
Note that only <= 3.2.0 and >= 3.2.1 are supported, any SVN version between them might still exhibit duplicate text pasting.
2014-08-26 03:06:30 +02:00
scrawl
c4ae07f48a Remove partially broken sound pausing in main menu (Fixes #1707) 2014-08-16 02:01:39 +02:00
scrawl
ef78ae22f6 Loosen mode restrictions on opening Journal window (Fixes #1570) 2014-08-03 00:31:18 +02:00
scrawl
8b404ee255 Fix not being able to exit dialogue using Escape when a Goodbye link appears 2014-07-13 06:42:24 +02:00
scrawl
d91d599269 Disable quickload when in modal dialog (Fixes #1641) 2014-07-12 06:43:04 +02:00
scrawl
9a26cf22e6 Implement toggleMenus 2014-06-20 18:51:00 +02:00
scrawl
666dbc6ddc Disable QuickKeysMenu in werewolf form 2014-06-18 16:57:53 +02:00
scrawl
edccb62c1f Clear MyGUI's clipboard, since we don't want to use it (Fixes #1277)
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
2014-06-16 02:52:25 +02:00
scrawl
0f31e31088 Allow opening journal during dialogue (Fixes #1460) 2014-06-11 03:08:22 +02:00
scrawl
10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
2014-06-10 19:32:49 +02:00
scrawl
4119038f1d Remove an old workaround (Fixes #1458) 2014-06-10 14:46:44 +02:00
scrawl
a3752da79f Store Always Run control state in settings 2014-06-08 19:50:39 +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
1d3a220d94 Added A_Use command to player controls. 2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4 Alternative fix strategy by checking for binding state 2014-06-06 22:25:23 -04: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
Fil Krynicki
6cc6172779 Update in response to comments.
It turns out I was erroneous about problem (1) in my original commit
message. I thought that in an edge case the OpenMWGUI could both handle
the same event on the frame the GUI was closed. My test for
this was broken. So after brainstorming many possible unsatisfactory
solutions to this event handling, it's luckily not necessary!
2014-05-30 15:12:57 -04:00
Marc Zinnschlag
2f56b11530 Merge remote-tracking branch 'digmaster/master' 2014-05-29 18:57:16 +02:00
Digmaster
03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 2014-05-29 06:19:25 -04:00
Digmaster
060a50f94a Fixed issue with QuickKeyMenu and ItemSelectionDialog 2014-05-27 13:50:24 -04:00