Commit Graph

420 Commits (d4d46fc60256177968c96e9653ced2f83652338e)

Author SHA1 Message Date
scrawl 7eb48ea83b Don't wrap mouse to window bounds when the gamepad axis did not move and fix off-by-one error 8 years ago
scrawl 2776727794 Allow gamepad and mouse/keyboard to be used at the same time (Fixes #3093) 8 years ago
scrawl e7b6ea4e3f Add cycle weapon/spell actions to the list of controller actions (Fixes #3613) 8 years ago
MiroslavR 301dd77efb Save controls state (Fixes #3598) 8 years ago
scrawl f417d7780a Fix the enemy nearby check (Bug #3423) 9 years ago
scrawl 7a962fd8c5 Properly escape the keybinding labels (Bug #3281)
A certain key name ("#") was being interpreted as a MyGUI markup code.
9 years ago
scrawl 53334d08a2 Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100) 9 years ago
scrawl a8c287c831 Print detected game controllers to the log file 9 years ago
scrawl 3fe38e3556 Remove unused setting 9 years ago
scrawl 0ec56d321a Remove unneeded using namespace 9 years ago
scrawl 05498ad592 Refactor: InputManager no longer depends on Engine 9 years ago
scrawl a47617c21f Fix tab indentations in apps/ and components/ 9 years ago
scrawl d11952c48a Stop rendering when the window is minimized 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
Rohit Nirmal d9b11f963a Gamepad: Slow down simulated mouse with right trigger
in menus.
10 years ago
scrawl 6691891bee Include cleanup 10 years ago
scrawl a1432b0255 Move attackingOrSpell flag to the CharacterController 10 years ago
scrawl 15453e3d90 Use MyGUI::UString for unicode conversion 10 years ago
scrawl da24e298ee Fix -Wreorder warnings 10 years ago
scrawl 49df07ea7f Implement UI scaling factor 10 years ago
scrawl 5442bf23a6 Apply video mode & gamma setting changes 10 years ago
scrawl 39fb46601a Readded input & event handling 10 years ago
scrawl c31b416ba1 Move physicssystem to a new mwphysics module 10 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
10 years ago
scrawl 283b252142 Stub InputManager 10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
Marc Zinnschlag 056bc66c6c Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 37a6d7da76 WindowManager refactoring 10 years ago
Ivy Foster 4f100e6870 Fix rapid toggling when holding sneak button. 10 years ago
Ivy Foster ba7fc8609c Add toggle sneak option; fix bug #2119
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.

Outstanding issues:
    - In toggle sneak mode, holding the Sneak button causes
      rapid, repeated toggling.
    - The button in the settings menu doesn't do anything.
10 years ago
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
10 years ago
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
10 years ago
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
dteviot 45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
10 years ago
dteviot 407cd50890 fixed warning C4099:
type name first seen using 'class' now seen using 'struct'
10 years ago
scrawl a8cb4e807b Warning fix 10 years ago
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
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 a192836582 (hopefully) correct gamecontrollerdb.txt behavior 10 years ago
Digmaster 796b4b01b0 Fix activating every frame when action is bound to a trigger 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 3ce22d31d8 Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up 10 years ago
scrawl 579f5d232f Move interactive messageBox to separate function 10 years ago
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.
10 years ago
scrawl 935cccf974 Implement weapon/spell cycling hotkeys (Fixes #1024) 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 073a2f0674 Fixed issue with walking 10 years ago
Digmaster c37881ead1 Joystick Support 10 years ago
scrawl 14ae6d28b0 Fix being able to jump when overencumbered 10 years ago
scrawl 6960cac5eb Disable third person zoom feature by default due to usability issues (Fixes #2129) 10 years ago
scrawl ea8f617508 Add missing player control enabled checks (Fixes #2152) 10 years ago
scrawl 414f7ea02c Ignore mouse movements during video playback (Fixes #2139) 10 years ago
scrawl fe4d74a6cb Fix not being able to move with 0/0 encumbrance (Fixes #1979) 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 ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 10 years ago
scrawl 319f4e0547 Bind to scancodes instead of keycodes 10 years ago
scrawl dc1e8d4e22 Don't trigger any mouse button bindings while in the settings menu 10 years ago
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) 10 years ago
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.
10 years ago
scrawl 17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 11 years ago
scrawl dd77954512 Don't pass key to input binder if it was consumed by text editor (Fixes #1845) 11 years ago
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.
11 years ago
scrawl c4ae07f48a Remove partially broken sound pausing in main menu (Fixes #1707) 11 years ago
scrawl ef78ae22f6 Loosen mode restrictions on opening Journal window (Fixes #1570) 11 years ago
scrawl 8b404ee255 Fix not being able to exit dialogue using Escape when a Goodbye link appears 11 years ago
scrawl d91d599269 Disable quickload when in modal dialog (Fixes #1641) 11 years ago
scrawl 9a26cf22e6 Implement toggleMenus 11 years ago
scrawl 666dbc6ddc Disable QuickKeysMenu in werewolf form 11 years ago
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.
11 years ago
scrawl 0f31e31088 Allow opening journal during dialogue (Fixes #1460) 11 years ago
scrawl 10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
scrawl 4119038f1d Remove an old workaround (Fixes #1458) 11 years ago
scrawl a3752da79f Store Always Run control state in settings 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 1d3a220d94 Added A_Use command to player controls. 11 years ago
Fil Krynicki 97caa1f8a4 Alternative fix strategy by checking for binding state 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
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!
11 years ago
Marc Zinnschlag 2f56b11530 Merge remote-tracking branch 'digmaster/master' 11 years ago
Digmaster 03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 11 years ago
Digmaster 060a50f94a Fixed issue with QuickKeyMenu and ItemSelectionDialog 11 years ago
Fil Krynicki 91f4967614 Fix for bug 1196.
This bug would cause the player to jump when jump was assigned to
Space and they closed a dialog with Space. I tested vanilla
MW for behaviour and found that Jump was the only basic input which
MW does not allow when closing dialogs (i.e. if Space is assigned to
move forward, MW will move you forward after closing the dialog).

There were two reasons for the bug:
1) OpenMW GUI does not consume UI events
2) Jump occurs so long as key is down (not only on first key down)

To minimally fix the bug, I made it so that keypress events can be
consumed by the GUI and not passed along to the player control
input manager (1). However, if the player holds space, they will still
jump (as the subsequent key held events will be captured and cause
a jump).

Unfortunately, there is no idiomatic way that I could find in the
OpenMW input manager to perform events only on key down. Instead,
I introduced a variable which tracks whether the jump key has been
pressed for the first time within the current frame (2).

Note: I was initially concerned that limiting the jump event to
KeyDown and not Key Hold would cause issues with swimming,
levitating, or variable height jumping. However, after a bunch
of testing in vanilla MW and exploration of the OpenMW codebase
I could find nothing suggesting the need to capture the jump
key being held.
11 years ago
scrawl f476aa4ade Remove MyGUI color codes when copying to system clipboard 11 years ago
Digmaster 2b3b11d848 Give access to the main menu when at a choice in dialogue 11 years ago
Digmaster e0356cf89d Added support to close modal windows with Esc 11 years ago
Digmaster e3e51324a4 Esc button exits all non-modal GUI windows 11 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
scrawl d5dd864404 Fixes #1236: Disable all controls while playing movie 11 years ago
scrawl f05606657c Correctly insert pasted text at cursor position 11 years ago
Marc Zinnschlag 1f6ed584c2 Merge remote-tracking branch 'digmaster/master'
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
11 years ago
Thomas f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
11 years ago
Marc Zinnschlag 760c8c7214 removed a redundant include 11 years ago
Thomas 5b681e2199 Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait. 11 years ago
Thomas 05b21c92af Moved quick save into statemanager class. Kept loader as is as it's rather specalized. 11 years ago
Thomas a598060071 Added autosave on rest, as well as an option in the settings menu 11 years ago
Thomas 682c395488 Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts) 11 years ago