Compare commits

...

14 Commits

Author SHA1 Message Date
yabause
23533c64dd Updated changelog for 0.9.2-1 2009-04-24 19:33:34 +00:00
yabause
a218d3a8f4 Updated version number for bugfix release in 0.9.2 branch 2009-04-24 17:56:30 +00:00
yabause
4874ecb14c merged 1894 and 1898 in 0.9.2 branch 2009-04-23 19:22:48 +00:00
zeromus
c6ca37533f i forgot to checkin my tweaks for the sneaked win32 0.9.2 build 2009-04-16 05:16:36 +00:00
sigmaris
92b6f6b9a1 Correct version 0.9.2 tag in Cocoa port 2009-04-12 17:46:40 +00:00
yabause
82f4276232 Merged 1899 2009-04-11 20:51:44 +00:00
yabause
9a8c418b5f merged 1882 2009-04-11 16:05:17 +00:00
yabause
e70bdb0737 Merged revisions 1856 to 1858 (for some reason I thought
I already merged those), 1865 and 1866.
2009-04-09 20:42:25 +00:00
zeromus
eaf5ebd0de merge 1863 into 0.9.2 2009-04-09 05:22:40 +00:00
yabause
2c2cfadad0 Merged 1855 and 1861 2009-04-08 22:27:21 +00:00
yabause
242c3d7baf Updated version number to 0.9.2 2009-04-08 22:06:04 +00:00
yabause
9636e8a844 Merged revisions 1847 to 1854 and 1856 to 1858 leaving
out 1855. Just need someone to confirm it's ok to merge
it :)
2009-04-08 21:59:35 +00:00
yabause
29f0fab650 Merged 1845 2009-04-07 21:18:59 +00:00
yabause
23171758d0 Creating the 0.9.2 release branch 2009-04-07 20:02:24 +00:00
359 changed files with 263 additions and 153 deletions

View File

@@ -17,6 +17,8 @@ Max Tabachenko (CrazyMax)
zeromus
Luigi__
adelikat
matusz
pa__
Contributors
------------

View File

@@ -1,6 +1,39 @@
0.9.1 -> ?
0.9.2 -> 0.9.2-1
General/Core:
bug: fixed compilation for 64 bits linux systems
bug: fixed compilation when using --enable-osmesa with recent osmesa versions
0.9.1 -> 0.9.2
General/Core:
bug: fix error in SBCS/RSCS flags; fixes many odd behaviors and crashes [zeromus]
bug: add support for sleep mode and power registers [luigi__]
bug: important fixes to RTC so correct time is actually told [luigi__]
bug: fix card reads below 0x8000; fixes some game freezes [normatt]
bug: fix 4 mbit save type; fix non-autodetect savefile dumping [zeromus, matusz]
enh: add sram to GBA game addon emulation for importing savefiles [zeromus]
enh: many improvements and feature hookups in linux ports [matusz, luigi__]
Graphics:
bug: fix specular texture mapping mode [luigi__]
bug: repairs to some capture modes and vram mapping [zeromus, CrazyMax]
bug: viewports finally correctly handled [zeromus]
enh: add software rasterizer. quirky, but on par with opengl [zeromus]
Windows:
bug: mitigate bad frameskipper; default to old frameskipping mode [zeromus]
bug: fixes with recent roms and zipfile loading [zeromus]
bug: fix window position memory [zeromus]
enh: bios and firmware may now be used and booted [luigi__]
enh: many display, OSD, and input enhancements [luigi__]
enh: brand new hotkey and controls binding system [zeromus]
enh: configurable screen separation [luigi__]
enh: fast forward key [pa__]
enh: improvements to mic [luigi__]
enh: faster updates in debug tools, up to once per frame [pa__]
Mac OS X Port:
enh: added Italian translation thanks to Paolo Bernini [jeff]
enh: resurrection of GDB stub [sigmaris]
0.9 -> 0.9.1
General/Core:

View File

View File

View File

