Marc Zinnschlag
538aa6607e
Merge remote-tracking branch 'scrawl/master'
2014-06-01 10:25:53 +02:00
scrawl
dcc0e2d105
When dialogue goodbye is forced, allow using either the red link or the goodbye button
...
Fixes #1373
2014-06-01 00:21:55 +02:00
scrawl
0f1b39bca4
Fix trade exploit
...
Using the Max Sale button it was possible to "invert" the buying/selling state.
2014-05-31 18:28:00 +02:00
scrawl
865486604f
Make trade disposition changes temporary again, as in vanilla
2014-05-31 13:57:07 +02:00
scrawl
a1bdf20958
Make trade balance label editable
2014-05-31 13:53:36 +02:00
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
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
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
