Marc Zinnschlag
b717e3fcb8
Merge remote-tracking branch 'filkry/bug1196jumpdialog'
2014-06-08 11:25:34 +02:00
slothlife
51c45796b1
Fix physics to not trigger Bullet assert in Debug
...
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37
Fixed mouse closing containers, and injection/gui test order
...
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.
Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.
And fixed a comment.
2014-06-07 20:08:29 -04:00
Fil Krynicki
1d3a220d94
Added A_Use command to player controls.
2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Marc Zinnschlag
0668019c86
Merge remote-tracking branch 'scrawl/master'
2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6
Fix warning
2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd
Remove unused map
2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5
Don't reserve Pauldron parts for robes ( Fixes #1396 )
2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e
Fix for Bug #1409
2014-06-06 15:13:25 +02:00
scrawl
9627146bf4
Another fix for trade exploit (hopefully the last: Fixes #1408 )
2014-06-06 15:08:44 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +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
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
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
