diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | melon.rc | 8 | ||||
| -rw-r--r-- | src/GPU3D_OpenGL.cpp | 5 | ||||
| -rw-r--r-- | src/libui_sdl/main.cpp | 4 | ||||
| -rw-r--r-- | src/version.h | 2 |
5 files changed, 12 insertions, 9 deletions
@@ -2,7 +2,7 @@ <h2 align="center"><b>melonDS</b></h2> <p align="center"> <a href="http://melonds.kuribo64.net/" alt="melonDS website"><img src="https://img.shields.io/badge/website-melonds.kuribo64.net-%2331352e.svg"></a> -<a href="http://melonds.kuribo64.net/downloads.php" alt="Release: 0.8.1"><img src="https://img.shields.io/badge/release-0.8.1-%235c913b.svg"></a> +<a href="http://melonds.kuribo64.net/downloads.php" alt="Release: 0.8.2"><img src="https://img.shields.io/badge/release-0.8.2-%235c913b.svg"></a> <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-%23ff554d.svg"></a> <a href="https://kiwiirc.com/client/irc.badnik.net/?nick=IRC-Source_?#melonds" alt="IRC channel: #melonds"><img src="https://img.shields.io/badge/IRC%20chat-%23melonds-%23dd2e44.svg"></a> </p> @@ -6,8 +6,8 @@ //include version information in .exe, modify these values to match your needs 1 VERSIONINFO -FILEVERSION 0,8,1,0 -PRODUCTVERSION 0,8,1,0 +FILEVERSION 0,8,2,0 +PRODUCTVERSION 0,8,2,0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -15,14 +15,14 @@ FILETYPE VFT_APP BLOCK "040904E4" { VALUE "CompanyName", "Melon Factory of Kuribo64" - VALUE "FileVersion", "0.8.1" + VALUE "FileVersion", "0.8.2" VALUE "FileDescription", "DS emulator, sorta. also 1st quality melon." VALUE "InternalName", "SDnolem" VALUE "LegalCopyright", "2016-2019 Arisotura & co." VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "zafkflzdasd.exe" VALUE "ProductName", "melonDS" - VALUE "ProductVersion", "0.8.1" + VALUE "ProductVersion", "0.8.2" } } BLOCK "VarFileInfo" diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp index 92fdfe8..d616e1c 100644 --- a/src/GPU3D_OpenGL.cpp +++ b/src/GPU3D_OpenGL.cpp @@ -479,7 +479,7 @@ void UpdateDisplaySettings() glBufferData(GL_PIXEL_PACK_BUFFER, 256*192*4, NULL, GL_DYNAMIC_READ); //glLineWidth(scale); - glLineWidth(1.5); + //glLineWidth(1.5); } @@ -743,6 +743,7 @@ void RenderSceneChunk(int y, int h) // pass 1: opaque pixels UseRenderShader(flags); + glLineWidth(1.0); glColorMaski(1, GL_TRUE, GL_TRUE, fogenable, GL_FALSE); @@ -774,6 +775,7 @@ void RenderSceneChunk(int y, int h) if (RenderDispCnt & (1<<5)) { UseRenderShader(flags | RenderFlag_Edge); + glLineWidth(1.5); glColorMaski(0, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glColorMaski(1, GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE); @@ -806,6 +808,7 @@ void RenderSceneChunk(int y, int h) glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ONE, GL_ONE); UseRenderShader(flags | RenderFlag_Trans); + glLineWidth(1.0); if (NumOpaqueFinalPolys > -1) { diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp index 1e91e15..99d4e3f 100644 --- a/src/libui_sdl/main.cpp +++ b/src/libui_sdl/main.cpp @@ -1223,8 +1223,8 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt) KeyHotkeyMask |= (1<<i); // REMOVE ME - if (evt->Scancode == 0x57) // F11 - NDS::debug(0); + //if (evt->Scancode == 0x57) // F11 + // NDS::debug(0); } return 1; diff --git a/src/version.h b/src/version.h index cc15c89..0d71ed8 100644 --- a/src/version.h +++ b/src/version.h @@ -19,7 +19,7 @@ #ifndef VERSION_H #define VERSION_H -#define MELONDS_VERSION "0.8.1" +#define MELONDS_VERSION "0.8.2" #define MELONDS_URL "http://melonds.kuribo64.net/" |