Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
scrawl
40d6c8abf7
Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )
2014-06-06 02:24:51 +02:00
scrawl
d442853b3e
Allow opposite gender's parts as fallback ( Fixes #1404 )
2014-06-06 01:30:23 +02:00
scrawl
c36decb855
Fix being able to place items on top of actors ( Fixes #1403 )
2014-06-06 00:43:24 +02:00
scrawl
3d103f3785
Don't block hits when in hand-to-hand combat (shield not visible)
2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4
Don't use armor mitigation for fall damage
2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9
Fix AiCombat being incorrectly added to player ( Fixes #1356 )
2014-06-05 21:51:57 +02:00
scrawl
1173957e56
Fix item weight displaying as 1e+3 for Stendarr's Hammer
2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6
Add missing padding for item tooltip magic effects
2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1
Fix forced switch to third person on death not always working
...
For instance, when dying from fall damage
2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab
Fix crash when loading a savegame after dying ( Fixes #1389 )
2014-06-05 17:01:22 +02:00
scrawl
4e235516c3
Work around missing character in french morrowind font (Bug #1390 )
2014-06-05 16:16:16 +02:00
scrawl
85c9871178
Use question mark for not found glyphs in the font
2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9
Fix not reacting to quit request while video is playing
2014-06-05 15:52:02 +02:00
scrawl
c0f1449004
Cycle with equipped items if all slots are occupied ( Fixes #1395 )
2014-06-05 14:54:07 +02:00
Marc Zinnschlag
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
2014-06-04 21:12:23 +02:00
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
2014-06-04 15:14:29 +02:00
scrawl
00775035af
Add missing hasItemHealth for lockpicks/probes ( Fixes #1385 )
2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f
Fix overlapping text in SpellWindow when the window is too small
2014-06-03 01:12:31 +02:00
scrawl
d777739425
Fix a crash on exit when projectiles were active
2014-06-03 00:44:32 +02:00
scrawl
bbc5b125ab
Rewrite journal GUI quest index
...
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
- Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
- Fixes a bug where the quest index would not be updated when opened.
2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95
Fix for dereferencing past end of mGuiModes.
2014-06-02 17:21:13 -05:00
scrawl
577ed3943b
Show wallpaper when loading a savegame
2014-06-02 23:26:43 +02:00
scrawl
d2ad2e0f31
Re-enable collision when an actor is resurrected
2014-06-02 20:45:25 +02:00
Marek Kochanowicz
55d451febe
changes in the model (idtable) to support nested data
2014-06-02 20:41:37 +02:00
scrawl
996e49c534
Change CharacterManager to use list instead of vector
...
Solves a crash when deleting all savegames of a character due to mCurrent being invalidated
2014-06-02 20:24:35 +02:00
scrawl
68afac6a19
Fix large size_t being truncated to int
2014-06-02 19:47:39 +02:00
Marc Zinnschlag
f130f8535c
Merge remote-tracking branch 'slothlife/cmake-fixes'
2014-06-02 19:08:15 +02:00
scrawl
8b33c087e0
Properly handle exceptions when saving the game
...
Add message boxes when an exception occurs while loading or saving the game
2014-06-02 14:46:41 +02:00
Emanuel Guevel
929aae6869
Silence a clang warning
...
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
2014-06-02 10:30:44 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
scrawl
f6f6b5604a
Fix loading a savegame when some of its content files were disabled
...
Fixes #1380
2014-06-01 23:11:38 +02:00
Marc Zinnschlag
538aa6607e
Merge remote-tracking branch 'scrawl/master'
2014-06-01 10:25:53 +02:00
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
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
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
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
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
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
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
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
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
49a6579d3a
Fixed esmtool
2014-05-27 15:37:04 +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
Marek Kochanowicz
6720d85a04
fixed compilation, thanks greye
2014-05-27 14:50:21 +02:00
Marc Zinnschlag
27c795483b
Merge remote-tracking branch 'ace/win-build-fix'
2014-05-27 14:32:20 +02:00
Marek Kochanowicz
41db48720d
does not compile
2014-05-27 14:01:15 +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
Marc Zinnschlag
1665822224
Merge remote-tracking branch 'puppykevin/master'
2014-05-27 12:42:48 +02:00
Marc Zinnschlag
e0ba9a4bf2
added reference collection stage to saving operation (preparation for cell saving)
2014-05-27 12:39:26 +02:00
Digmaster
2b3b11d848
Give access to the main menu when at a choice in dialogue
2014-05-27 05:33:25 -04:00
