ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HARK HARK HARK

This commit is contained in:
Arisotura 2019-06-25 19:29:21 +02:00
parent 4d775dcf85
commit 204b5d8700
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -2,7 +2,7 @@
<h2 align="center"><b>melonDS</b></h2> <h2 align="center"><b>melonDS</b></h2>
<p align="center"> <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/" 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://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> <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> </p>

8
melon.rc
View File

@ -6,8 +6,8 @@
//include version information in .exe, modify these values to match your needs //include version information in .exe, modify these values to match your needs
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 0,8,1,0 FILEVERSION 0,8,2,0
PRODUCTVERSION 0,8,1,0 PRODUCTVERSION 0,8,2,0
FILETYPE VFT_APP FILETYPE VFT_APP
{ {
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
@ -15,14 +15,14 @@ FILETYPE VFT_APP
BLOCK "040904E4" BLOCK "040904E4"
{ {
VALUE "CompanyName", "Melon Factory of Kuribo64" 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 "FileDescription", "DS emulator, sorta. also 1st quality melon."
VALUE "InternalName", "SDnolem" VALUE "InternalName", "SDnolem"
VALUE "LegalCopyright", "2016-2019 Arisotura & co." VALUE "LegalCopyright", "2016-2019 Arisotura & co."
VALUE "LegalTrademarks", "" VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "zafkflzdasd.exe" VALUE "OriginalFilename", "zafkflzdasd.exe"
VALUE "ProductName", "melonDS" VALUE "ProductName", "melonDS"
VALUE "ProductVersion", "0.8.1" VALUE "ProductVersion", "0.8.2"
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

5
src/GPU3D_OpenGL.cpp
View File

@ -479,7 +479,7 @@ void UpdateDisplaySettings()
glBufferData(GL_PIXEL_PACK_BUFFER, 256*192*4, NULL, GL_DYNAMIC_READ); glBufferData(GL_PIXEL_PACK_BUFFER, 256*192*4, NULL, GL_DYNAMIC_READ);
//glLineWidth(scale); //glLineWidth(scale);
glLineWidth(1.5); //glLineWidth(1.5);
} }
@ -743,6 +743,7 @@ void RenderSceneChunk(int y, int h)
// pass 1: opaque pixels // pass 1: opaque pixels
UseRenderShader(flags); UseRenderShader(flags);
glLineWidth(1.0);
glColorMaski(1, GL_TRUE, GL_TRUE, fogenable, GL_FALSE); glColorMaski(1, GL_TRUE, GL_TRUE, fogenable, GL_FALSE);
@ -774,6 +775,7 @@ void RenderSceneChunk(int y, int h)
if (RenderDispCnt & (1<<5)) if (RenderDispCnt & (1<<5))
{ {
UseRenderShader(flags | RenderFlag_Edge); UseRenderShader(flags | RenderFlag_Edge);
glLineWidth(1.5);
glColorMaski(0, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glColorMaski(0, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
glColorMaski(1, GL_FALSE, GL_TRUE, 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); glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ONE, GL_ONE);
UseRenderShader(flags | RenderFlag_Trans); UseRenderShader(flags | RenderFlag_Trans);
glLineWidth(1.0);
if (NumOpaqueFinalPolys > -1) if (NumOpaqueFinalPolys > -1)
{ {

4
src/libui_sdl/main.cpp
View File

@ -1223,8 +1223,8 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
KeyHotkeyMask |= (1<<i); KeyHotkeyMask |= (1<<i);
// REMOVE ME // REMOVE ME
if (evt->Scancode == 0x57) // F11 //if (evt->Scancode == 0x57) // F11
NDS::debug(0); // NDS::debug(0);
} }
return 1; return 1;

2
src/version.h
View File

@ -19,7 +19,7 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#define MELONDS_VERSION "0.8.1" #define MELONDS_VERSION "0.8.2"
#define MELONDS_URL "http://melonds.kuribo64.net/" #define MELONDS_URL "http://melonds.kuribo64.net/"