Commit graph

9714 commits

Author SHA1 Message Date
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
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
Marc Zinnschlag
65161c3e24 Merge remote-tracking branch 'sirherrbatka/less-signals' 2014-04-16 10:22:20 +02:00
Marc Zinnschlag
ce33912980 Merge remote-tracking branch 'sirherrbatka/AngryFix' 2014-04-16 10:21:59 +02:00
Marc Zinnschlag
a7cece3d30 do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit 2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c removed signals 2014-04-15 20:39:19 +02:00
Marek Kochanowicz
fc1837e2ed fixed bug: regions can be dragged
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
2014-04-15 19:26:43 +02:00
Marc Zinnschlag
30d5040f2f Merge remote-tracking branch 'cc9cii/Bug-No-1260' 2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f Avoid hard coding "thief.dds" string. 2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9 Save state is handled correctly now. 2014-04-14 18:11:04 -04:00
cc9cii
89be1069a7 Bug #1260: show thief.dds image for a custom class level up menu 2014-04-14 18:31:46 +10:00
Marc Zinnschlag
71068ae3ad Merge branch 'regionmap' 2014-04-13 17:24:08 +02:00
Marc Zinnschlag
d188e68227 added f-type hint to TableSubView 2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a added 'view in table' action to region map 2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd added view action to region map 2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833 added set/unset region actions to region map 2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f added create cell menu item to regionmap 2014-04-13 14:17:18 +02:00
Marc Zinnschlag
19b31c4146 always use the cell ID instead of the exterior coordinate fields from the original cell struct 2014-04-13 14:16:59 +02:00
Marc Zinnschlag
decd4270d9 added CellId role to RegionMap model 2014-04-13 13:59:27 +02:00
Marc Zinnschlag
e520dcd62d Merge remote-tracking branch 'cc9cii/Bug-No-1271' 2014-04-13 13:24:09 +02:00
Marc Zinnschlag
300eb6f444 make FNAM sub-record optional for all record types 2014-04-13 13:23:50 +02:00
cc9cii
966ed46870 Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status. 2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr). 2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42 Fix falling animation where vec.z is set to zero. 2014-04-13 11:34:59 +10:00
cc9cii
0bef754873 Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271. 2014-04-13 08:46:02 +10:00
Marc Zinnschlag
2f63eb7ca4 added missing edit lock for record reordering 2014-04-12 20:07:09 +02:00
cc9cii
d2a41167d0 Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075 2014-04-11 21:24:00 +10:00
Marc Zinnschlag
d0ea23431c replaced CellIndex typedef with new CellCoordinates class 2014-04-11 10:06:16 +02:00
Marc Zinnschlag
0516d95253 added context menu with selection functions to region map 2014-04-10 22:12:09 +02:00
Marc Zinnschlag
7f12733463 Merge remote-tracking branch 'potatoesmaster/1071' 2014-04-08 21:08:59 +02:00
Emanuel Guevel
09bd0324c9 Fail properly when a content file is not found 2014-04-08 20:19:09 +02:00
Marc Zinnschlag
d205d5f0af Merge branch 'cellselect' 2014-04-08 09:58:00 +02:00
Marc Zinnschlag
e0550ba336 allow multiple cell coordinates in c-type hint for scene subviews 2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883 replaced rectangular cell selection with a CellSelection object 2014-04-07 14:16:02 +02:00
Marc Zinnschlag
67965ec10c added CellCoordinates and CellSelection classes 2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4 removed grid button (discarding the first attempt at a cell selector) 2014-04-07 10:21:26 +02:00
Marc Zinnschlag
03b3487f1b minor cleanup 2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3 Merge remote-tracking branch 'cc9cii/PathFinder-split' 2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371 Fix visual glitch happening when closing inventory while sneaking
(bug #1255)
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0 Merge remote-tracking branch 'gus/AIFix2' 2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f States are saved. Crime is reacted to.
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Marc Zinnschlag
0fe67b586a increased scene toolbar button size 2014-04-05 13:16:13 +02:00
Jeffrey Haines
df5cbe5dec Minor changes 2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7 One more comment fix. 2014-04-04 18:17:42 +11:00
cc9cii
f59226265a Remove redundant parameter from aStarSearch. Also update some comments. 2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a Removed witnesses and minor changes 2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933 Remove logging. 2014-04-04 06:16:26 +11:00