Skip to content

Commit 204b5d8

Browse files
committed
HARK HARK HARK
1 parent 4d775dc commit 204b5d8

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h2 align="center"><b>melonDS</b></h2>
33
<p align="center">
44
<a href="http://melonds.kuribo64.net/" alt="melonDS website"><img src="https://img.shields.io/badge/website-melonds.kuribo64.net-%2331352e.svg"></a>
5-
<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>
5+
<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>
66
<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>
77
<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>
88
</p>

melon.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
//include version information in .exe, modify these values to match your needs
88
1 VERSIONINFO
9-
FILEVERSION 0,8,1,0
10-
PRODUCTVERSION 0,8,1,0
9+
FILEVERSION 0,8,2,0
10+
PRODUCTVERSION 0,8,2,0
1111
FILETYPE VFT_APP
1212
{
1313
BLOCK "StringFileInfo"
1414
{
1515
BLOCK "040904E4"
1616
{
1717
VALUE "CompanyName", "Melon Factory of Kuribo64"
18-
VALUE "FileVersion", "0.8.1"
18+
VALUE "FileVersion", "0.8.2"
1919
VALUE "FileDescription", "DS emulator, sorta. also 1st quality melon."
2020
VALUE "InternalName", "SDnolem"
2121
VALUE "LegalCopyright", "2016-2019 Arisotura & co."
2222
VALUE "LegalTrademarks", ""
2323
VALUE "OriginalFilename", "zafkflzdasd.exe"
2424
VALUE "ProductName", "melonDS"
25-
VALUE "ProductVersion", "0.8.1"
25+
VALUE "ProductVersion", "0.8.2"
2626
}
2727
}
2828
BLOCK "VarFileInfo"

src/GPU3D_OpenGL.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ void UpdateDisplaySettings()
479479
glBufferData(GL_PIXEL_PACK_BUFFER, 256*192*4, NULL, GL_DYNAMIC_READ);
480480

481481
//glLineWidth(scale);
482-
glLineWidth(1.5);
482+
//glLineWidth(1.5);
483483
}
484484

485485

@@ -743,6 +743,7 @@ void RenderSceneChunk(int y, int h)
743743
// pass 1: opaque pixels
744744

745745
UseRenderShader(flags);
746+
glLineWidth(1.0);
746747

747748
glColorMaski(1, GL_TRUE, GL_TRUE, fogenable, GL_FALSE);
748749

@@ -774,6 +775,7 @@ void RenderSceneChunk(int y, int h)
774775
if (RenderDispCnt & (1<<5))
775776
{
776777
UseRenderShader(flags | RenderFlag_Edge);
778+
glLineWidth(1.5);
777779

778780
glColorMaski(0, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
779781
glColorMaski(1, GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE);
@@ -806,6 +808,7 @@ void RenderSceneChunk(int y, int h)
806808
glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ONE, GL_ONE);
807809

808810
UseRenderShader(flags | RenderFlag_Trans);
811+
glLineWidth(1.0);
809812

810813
if (NumOpaqueFinalPolys > -1)
811814
{

src/libui_sdl/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,8 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
12231223
KeyHotkeyMask |= (1<<i);
12241224

12251225
// REMOVE ME
1226-
if (evt->Scancode == 0x57) // F11
1227-
NDS::debug(0);
1226+
//if (evt->Scancode == 0x57) // F11
1227+
// NDS::debug(0);
12281228
}
12291229

12301230
return 1;

src/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef VERSION_H
2020
#define VERSION_H
2121

22-
#define MELONDS_VERSION "0.8.1"
22+
#define MELONDS_VERSION "0.8.2"
2323

2424
#define MELONDS_URL "http://melonds.kuribo64.net/"
2525

0 commit comments

Comments
 (0)