Commit Graph

420 Commits (d4d46fc60256177968c96e9653ced2f83652338e)

Author SHA1 Message Date
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
Thomas 49620968b9 Disallowed quicksave/load in character creation 11 years ago
Thomas e873135da7 Missed a debug message 11 years ago
Thomas f90810223a Added quicksave and quickload 11 years ago
Thomas Luppi d6f1f129eb Forgot to capitalize something. whooooops
dat y do
11 years ago
Thomas Luppi 95ef874205 Gets default keybindings from scancode, not keyvalue.
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
11 years ago
scrawl f2cd37edd0 Play company logo movie 11 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl 6eaa7553f8 Fixes #1181: Enable controls when loading a savegame 11 years ago
scrawl 12de0afb03 Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
11 years ago
Marc Zinnschlag f9d2fde783 Merge branch 'openmw-29'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
11 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
scrawl 439018e706 Get rid of useless return values 11 years ago
Emanuel Guevel 3d8ca02479 Fix breaking of enchanted items casting 11 years ago
Emanuel Guevel a3eea4f6b6 Do not allow spellcasting stance without spell selected 11 years ago
scrawl 4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 11 years ago
scrawl 1deb0a7cdf Savegame dialog: Set key focus to editbox 11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
scrawl 39d86a9468 Improvements to smooth NPC steering 11 years ago
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
mrcheko 87e83a92f8 refactoring of setting an attack type 11 years ago
scrawl d01f89b153 Rewrite some awful code 11 years ago
scrawl d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
11 years ago
scrawl c004fb778f Get rid of underscore defines. They are reserved by the standard. 11 years ago
scrawl 1b96c5d266 Console improvements: Show scrollbar, allow copying text from the history 11 years ago
scrawl 09d491d1ba Move a piece of functionality to its appropriate place 11 years ago
scrawl c0fbcf413f Use the playermagic and playerfighting control switches 11 years ago
scrawl 899214a906 Use fVanityDelay 11 years ago
scrawl 04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 11 years ago
scrawl d09a86e208 Issue #1018: Don't allow view mode switching while performing an action 11 years ago
mrcheko f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 11 years ago
mrcheko fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 11 years ago
Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
scrawl 7f735c2c4c Release and show the cursor when focus lost 11 years ago
Marc Zinnschlag a19242b4ec fixed expression in if statement 11 years ago
vorenon b2d2a3dd17 Closing message boxes with numpad enter 11 years ago
Marc Zinnschlag f19973450f moved exit game flag from Environment to StateManager 11 years ago
scrawl d619d0fa25 Don't grab the cursor while the console is opened 11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl 4f35fd8184 Removed a workaround from Renderer, some cleanup 11 years ago
scrawl 3a3f2a37c8 Add cut, copy & paste of text 11 years ago
Marc Zinnschlag 0f1c4cb00e cleanup 11 years ago
Berulacks 91d7291c0c Switched to using proper enums as opposed to ints. 11 years ago
Berulacks 0c518fb047 Replaced tabs with spaces. 11 years ago
Berulacks c423479f20 Fixed bug #887 11 years ago
Xethik 58bb0b8773 Bug #907
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
11 years ago
scrawl d3d6dfbde8 Refactored loading screen
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
12 years ago
Chris Robinson eab4e09566 Handle the pick/probe in the character controller 12 years ago
Emanuel Guevel 71da2f0a12 Do not allow magic/combat stance unless magic/inventory window are accessible 12 years ago
scrawl f1f6336a4a Fixed screenshot keybinding, and make it bindable 12 years ago
Sebastian Wick 7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 12 years ago
scrawl 6164e5bae6 Restored window resizing 12 years ago
Marc Zinnschlag ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2'
Conflicts:
	apps/openmw/mwrender/animation.cpp
12 years ago
Kolzi 1b7966ca27 Can zoom in and out in third person view. 12 years ago
scrawl 91e95e1404 Use the correct slash, chop or thrust animation 12 years ago
scrawl 9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 12 years ago
gus ee47e99dad Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
Conflicts:
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
12 years ago
gus f7b711aabe bugfix 12 years ago
vorenon 66eb82b363 oops again 12 years ago
vorenon 33779ae23c oops 12 years ago
vorenon d4739a451a added ability to close container windows with the activation key 12 years ago
gus 3947f44aa3 Porting old work 12 years ago
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
scrawl 4fd7891d2c Fix a message box issue 12 years ago
scrawl b16c92c2f5 Better handle SDL_TEXTINPUT events 12 years ago
scrawl 4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
scrawl 5252ffa104 More cleanup 12 years ago
scrawl f1ff9b69b3 Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches 12 years ago
scrawl 9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 12 years ago
scrawl 4fb32f7f05 Moved window resize messages to sdlinputwrapper 12 years ago
Nikolay Kasyanov 9807eacb58 Removed obsolete OIS workaround 12 years ago
Nikolay Kasyanov 5984a15846 We don't need Carbon on OS X anymore 12 years ago
Rohit Nirmal e5ddaaf676 Fix wrong indenting from my last commits. 12 years ago
Marc Zinnschlag df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 12 years ago
scrawl 0880805559 Minor cleanup 12 years ago
Rohit Nirmal aac3ada14b Use mousewheel to turn book pages. 12 years ago
scrawl 705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 12 years ago
scrawl cc077eaba6 Fix mouse wheel triggering a click event in mygui 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
Rohit Nirmal b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 12 years ago
Rohit Nirmal 4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 12 years ago
scrawl 7a2d1cd8ce Security skill 12 years ago
Chris Robinson 6c6200efef Merge remote-tracking branch 'zini/master' into animations 12 years ago
scrawl c41f119ba6 Added new game button 12 years ago
Chris Robinson 90e29c83c0 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwmechanics/character.cpp
12 years ago
Glorf 517dfb4d75 Bugfix #732 part 2 12 years ago
Glorf 57f22c77c0 Bugfix #732 part 1 12 years ago
Chris Robinson a120653c38 Implement handling weapon states 12 years ago
Chris Robinson 15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
12 years ago
scrawl 5ff098b8fb Fix quick keys being triggered when in UI mode 12 years ago
Chris Robinson 137017b325 Don't allow forcing vanity mode 12 years ago
Tom Mason 6ca2b1af74 fix for turning animations playing when in vanity mode 12 years ago
Glorf 2f52df22ce Bugfix #553 12 years ago
Tom Mason 822866b5ae fixed autorun 12 years ago
Chris Robinson f976eb5bd8 Improve mouselook scaling 12 years ago
scrawl 8fd961bbac Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't. 12 years ago
scrawl 1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 12 years ago
Chris Robinson 13c098266c Pass player rotation through the movement settings 12 years ago