Commit graph

10295 commits

Author SHA1 Message Date
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
Rohit Nirmal
4f4a37896e Check if player's CellStore is non-NULL before configuring fog.
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
2014-05-30 22:37:13 -05: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
ecf3d52b46 Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader' 2014-05-30 12:07:16 +02:00
Marc Zinnschlag
f5e587f566 Merge remote-tracking branch 'puppykevin/master' 2014-05-30 11:42:19 +02:00
cc9cii
11ce093a9e Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284. 2014-05-30 18:46:18 +10:00
Marc Zinnschlag
be7f344eca Merge branch 'refs'
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548 silenced two warnings 2014-05-30 10:18:05 +02:00
Marc Zinnschlag
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
b81c7d05c6 Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless)
Can still be used by editing the config file, however.
2014-05-29 23:16:36 +02:00
scrawl
afc1fa49f6 Use mouse release instead of press for binding actions
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
2014-05-29 20:35:57 +02:00
Marc Zinnschlag
2f56b11530 Merge remote-tracking branch 'digmaster/master' 2014-05-29 18:57:16 +02:00
scrawl
50a72ed710 Fix ghosts in Cavern Of The Incarnate having -1 health 2014-05-29 18:09:13 +02:00
scrawl
6a882e1e8d Don't show hidden factions in StatsWindow (e.g. Nerevarine) 2014-05-29 18:09:04 +02:00
Marc Zinnschlag
ae50632774 implemented cell and reference saving int OpenCS 2014-05-29 18:08:40 +02:00
scrawl
3b3b53d665 Support animated main menus (menu_background.bik)
Closes #1362
2014-05-29 17:24:25 +02:00
scrawl
a6788cfb0e Support lights that do not have a model (Fixes #1361) 2014-05-29 16:44:50 +02:00
scrawl
95b3026c7e Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game 2014-05-29 16:34:05 +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
a5cfa8a049 Removes add behavior when pressing escape while waiting. 2014-05-29 01:52:41 -04:00
scrawl
c6a4506ac2 Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2) 2014-05-28 22:35:36 +02:00
Kevin Poitra
8516b837ff Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk."
This reverts commit b897080156.
2014-05-28 15:04:35 -05:00
Kevin Poitra
18314b1707 We use spaces, not tabs. 2014-05-28 14:56:50 -05:00
scrawl
41a04b9c65 Slightly adjust menu button position 2014-05-28 21:50:08 +02:00
scrawl
e9ab7c85c6 Fix exception when there are spaces in INI-imported color settings 2014-05-28 21:29:09 +02:00
Kevin Poitra
3f00f00426 Remove some debug code. 2014-05-28 14:20:04 -05:00
scrawl
18e24a2007 Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found)
Fixes #1357
2014-05-28 21:08:20 +02:00
Kevin Poitra
8e55eb8009 Fix some formatting. 2014-05-28 13:06:43 -05:00
Kevin Poitra
545c3c312c Remove a superfluous clear. 2014-05-28 13:03:40 -05:00
Kevin Poitra
16a6edbd0e Fix a possible crash due to a null pointer. 2014-05-28 12:58:45 -05:00
Marc Zinnschlag
f112c78858 Merge remote-tracking branch 'scrawl/master' 2014-05-28 19:47:36 +02:00
Kevin Poitra
251df73407 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-05-28 12:29:40 -05:00
Kevin Poitra
b897080156 Started implementing sound time tracking so we can have NPCs' mouths move as they talk. 2014-05-28 12:26:35 -05:00
scrawl
e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame.
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
2014-05-28 19:23:50 +02:00
scrawl
42ea43c3d1 Fix container scripts not getting removed properly on cell change
Broken by f99eda1a54
2014-05-28 18:45:07 +02:00
Marc Zinnschlag
bb011f278e Merge remote-tracking branch 'cc9cii/master' 2014-05-28 14:45:57 +02:00
scrawl
56ff399f30 Say attack voiced dialogue *after* the target is set up
Required for the CreatureTargetted filter to function properly
2014-05-28 13:59:31 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
Marc Zinnschlag
d02f7ac775 Merge remote-tracking branch 'emperorarthur/nif_fix' 2014-05-28 11:15:01 +02:00
Marc Zinnschlag
3244f2197a updated credits file 2014-05-28 11:13:23 +02:00
Arthur Moore
50a4d175da Read NIF interpolation type 4 (XYZ_ROTATION_KEY)
Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible.

Partly implements Feature #1067
2014-05-28 03:42:26 -04:00
Arthur Moore
9be219beba Fixes Bug #1348 "Evidence Chest unlocking when arrested." 2014-05-27 22:09:37 -04:00
cc9cii
eb1589fd54 Merge remote-tracking branch 'upstream/master' 2014-05-27 21:04:40 +01:00
Marc Zinnschlag
be39395ce7 Merge remote-tracking branch 'scrawl/master' 2014-05-27 21:09:24 +02:00
Marc Zinnschlag
12fc0aaecb removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly) 2014-05-27 21:08:29 +02:00
Digmaster
033f1850f9 Fixed crass on character creation, allowed some character creation windows to be Esc-able 2014-05-27 14:30:26 -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
0b45a9e6b2 Fix case folding for faction reaction from ESX records 2014-05-27 19:02:48 +02:00