@@ -1,7 +1,7 @@
dnl --- Package name is first argument to AC_INIT
dnl --- Release version is second argument to AC_INIT
AC_INIT(desmume, [svn])
AC_INIT(desmume, [0.9.2-1])
dnl -- find target architecture for some os specific libraries
AC_CANONICAL_TARGET
@@ -59,6 +59,7 @@ AC_ARG_ENABLE([osmesa],
[osmesa=no])
if test "x$osmesa" = "xyes" ; then
AC_CHECK_LIB(dl, main)
AC_CHECK_LIB(OSMesa, main,[
useosmesa=yes
AC_DEFINE(HAVE_LIBOSMESA)

View File

@@ -1,9 +0,0 @@
EXTRA_DIST = cocoa_util.m DeSmuME.cbp globals.h main.m main_window.h main_window.m nds_control.h nds_control.mm preferences.m \
about.m DeSmuME.icns Info.plist InfoPlist.strings input.h input.m \
makeapp.sh PkgInfo preferences.h screenshot.h screenshot.m \
screen_state.h screen_state.m sndOSX.h sndOSX.mm video_output_view.h video_output_view.m \
DeSmuME.xcodeproj/project.pbxproj Rakefile \
dialogs/rom_info.h dialogs/rom_info.m dialogs/speed_limit_selection_window.h dialogs/speed_limit_selection_window.m \
English.strings English.nib/classes.nib English.nib/info.nib English.nib/keyedobjects.nib \
French.strings French.nib/classes.nib French.nib/info.nib French.nib/keyedobjects.nib \
Japanese.strings Japanese.nib/classes.nib Japanese.nib/info.nib Japanese.nib/keyedobjects.nib

View File

@@ -1,16 +0,0 @@
#ifndef _WINDRIVER_H_
#define _WINDRIVER_H_
#define WIN32_LEAN_AND_MEAN
#include "../common.h"
#include "CWindow.h"
extern WINCLASS *MainWindow;
class Lock {
public:
Lock();
~Lock();
};
#endif

View File

@@ -342,12 +342,12 @@ void MMU_Init(void) {
void MMU_DeInit(void) {
LOG("MMU deinit\n");
if (MMU.fw.fp)
fclose(MMU.fw.fp);
mc_free(&MMU.fw);
if (MMU.bupmem.fp)
fclose(MMU.bupmem.fp);
mc_free(&MMU.bupmem);
if (MMU.fw.fp)
fclose(MMU.fw.fp);
mc_free(&MMU.fw);
if (MMU.bupmem.fp)
fclose(MMU.bupmem.fp);
mc_free(&MMU.bupmem);
addonsClose();
Mic_DeInit();
}
@@ -4205,7 +4205,7 @@ void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val)
}
void mmu_select_savetype(int type, int *bmemtype, u32 *bmemsize) {
if (type<0 || type > 5) return;
if (type<0 || type > 6) return;
*bmemtype=save_types[type][0];
*bmemsize=save_types[type][1];
mc_realloc(&MMU.bupmem, *bmemtype, *bmemsize);

View File

@@ -702,8 +702,6 @@ static void OGLRender()
xglDepthMask(GL_TRUE);
glViewport(gfx3d.viewport.x,gfx3d.viewport.y,gfx3d.viewport.width,gfx3d.viewport.height);
float clearColor[4] = {
((float)(gfx3d.clearColor&0x1F))/31.0f,
((float)((gfx3d.clearColor>>5)&0x1F))/31.0f,
@@ -723,7 +721,7 @@ static void OGLRender()
//TODO - properly doublebuffer the display lists
{
u32 lastTextureFormat = 0, lastTexturePalette = 0, lastPolyAttr = 0;
u32 lastTextureFormat = 0, lastTexturePalette = 0, lastPolyAttr = 0, lastViewport = 0xFFFFFFFF;
// int lastProjIndex = -1;
for(int i=0;i<gfx3d.polylist->count;i++) {
@@ -775,6 +773,15 @@ static void OGLRender()
glVertex4fv(vert->coord);
}
glEnd();*/
if(lastViewport != poly->viewport)
{
VIEWPORT viewport;
viewport.decode(poly->viewport);
glViewport(viewport.x,viewport.y,viewport.width,viewport.height);
lastViewport = poly->viewport;
}
glBegin(GL_TRIANGLES);
for(int j = 1; j < (type-1); j++)

View File

@@ -195,6 +195,8 @@ void * ZIPROMReaderInit(const char * filename)
{
char tmp1[1024];
char tmp2[1024];
memset(tmp1,0,sizeof(tmp1));
memset(tmp2,0,sizeof(tmp2));
strncpy(tmp1, filename, strlen(filename) - 4);
sprintf(tmp2, "%s/%s", tmp1, dirent->d_name);
return zzip_fopen(tmp2, "rb");

View File

@@ -3,7 +3,7 @@
yopyop156.ifrance.com
Copyright (C) 2006 Mic
Copyright (C) 2009 CrazyMax
Copyright (C) 2009 CrazyMax
Copyright (C) 2009 DeSmuME team
This file is part of DeSmuME

View File

@@ -32,11 +32,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.8</string>
<string>0.9.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.8</string>
<string>0.9.2</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>

14
src/cocoa/Makefile.am Normal file
View File

@@ -0,0 +1,14 @@
EXTRA_DIST = cocoa_util.m DeSmuME.cbp globals.h main.mm main_window.h main_window.mm nds_control.h nds_control.mm preferences.mm \
about.m DeSmuME.icns Info.plist InfoPlist.strings input.h input.mm \
makeapp.sh PkgInfo preferences.h screenshot.h screenshot.mm \
screen_state.h screen_state.m sndOSX.h sndOSX.mm video_output_view.h video_output_view.mm \
DeSmuME.xcodeproj/project.pbxproj Rakefile \
dialogs/rom_info.h dialogs/rom_info.m dialogs/speed_limit_selection_window.h dialogs/speed_limit_selection_window.mm \
translations/English.lproj/Localizable.strings translations/English.lproj/MainMenu.nib/classes.nib \
translations/English.lproj/MainMenu.nib/info.nib translations/English.lproj/MainMenu.nib/keyedobjects.nib \
translations/French.lproj/Localizable.strings translations/French.lproj/MainMenu.nib/classes.nib \
translations/French.lproj/MainMenu.nib/info.nib translations/French.lproj/MainMenu.nib/keyedobjects.nib \
translations/Italian.lproj/Localizable.strings translations/Italian.lproj/MainMenu.nib/classes.nib \
translations/Italian.lproj/MainMenu.nib/info.nib translations/Italian.lproj/MainMenu.nib/keyedobjects.nib \
translations/Japanese.lproj/Localizable.strings translations/Japanese.lproj/MainMenu.nib/classes.nib \
translations/Japanese.lproj/MainMenu.nib/info.nib translations/Japanese.lproj/MainMenu.nib/keyedobjects.nib

Some files were not shown because too many files have changed in this diff Show More