mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:19:55 +00:00
Code Issues Releases Wiki Activity
19594 commits 38 branches 54 tags 122 MiB
Commit graph

420 commits

Author SHA1 Message Date
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
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.
 2014-05-27 13:12:27 -04:00
scrawl
f476aa4ade Remove MyGUI color codes when copying to system clipboard 2014-05-27 17:07:14 +02:00
Digmaster
2b3b11d848 Give access to the main menu when at a choice in dialogue 2014-05-27 05:33:25 -04:00
Digmaster
e0356cf89d Added support to close modal windows with Esc 2014-05-27 03:00:31 -04:00
Digmaster
e3e51324a4 Esc button exits all non-modal GUI windows 2014-05-26 23:13:37 -04:00
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. :)
 2014-05-22 20:50:00 +02:00
scrawl
d5dd864404 Fixes #1236: Disable all controls while playing movie 2014-04-26 14:33:45 +02:00
scrawl
f05606657c Correctly insert pasted text at cursor position 2014-04-26 05:01:26 +02:00
Marc Zinnschlag
1f6ed584c2 Merge remote-tracking branch 'digmaster/master' 
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
 2014-04-25 08:39:40 +02:00
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.
 2014-04-24 22:47:45 -04:00
Marc Zinnschlag
760c8c7214 removed a redundant include 2014-04-24 09:56:51 +02:00
Thomas
5b681e2199 Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait. 2014-04-24 03:14:47 -04:00
Thomas
05b21c92af Moved quick save into statemanager class. Kept loader as is as it's rather specalized. 2014-04-24 03:06:36 -04:00
Thomas
a598060071 Added autosave on rest, as well as an option in the settings menu 2014-04-23 23:12:30 -04:00
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) 2014-04-23 21:39:25 -04:00
Thomas
49620968b9 Disallowed quicksave/load in character creation 2014-04-23 21:21:11 -04:00
Thomas
e873135da7 Missed a debug message 2014-04-23 21:04:52 -04:00
Thomas
f90810223a Added quicksave and quickload 2014-04-23 21:02:09 -04:00
Thomas Luppi
d6f1f129eb Forgot to capitalize something. whooooops 
dat y do
 2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205 Gets default keybindings from scancode, not keyvalue. 
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
 2014-04-20 00:34:58 -04:00
scrawl
f2cd37edd0 Play company logo movie 2014-03-27 19:51:48 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
scrawl
6eaa7553f8 Fixes #1181: Enable controls when loading a savegame 2014-03-09 03:34:49 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles 
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
 2014-03-08 01:31:27 +01:00
Marc Zinnschlag
f9d2fde783 Merge branch 'openmw-29' 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-03-04 09:34:38 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
Emanuel Guevel
3d8ca02479 Fix breaking of enchanted items casting 2014-02-15 17:39:57 +01:00
Emanuel Guevel
a3eea4f6b6 Do not allow spellcasting stance without spell selected 2014-02-11 16:34:51 +01:00
scrawl
4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 2014-02-05 12:15:49 +01:00
scrawl
1deb0a7cdf Savegame dialog: Set key focus to editbox 2014-02-01 18:42:01 +01:00
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
 2014-02-01 18:16:32 +01:00
scrawl
39d86a9468 Improvements to smooth NPC steering 2014-01-31 04:43:29 +01:00
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
 2014-01-24 18:28:35 +01:00
mrcheko
87e83a92f8 refactoring of setting an attack type 2014-01-23 23:14:20 +02:00
scrawl
d01f89b153 Rewrite some awful code 2014-01-11 00:24:21 +01:00
scrawl
d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 2014-01-09 00:06:24 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
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
 2014-01-06 00:23:17 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
scrawl
1b96c5d266 Console improvements: Show scrollbar, allow copying text from the history 2014-01-04 05:13:53 +01:00
scrawl
09d491d1ba Move a piece of functionality to its appropriate place 2014-01-04 01:13:19 +01:00
scrawl
c0fbcf413f Use the playermagic and playerfighting control switches 2014-01-03 22:44:35 +01:00
scrawl
899214a906 Use fVanityDelay 2014-01-02 00:13:23 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
d09a86e208 Issue #1018: Don't allow view mode switching while performing an action 2013-12-27 00:36:06 +01:00
mrcheko
f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 2013-12-16 15:40:47 +02:00
mrcheko
fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 2013-12-15 18:50:25 +02:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
7f735c2c4c Release and show the cursor when focus lost 2013-11-20 16:07:14 +01:00
Marc Zinnschlag
a19242b4ec fixed expression in if statement 2013-11-16 19:31:35 +01:00
vorenon
b2d2a3dd17 Closing message boxes with numpad enter 2013-11-16 19:15:47 +00:00
Marc Zinnschlag
f19973450f moved exit game flag from Environment to StateManager 2013-11-16 11:07:23 +01:00
scrawl
d619d0fa25 Don't grab the cursor while the console is opened 2013-11-15 03:39:25 +01:00
scrawl
c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 2013-11-05 03:02:28 +01:00
scrawl
4f35fd8184 Removed a workaround from Renderer, some cleanup 2013-10-30 13:05:28 +01:00
scrawl
3a3f2a37c8 Add cut, copy & paste of text 2013-10-17 12:47:49 +02:00
Marc Zinnschlag
0f1c4cb00e cleanup 2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c Switched to using proper enums as opposed to ints. 2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047 Replaced tabs with spaces. 2013-09-23 07:36:50 -04:00
Berulacks
c423479f20 Fixed bug #887 2013-09-23 07:31:14 -04:00
Xethik
58bb0b8773 Bug #907 
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
 2013-09-20 21:26:12 -04:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
