From 2fb4a9df6d992ca9ee14f3632c51a1fff0ca8a92 Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 9 Nov 2015 15:32:16 +0100 Subject: [PATCH 1/2] Update CHANGELOG.md (features that should be bugs instead) --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a3cdfd25..c5905a897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -148,6 +148,7 @@ Bug #2879: Editor: entered value of field "Buys *" is not saved for a creature Bug #2880: OpenMW & OpenMW-CS: having a scale value of 0.000 makes the game laggy Bug #2882: Freeze when entering cell "Guild of Fighters (Ald'ruhn)" after dropping some items inside + Bug #2883: game not playable if mod providing a spell is removed but the list of known spells still contains it Bug #2884: NPC chats about wrong player race Bug #2886: Adding custom races breaks existing numbering of PcRace Bug #2888: Editor: value entered in "AI Wander Idle" is not kept @@ -166,6 +167,7 @@ Bug #2944: Spell chance for power to show as 0 on hud when used Bug #2953: Editor: rightclick in an empty place in the menu bar shows an unnamed checkbox Bug #2956: Editor: freezes while editing Filter + Bug #2959: space character in field enchantment (of an amulet) prevents rendering of surroundings Bug #2962: OpenMW: Assertion `it != invStore.end()' failed Bug #2964: Recursive script execution can corrupt script runtime data Bug #2973: Editor: placing a chest in the game world and activating it heavily blurrs the character portrait @@ -211,9 +213,7 @@ Feature #2751: Character preview optimization Feature #2804: Editor: Merge Tool Feature #2818: Editor: allow copying a record ID to the clipboard - Feature #2883: game not playable if mod providing a spell is removed but the list of known spells still contains it Feature #2946: Editor: add script line number in results of search - Feature #2959: space character in field enchantment (of an amulet) prevents rendering of surroundings Feature #2963: Editor: Mouse button bindings in 3D scene Feature #2983: Sun Glare fader Feature #2999: Scaling of journal and books From 37158df339d1cc5b760e54f9e260ce565ab0915e Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Tue, 10 Nov 2015 14:59:26 +0100 Subject: [PATCH 2/2] Update scalinglayer.cpp MSVC Explicitly requires for std::min and/or max --- components/myguiplatform/scalinglayer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp index 19ae10841..ee9de349e 100644 --- a/components/myguiplatform/scalinglayer.cpp +++ b/components/myguiplatform/scalinglayer.cpp @@ -1,6 +1,7 @@ #include "scalinglayer.hpp" #include +#include namespace osgMyGUI {