From 527b98f6e7965f464c804ee5279855326c78dc6d Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Mon, 1 Oct 2012 02:24:42 +0300
Subject: [PATCH] release r2, update credits
---
Authors.md | 78 ++++++++++++++++++++++++++++++++++++++
Makefile.pandora | 2 +-
drivers/common/menu.c | 40 +++++++++++++++++--
drivers/pandora/readme.txt | 30 ++++-----------
4 files changed, 123 insertions(+), 27 deletions(-)
create mode 100644 Authors.md
diff --git a/Authors.md b/Authors.md
new file mode 100644
index 0000000..a1af648
--- /dev/null
+++ b/Authors.md
@@ -0,0 +1,78 @@
+Authors
+=======
+
+A list of people who have contributed code to FCE Ultra, or have had their code
+placed in FCE Ultra by others.
+
+Pre-2.0 FCE / FCE Ultra Contributors
+------------------------------------
+_These authors contributed exclusively to pre-2.0 versions,
+but much of their code remains in 2.0 builds_
+
+* BERO - bero at geocities.co.jp - Base FCE code.
+
+* Xodnizel - Most of the base FCE Ultra code
+
+* Aaron Oneal - http://www.morphgear.com - Many changes to compile with MSVC and first frame skipping code
+
+* Joe Nahmias - Man pages
+
+* Paul Kuliniewicz - kuliniew at purdue.edu - Various code for the original SDL port.
+
+* Quietust - quietust at ircN dot org - VRC7 "translation" code.
+
+* Ben Parnell - Windows debugging tools
+
+* Parasyte & bbitmaster - Enhanced Windows debugging tools
+
+* blip & nitsuja - Rerecording support
+
+FCEUX >= 2.0 Contributors
+-------------------------
+* SP - document thyself (sf:rheiny) - Enhanced Windows debugging tools
+
+* zeromus - mgambrell at gmail dot com (sf:zeromus) - Core architecture refactoring and merging - Windows driver maintenance
+
+* adelikat - document thyself (sf:adelikat) - UI cleanup, project management, Win32 features & maintenence, TAS tools, documentation
+
+* CaH4e3 - CaH4e3 at mail dot ru (sf: cah4e3) - Mappers
+
+* Luke Gustafson - (sf:???) - Windows TAS and movie recording enhancements
+
+* qfox - (sf:qfox) - lua scripting fucntions, luabot, basicbot (no longer implemented), various lua scripts
+
+* _mz - document thyself (mauzus) - Windows driver maintenance and cleanup
+
+* UncombedCoconut - UncombedCoconut at gmail dot com (sf:jeblanchard) - Build system and cross-compilation support - Driver maintenance and refactoring
+
+* DWEdit - Debugger additions
+
+* AnS - ansstuff at yandex dot ru (sf:ansstuff) - Bugfixes and additions, TAS Editor v1.0
+
+FCEUX (>=2.0) Linux/SDL Developers
+----------------------------------
+_These guys concentrated on keeping fceux the premiere linux/portable nes emu._
+
+* Lukas Sabota - ltsmooth42 at gmail dot com (sf:punkrockguy318) - Head FceuX-SDL developer - GTK GUI, complete overhaul of SDL port, build scripts; maintainence; docs
+
+* Shinydoofy - sf:shinydoofy - SDL maintenence
+
+* Soules - gimmedonutnow at gmail dot com (sf:gimmedonutnow) - Linux SDL driver maintenance
+
+* radsaq - radsaq at gmail dot com (sf:radsaq) - Build system, testing, and random cleanups
+
+* Bryan Cain - sf:plombo - Patch to embed SDL in the GTK+ GUI, miscellaneous other SDL and GTK+ contributions
+
+Included components:
+--------------------
+* Mitsutaka Okazaki - YM2413 emulator.
+
+* Andrea Mazzoleni - Scale2x/Scale3x scalers
+
+* Gilles Vollant - unzip.c PKZIP fileio
+
+ARM port (GPFCE)
+----------------
+* notaz - integration, UI, optimization
+* FCA author: asm 6502 core
+* M-HT: NEON scalers
diff --git a/Makefile.pandora b/Makefile.pandora
index ad56ca2..7c07eba 100644
--- a/Makefile.pandora
+++ b/Makefile.pandora
@@ -70,7 +70,7 @@ PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
VER ?= $(shell git describe master)
rel: fceu drivers/pandora/fceu.sh drivers/pandora/readme.txt drivers/pandora/skin \
- drivers/pandora/fceu.png drivers/pandora/fceu.pxml.templ COPYING
+ drivers/pandora/fceu.png drivers/pandora/fceu.pxml.templ COPYING Authors.md
rm -rf out
mkdir out
cp -r $^ out/
diff --git a/drivers/common/menu.c b/drivers/common/menu.c
index 4184b2e..6a7f795 100644
--- a/drivers/common/menu.c
+++ b/drivers/common/menu.c
@@ -27,6 +27,7 @@
#include "../../general.h"
#include "../../input.h"
#include "../../palette.h"
+#include "../../fce.h"
#include "revision.h"
#define array_size(x) (sizeof(x) / sizeof(x[0]))
@@ -507,14 +508,47 @@ static int menu_loop_options(int id, int keys)
// -------------- root menu --------------
+static void draw_frame_main(void)
+{
+ struct tm *tmp;
+ time_t ltime;
+ int capacity = -1;
+ char ltime_s[16];
+ char buff[128];
+ char *out;
+
+ if (!fceugi || !GameInterface)
+ return;
+
+ buff[0] = 0;
+ GameInterface(GI_INFOSTRING, buff);
+
+ smalltext_out16(4, 1, buff, 0xf7de);
+
+ if (plat_target.get_bat_capacity)
+ capacity = plat_target.get_bat_capacity();
+ ltime = time(NULL);
+ tmp = localtime(<ime);
+ strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp);
+ if (capacity >= 0) {
+ snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, capacity);
+ out = buff;
+ }
+ else
+ out = ltime_s;
+ smalltext_out16(4, 1 + me_sfont_h, out, 0xf7de);
+}
+
static const char credits_text[] =
"GPFCE " REV "\n"
"(c) notaz, 2007,2012\n\n"
- "Based on FCE Ultra versions\n"
- "0.81 and 0.98.1x\n\n"
+ "Based on various FCE Ultra\n"
+ " / FCEUX versions\n\n"
" - Credits -\n"
"Bero: FCE\n"
"Xodnizel: FCE Ultra\n"
+ "FCEUX team: FCEUX\n"
+ "CaH4e3: mappers\n"
"FCA author: 6502 core\n"
"M-HT: NEON scalers\n";
@@ -619,7 +653,7 @@ int menu_loop(void)
in_set_config_int(0, IN_CFG_BLOCKING, 1);
do {
- me_loop_d(e_menu_main, &sel, NULL, NULL);
+ me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);
} while (!fceugi && menu_loop_ret == 0);
/* wait until menu, ok, back is released */
diff --git a/drivers/pandora/readme.txt b/drivers/pandora/readme.txt
index 25a2c46..9ba6c87 100644
--- a/drivers/pandora/readme.txt
+++ b/drivers/pandora/readme.txt
@@ -110,6 +110,11 @@ extension instead of .ips.
--------------------------------------------------------------------
+r2
+ - Fixed memory corruption during savestate save
+ - Merged latest mapper (and some other) code from FCEUX/FCEU-mm
+ - Some minor tweaks/bugfixes
+
r1 (for pandora)
- Ported to pandora, unified the code.
- Added M-HT's filters and some pandora specific options/tweaks.
@@ -231,34 +236,13 @@ ver 0.1 5/23/2006 MD5SUM: 13681f25713ad04c535c23f8c61f1e0b *gpfce
------------------------------------------------------------------
- Original base code of FCE Ultra by Xodnizel, Bero.
+- Various improvements by FCEUX/FCEU-mm authors (see Authors.md)
- Porting/optimization/integration/frontend for 0.3 and 0.4 by notaz.
- Versions 0.1 and 0.2 by zzhu8192 (http://www.unicorn-jockey.com).
- asm CPU core from FCA and Little John GP32.
-- Minimal library by rlyeh.
-- Additional low-level GP2X libs by Hermes/PS2Reality, theoddbot,
- god_at_hell, Puck2099.
additional thanks:
-- Cruel and DaveC from gp32x boards for beta testing.
-- All FCE Ultra contributors listed in
- http://fceultra.sourceforge.net/docs.php
+- All FCE Ultra/FCEUX contributors listed in Authors.md
...and everyone whose name my mind has misplaced.
-zzhu8192's thanks:
-- To lots of talented developers on the http://www.gp32x.com/board/
- Reesy, Squidge, etc. for responding to my technical questions.
-- Thanks to
-- Lil-kun - for the neat GPFCE logo and the Web Site (under construction) :D
-- Referenced source code from MameGP2X (Franxis) and FCEU-0.3 gp2x (Noname)
-- Awesome wiki: http://wiki.gp2x.org/wiki/Main_Page
-- Awesome gp2x site: http://www.gp32x.com/
-- ryleh's minimal lib - w/o which this wouldn't have worked
-- FCE Ultra developers (http://fceultra.sourceforge.net/)
- for the wonderful and feature rich NES emulator.
-- kounch for Selector frontend - works great for lazy developers like me. :-D
- I have sent my changes to kounch, so hopefully the changes will make it into
- version 1.2 or later.
-- gp2x community - just plain rocks
-
-
--
2.39.5