scrawl
de7fcf0beb
Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item)
...
Fixes #1368
2014-05-31 13:45:47 +02:00
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
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
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +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
Marc Zinnschlag
2f56b11530
Merge remote-tracking branch 'digmaster/master'
2014-05-29 18:57:16 +02:00
scrawl
6a882e1e8d
Don't show hidden factions in StatsWindow (e.g. Nerevarine)
2014-05-29 18:09:04 +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
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
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
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
Arthur Moore
9be219beba
Fixes Bug #1348 "Evidence Chest unlocking when arrested."
2014-05-27 22:09:37 -04:00
Marc Zinnschlag
be39395ce7
Merge remote-tracking branch 'scrawl/master'
2014-05-27 21:09:24 +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
scrawl
2b15b85af1
Fix position adjustment not working properly for rotated objects
2014-05-27 17:58:18 +02:00
scrawl
2fe86f2b85
Consider hit normal for item drop test ( Fixes #995 )
2014-05-27 17:39:04 +02:00
scrawl
f476aa4ade
Remove MyGUI color codes when copying to system clipboard
2014-05-27 17:07:14 +02:00
scrawl
3e2eed9269
Implement getFactionReaction function
...
Strange bug when using value != 0 for the garbage argument?
2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
2014-05-27 14:54:29 +02:00
Marc Zinnschlag
27c795483b
Merge remote-tracking branch 'ace/win-build-fix'
2014-05-27 14:32:20 +02:00
scrawl
578adb4ef6
PcJoinFaction and friends: make sure the given faction exists
2014-05-27 13:54:25 +02:00
Alexander "Ace" Olofsson
d3357cc279
The MSVC linker is really pedantic with this.
...
Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing...
unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)
2014-05-27 13:27:18 +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
ee7b5fa5c2
Fixed crash when Esc-ing out of Save "are you sure" dialog.
2014-05-27 04:38:13 -04:00
Digmaster
e0356cf89d
Added support to close modal windows with Esc
2014-05-27 03:00:31 -04:00
Marc Zinnschlag
9e21da9636
Merge remote-tracking branch 'scrawl/master'
2014-05-27 08:34:54 +02:00
Digmaster
e0d55116a4
Dims and disabled Goodbye button in dialogs when unavailable.
2014-05-27 00:30:37 -04:00
Digmaster
79d0ed64d9
Undo some changes I made in the past that shouldn't exist
2014-05-26 23:31:40 -04:00
Digmaster
1ca921d6e2
Merge remote-tracking branch 'upstream/master'
2014-05-26 23:26:23 -04:00
Digmaster
e3e51324a4
Esc button exits all non-modal GUI windows
2014-05-26 23:13:37 -04:00
scrawl
cf68f6da96
Fix ESX dependencies not being checked except for the first one
2014-05-27 00:06:34 +02:00
scrawl
4caa8c5cca
Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations)
2014-05-26 20:52:38 +02:00
scrawl
5660f283dd
Fix actor models incorrectly being rotated on X/Y axes
2014-05-26 20:52:38 +02:00
scrawl
0966755a0c
Store death animation index in CreatureStats
2014-05-26 20:52:32 +02:00
Marc Zinnschlag
3937cfcd8b
Merge remote-tracking branch 'scrawl/master'
2014-05-26 19:02:13 +02:00
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +02:00
scrawl
f629307f60
Fix frame delay for sound listener position ( Fixes #1180 )
2014-05-26 16:43:19 +02:00
scrawl
bfd91c0681
Fix potential NpcStats overwriting issue
2014-05-26 12:31:08 +02:00
Marc Zinnschlag
4aab4bae65
minor cleanup and silenced a warning
2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19
Merge remote-tracking branch 'mrcheko/master'
2014-05-26 10:08:40 +02:00
Thomas
7697b9e868
Ensures nothing bad will happen if we try to lock a door that never had a lock level
2014-05-26 01:48:24 -04:00
Thomas
b3ffd5b868
Fix for bug Bug #1098
2014-05-26 01:42:11 -04:00
mrcheko
8fa7fcdbee
fix bug http://bugs.openmw.org/issues/1335 (1304 as well)
...
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
2014-05-25 21:03:37 +04:00
scrawl
10d835a55c
Some more missing isInCell checks
2014-05-25 15:07:35 +02:00
scrawl
f3ba31de2d
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwscript/cellextensions.cpp
2014-05-25 14:58:47 +02:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Marc Zinnschlag
130af28fa5
Merge remote-tracking branch 'cc9cii/master'
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c
Merge branch 'openmw-30'
2014-05-25 11:55:25 +02:00
mrcheko
c62187bd55
fix bug at http://bugs.openmw.org/issues/1155
...
Though it still can happen sometimes but not in such stupid manner.
2014-05-25 13:31:46 +04:00
cc9cii
d2794165ba
Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp"
2014-05-25 18:56:50 +10:00
mrcheko
559c772906
Merge remote-tracking branch 'upstream/master'
2014-05-25 10:21:54 +04:00
cc9cii
4f94a31b54
Fix crash starting a new game.
2014-05-25 07:50:19 +10:00
mrcheko
56881cb7c9
fix bugs in aisequence::execute
2014-05-24 23:05:30 +04:00
scrawl
a05c8fd3ce
Make applyEnchantment return the record ID instead of modifying Ptr
2014-05-24 14:58:48 +02:00
scrawl
1d8da95756
Warning fix
2014-05-24 14:47:51 +02:00
scrawl
08cf58204f
Merge branch 'master' of github.com:scrawl/openmw
2014-05-23 16:45:28 +02:00
scrawl
f09c8ddc9e
Remove a pointless assert
2014-05-23 16:44:51 +02:00
scrawl
a7d525245c
Fix missing include
2014-05-23 16:07:02 +02:00
cc9cii
367acd9676
Enable video but without sound.
2014-05-23 21:55:47 +10:00
cc9cii
3718847ffc
Disable video for Windows until the crash issues are fixed.
2014-05-23 21:07:01 +10:00
scrawl
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
2014-05-23 08:39:48 +02:00
Marc Zinnschlag
6ac700a501
Merge remote-tracking branch 'potatoesmaster/getClass'
2014-05-23 08:00:52 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
scrawl
a2f156be8e
Prevent magic bolts from colliding with their caster
2014-05-22 23:34:32 +02:00
scrawl
df8e095c83
Small cleanup
2014-05-22 23:27:54 +02: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
Emanuel Guevel
20cfdd4b43
Move LiveCellRefBase ctor where it belongs to
2014-05-22 20:50:00 +02:00
scrawl
cba50c7338
Optimize ManualRef: look up correct Store instead of searching
2014-05-22 15:46:35 +02:00
scrawl
4b5f02f644
Remove useless throwing of exception
2014-05-22 15:29:36 +02:00
greye
8f9091550e
require boost::locale only on Windows
2014-05-22 15:42:47 +04:00
scrawl
3380e1e1c5
Fix ShouldAttack filter
...
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
2014-05-22 12:20:25 +02:00
scrawl
c6c254d279
Do not trigger levelup if rest was interrupted
2014-05-22 11:08:36 +02:00
scrawl
18bba6bcec
Fix layout glitch when autosaving
2014-05-22 11:03:45 +02:00
scrawl
cf07d2ab93
Fix swapped position of Save and Load menu buttons
2014-05-21 16:38:50 +02:00
scrawl
f812746010
Auto-select first save in load dialog
2014-05-21 16:36:55 +02:00
scrawl
3a7e2f8bb5
Allow invoking Journal instruction with non-existing index
...
This is used by the MG_EscortScholar1 quest.
2014-05-21 14:18:14 +02:00
greye
8b94e31062
try to set relative path to resources
2014-05-21 15:39:58 +04:00
scrawl
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
2014-05-21 10:41:03 +02:00
scrawl
b39b572c5a
Moved mStartupScript to World, so that it is executed for a New game
2014-05-21 09:25:45 +02:00
