Commit graph

10242 commits

Author SHA1 Message Date
Rhiyo
d9fe3aac99 fixed new clothing replacing old clothing of same value
Found on the bug http://bugs.openmw.org/issues/4165.

In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind. 

In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
2017-10-19 22:46:08 +10:30
scrawl
33ceddc58b Merge pull request #1506 from akortunov/swimanimations
Use SwimTurnLeft/Right animations correctly
2017-10-18 10:03:30 +00:00
scrawl
21a705fb75 Merge pull request #1507 from AnyOldName3/data-local-fix
Fix the loading of 'data-local' lines which I broke
2017-10-18 09:59:43 +00:00
scrawl
7328de6c50 Merge pull request #1505 from drummyfish/master
Make snow create water ripples (fixes #4156)
2017-10-18 09:59:21 +00:00
AnyOldName3
1f77f9654b Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path) 2017-10-18 01:42:11 +01:00
Andrei Kortunov
4d4d247565 Use SwimTurnLeft/Right animations correctly 2017-10-17 23:26:55 +04:00
Miloslav Číž
a7cad65aab fix water shader switching bug 2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd update uniform from one place 2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269 make snow create water ripples 2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625 move rain intensity uniform to water node 2017-10-17 09:59:45 +02:00
scrawl
03554b2f4b Fix some style issues flagged by cppcheck 2017-10-15 17:06:58 +02:00
scrawl
64d02f577e Fix missing null check 2017-10-15 17:06:58 +02:00
scrawl
624046c558 Fix unused event handler 2017-10-15 17:06:58 +02:00
scrawl
bbf9b0c0a7 Merge pull request #1503 from akortunov/regressions
Handle Trespassing crime differently from Theft
2017-10-15 09:08:52 +00:00
scrawl
97ec38affb Merge pull request #1492 from drummyfish/master
fix rain/snow moving with player (issue #2698)
2017-10-15 09:04:48 +00:00
Andrei Kortunov
8f255a6b72 Handle Trespassing crime differently from Theft (bug #4158) 2017-10-15 11:03:02 +04:00
Miloslav Číž
af6eeddbe5 use operator instead of drawcallback 2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e wrap weather around in all directions 2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd use bbox as wrap range & apply to all particle systems 2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100 transform weather particles to world space 2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62 make use of renderinfo 2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11 search for particle system by class name 2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483 rain independent from camera plus wrap-around 2017-10-14 21:40:28 +02:00
scrawl
548af6dbfb Fix jail screen fading 2017-10-14 14:03:16 +00:00
scrawl
f3ca9832b0 Merge pull request #1500 from akortunov/extraspell
Implement ExtraSpell magic effect
2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b ExtraSpell magic effect: a basic implementation 2017-10-14 16:55:00 +04:00
scrawl
09d7681254 Merge pull request #1499 from lukago/bug4155
Bugfix #4155: NPCs don't equip a second ring in some cases
2017-10-13 19:35:03 +00:00
glbwsk
83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 2017-10-13 20:32:52 +02:00
scrawl
548e90a7bc Set cursor active when moving by controller 2017-10-13 16:22:44 +00:00
glbwsk
ff9cb22a58 npc swap cheaper ring during auto equip 2017-10-13 15:16:07 +02:00
glbwsk
e6e482ea98 added some comments for autoEquip 2017-10-13 14:47:26 +02:00
glbwsk
a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 2017-10-13 14:39:44 +02:00
scrawl
479f9535b4 Allow training window exit() 2017-10-08 20:38:20 +00:00
scrawl
9cde3e4408 Merge pull request #1495 from akortunov/regressions
Add showsInInventory() check to the ContainerItemModel
2017-10-08 14:09:59 +00:00
Andrei Kortunov
ea3729790f Add showsInInventory() check to the ContainerItemModel 2017-10-08 09:20:07 +04:00
scrawl
7021d354c6 Merge pull request #1493 from akortunov/regressions
Regression fixes
2017-10-06 16:21:16 +00:00
scrawl
2805781542 Fix a crash when exit() already hides the window (Fixes #4148) 2017-10-06 16:18:57 +00:00
Andrei Kortunov
ad27e0f945 Fix owned tooltip in the spellwindow 2017-10-06 11:38:27 +04:00
Andrei Kortunov
e2afd3690c Remove item by id from InventoryStore 2017-10-06 10:54:25 +04:00
scrawl
842a42ee66 Fix non-top level Windows accepting key focus 2017-10-05 18:41:02 +02:00
scrawl
8c0790580a Add screen fading for exterior cell transitions 2017-10-05 18:41:02 +02:00
scrawl
cd437f094d Fix exiting savegamedialog with 'esc' when no game is running 2017-10-05 18:35:09 +02:00
scrawl
d94235e3a7 Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard 2017-10-04 16:00:39 +00:00
scrawl
12510efab7 Fade screen out during loading screen (when travelling) 2017-10-04 16:00:38 +00:00
scrawl
a4737d8417 Use MyGUI frame events for ScreenFader 2017-10-04 16:00:38 +00:00
scrawl
e4f0f7157a Fix pinned windows not being updated 2017-10-04 16:00:37 +00:00
scrawl
49a0922f1b Remove 'visibility mask' gui feature which did not end up being useful 2017-10-04 16:00:37 +00:00
scrawl
7c68ed04b2 Don't require modal windows to be removed in the same order they were added 2017-10-04 16:00:37 +00:00
scrawl
b5c9977a7b Merge pull request #1489 from akortunov/guifixes
Use an "owned crosshair" feature for items in containers
2017-10-04 15:59:43 +00:00
Andrei Kortunov
1cb7ed5db1 Use owned tooltips for items in containers correctly 2017-10-04 12:13:45 +04:00