Chris Robinson
eab4e09566 Handle the pick/probe in the character controller 2013-08-06 19:48:59 -07:00
Emanuel Guevel
71da2f0a12 Do not allow magic/combat stance unless magic/inventory window are accessible 2013-08-04 00:21:27 +02:00
scrawl
f1f6336a4a Fixed screenshot keybinding, and make it bindable 2013-07-31 20:24:44 +02:00
Sebastian Wick
7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 2013-07-29 18:27:00 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Marc Zinnschlag
ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' 
Conflicts:
	apps/openmw/mwrender/animation.cpp
 2013-07-23 09:12:23 +02:00
Kolzi
1b7966ca27 Can zoom in and out in third person view. 2013-07-19 16:12:01 +02:00
scrawl
91e95e1404 Use the correct slash, chop or thrust animation 2013-07-16 23:32:41 +02:00
scrawl
9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 2013-07-16 16:25:41 +02:00
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
 2013-07-16 11:40:19 +01:00
gus
f7b711aabe bugfix 2013-07-15 16:37:32 +01:00
vorenon
66eb82b363 oops again 2013-07-15 02:26:22 +02:00
vorenon
33779ae23c oops 2013-07-15 02:23:18 +02:00
vorenon
d4739a451a added ability to close container windows with the activation key 2013-07-15 02:18:24 +02:00
gus
3947f44aa3 Porting old work 2013-07-13 22:24:52 +01:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
scrawl
4fd7891d2c Fix a message box issue 2013-06-16 20:26:27 +02:00
scrawl
b16c92c2f5 Better handle SDL_TEXTINPUT events 2013-06-16 19:43:59 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
scrawl
5252ffa104 More cleanup 2013-06-15 17:06:27 +02:00
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 2013-06-15 15:33:47 +02:00
scrawl
9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05 Moved window resize messages to sdlinputwrapper 2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58 Removed obsolete OIS workaround 2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846 We don't need Carbon on OS X anymore 2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676 Fix wrong indenting from my last commits. 2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 2013-06-13 18:04:38 +02:00
scrawl
0880805559 Minor cleanup 2013-06-13 12:13:40 +02:00
Rohit Nirmal
aac3ada14b Use mousewheel to turn book pages. 2013-06-13 00:50:07 -05:00
scrawl
705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6 Fix mouse wheel triggering a click event in mygui 2013-06-12 15:10:04 +02:00
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
 2013-06-12 12:34:33 +02:00
Rohit Nirmal
b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 2013-06-10 19:42:38 -05:00
Rohit Nirmal
4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 2013-06-09 23:27:47 -05:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
Chris Robinson
6c6200efef Merge remote-tracking branch 'zini/master' into animations 2013-05-15 16:34:51 -07:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Chris Robinson
90e29c83c0 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-05-06 19:17:39 -07:00
Glorf
517dfb4d75 Bugfix #732 part 2 2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
Chris Robinson
a120653c38 Implement handling weapon states 2013-05-01 10:19:16 -07:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
scrawl
5ff098b8fb Fix quick keys being triggered when in UI mode 2013-04-29 11:55:30 +02:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Tom Mason
6ca2b1af74 fix for turning animations playing when in vanity mode 2013-04-09 19:24:41 +01:00
Glorf
2f52df22ce Bugfix #553 2013-04-08 19:00:38 +02:00
Tom Mason
822866b5ae fixed autorun 2013-04-07 18:04:30 +01:00
Chris Robinson
f976eb5bd8 Improve mouselook scaling 2013-03-31 17:32:39 -07:00
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. 2013-03-31 15:50:48 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
Chris Robinson
13c098266c Pass player rotation through the movement settings 2013-03-31 02:57:22 -07:00