scrawl
16ac6e7aac
Merge DialInfo objects by subrecord instead of overwriting the object
...
Fixes #1360
2014-05-31 13:01:11 +02: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
scrawl
d26f756c53
Fix several edit boxes not receiving mouse input
2014-05-30 14:52:47 +02:00
scrawl
8761aa5795
Loop main menu video when it's finished playing
2014-05-30 14:28:04 +02:00
scrawl
ac77b07e29
Small fix for menu background
2014-05-30 14:28:04 +02: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
pvdk
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
2014-05-30 02:50:17 +02:00
pvdk
0cc7c06262
Ensure the launcher is not shown when the wizard is run
2014-05-30 02:41:09 +02:00
pvdk
6348af586e
Fixed some problems with the launcher and the wizard
2014-05-30 02:12:48 +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
pvdk
a390dde818
Fixed importing configurations of existing installations
2014-05-29 21:17:49 +02:00
pvdk
2a6a26c0d0
Minor fixes
2014-05-29 21:02:06 +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
pvdk
88064f4946
Fix for MOC error due to Boost includes
2014-05-29 20:35:07 +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
pvdk
5af12d193a
Cleaned up old wizard stuff from launcher
2014-05-29 17:57:41 +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
pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
2014-05-29 16:42:16 +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
mrcheko
34b163233b
Merge remote-tracking branch 'upstream/master'
2014-05-28 17:54:38 +04: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
