diff options
author | Automerge Bot <bot@example.com> | 2022-03-12 03:19:45 +0300 |
---|---|---|
committer | Automerge Bot <bot@example.com> | 2022-03-12 03:19:45 +0300 |
commit | 2547ccab29eb2abff9d97b38fa9b13699809b74e (patch) | |
tree | c666508dd65bc47fbd3feb9cb18939ef38f52684 | |
parent | 18651dae16bb9673b29f091ded1c2b446dca9270 (diff) | |
parent | 9b6ab85424998a33be39e23b880083c93b9bd9ff (diff) |
Merge branch 'master' of https://github.com/TASVideos/fceux into coolgirl
26 files changed, 48 insertions, 44 deletions
diff --git a/pipelines/debpkg.pl b/pipelines/debpkg.pl index aa929b79..758e5d02 100755 --- a/pipelines/debpkg.pl +++ b/pipelines/debpkg.pl @@ -2,7 +2,7 @@ use strict; -my $VERSION="2.6.3"; +my $VERSION="2.6.4"; my $INSTALL_PREFIX="/tmp/fceux"; my $CTL_FILENAME="$INSTALL_PREFIX/DEBIAN/control"; my $ARCH="amd64"; diff --git a/pipelines/macOS_build.sh b/pipelines/macOS_build.sh index 6689e47b..e4ef91fa 100755 --- a/pipelines/macOS_build.sh +++ b/pipelines/macOS_build.sh @@ -10,7 +10,7 @@ QT_MAJOR=5; QT_PKGNAME=qt$QT_MAJOR; FCEUX_VERSION_MAJOR=2 FCEUX_VERSION_MINOR=6 -FCEUX_VERSION_PATCH=3 +FCEUX_VERSION_PATCH=4 SDL2_VERSION=2.0.20 SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd ); @@ -8,8 +8,8 @@ Interim builds: * Win32: [fceux.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux.zip?branch=master&job=Windows%2032) * Win64: [fceux64.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux64.zip?branch=master&job=Windows%2064) * Win64 Qt/SDL: [qfceux64.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/qfceux64.zip?branch=master&job=Win64%20Qt) -* Ubuntu: [fceux-2.6.3-amd64.deb](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.3-amd64.deb?branch=master&job=Ubuntu) -* MacOSX: [fceux-2.6.3-Darwin.dmg](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.3-Darwin.dmg?branch=master&job=MacOS) +* Ubuntu: [fceux-2.6.4-amd64.deb](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.4-amd64.deb?branch=master&job=Ubuntu) +* MacOSX: [fceux-2.6.4-Darwin.dmg](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.4-Darwin.dmg?branch=master&job=MacOS) * Status: [Appveyor](https://ci.appveyor.com/project/zeromus/fceux/) But you might like mesen more: https://github.com/SourMesen/Mesen diff --git a/src/config.cpp b/src/config.cpp index b99a1e29..66157634 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -23,13 +23,13 @@ const char *FCEUI_GetAboutString(void) const char *aboutTemplate =
FCEU_NAME_AND_VERSION "\n\n"
"Administrators:\n"
- "zeromus, mjbudd77, feos\n"
+ "zeromus, feos\n"
"\n"
"Current Contributors:\n"
"CaH4e3, rainwarrior, owomomo, punkrockguy318\n"
"\n"
"Past Contributors:\n"
- "xhainingx, gocha, AnS\n"
+ "xhainingx, gocha, AnS, mjbudd77\n"
"\n"
"FCEUX 2.0:\n"
"mz, nitsujrehtona, SP, Ugly Joe,\n"
diff --git a/src/drivers/Qt/AboutWindow.cpp b/src/drivers/Qt/AboutWindow.cpp index 847b424c..519951a3 100644 --- a/src/drivers/Qt/AboutWindow.cpp +++ b/src/drivers/Qt/AboutWindow.cpp @@ -62,6 +62,7 @@ static const char *Authors[] = { "\t mjbudd77", "\t Lukas Sabota //punkrockguy318", "\t Soules", "\t Bryan Cain", "\t radsaq", "\t Shinydoofy", + "\nQt GUI written by mjbudd77\n", "FceuX 2.0 Developers:", "\t SP", "\t zeromus", "\t adelikat", "\t caH4e3", "\t qfox", "\t Luke Gustafson", "\t _mz", "\t UncombedCoconut", "\t DwEdit", "\t AnS", @@ -253,7 +254,7 @@ AboutWindow::~AboutWindow(void) //---------------------------------------------------------------------------- void AboutWindow::closeEvent(QCloseEvent *event) { - printf("About Window Close Event\n"); + //printf("About Window Close Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/AviRiffViewer.cpp b/src/drivers/Qt/AviRiffViewer.cpp index 01f2e73c..6d1e6afa 100644 --- a/src/drivers/Qt/AviRiffViewer.cpp +++ b/src/drivers/Qt/AviRiffViewer.cpp @@ -148,7 +148,7 @@ AviRiffViewerDialog::AviRiffViewerDialog(QWidget *parent) //---------------------------------------------------------------------------- AviRiffViewerDialog::~AviRiffViewerDialog(void) { - printf("Destroy AVI RIFF Viewer Window\n"); + //printf("Destroy AVI RIFF Viewer Window\n"); if ( avi ) { @@ -158,7 +158,7 @@ AviRiffViewerDialog::~AviRiffViewerDialog(void) //---------------------------------------------------------------------------- void AviRiffViewerDialog::closeEvent(QCloseEvent *event) { - printf("AVI RIFF Viewer Window Event\n"); + //printf("AVI RIFF Viewer Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/ConsoleDebugger.cpp b/src/drivers/Qt/ConsoleDebugger.cpp index 9198056b..bd8df0ff 100644 --- a/src/drivers/Qt/ConsoleDebugger.cpp +++ b/src/drivers/Qt/ConsoleDebugger.cpp @@ -5298,7 +5298,10 @@ bool QAsmView::event(QEvent *event) addr, bank, romOfs ); } - static_cast<asmLookAheadPopup*>(fceuCustomToolTipShow( helpEvent->globalPos(), new asmLookAheadPopup(addr, this) )); + if ( static_cast<asmLookAheadPopup*>(fceuCustomToolTipShow( helpEvent->globalPos(), new asmLookAheadPopup(addr, this) )) == NULL ) + { + printf("ASM Lookahead Popup Error\n"); + } //QToolTip::showText(helpEvent->globalPos(), tr(stmp), this ); QToolTip::hideText(); event->ignore(); diff --git a/src/drivers/Qt/ConsoleSoundConf.cpp b/src/drivers/Qt/ConsoleSoundConf.cpp index 5d7e836c..709ed3c7 100644 --- a/src/drivers/Qt/ConsoleSoundConf.cpp +++ b/src/drivers/Qt/ConsoleSoundConf.cpp @@ -288,13 +288,13 @@ ConsoleSndConfDialog_t::ConsoleSndConfDialog_t(QWidget *parent) //---------------------------------------------------- ConsoleSndConfDialog_t::~ConsoleSndConfDialog_t(void) { - printf("Destroy Sound Config Window\n"); + //printf("Destroy Sound Config Window\n"); updateTimer->stop(); } //---------------------------------------------------------------------------- void ConsoleSndConfDialog_t::closeEvent(QCloseEvent *event) { - printf("Sound Config Close Window Event\n"); + //printf("Sound Config Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/ConsoleVideoConf.cpp b/src/drivers/Qt/ConsoleVideoConf.cpp index 36a15789..0c45f2f3 100644 --- a/src/drivers/Qt/ConsoleVideoConf.cpp +++ b/src/drivers/Qt/ConsoleVideoConf.cpp @@ -534,14 +534,14 @@ ConsoleVideoConfDialog_t::ConsoleVideoConfDialog_t(QWidget *parent) //---------------------------------------------------- ConsoleVideoConfDialog_t::~ConsoleVideoConfDialog_t(void) { - printf("Destroy Video Config Window\n"); + //printf("Destroy Video Config Window\n"); updateTimer->stop(); } //---------------------------------------------------------------------------- void ConsoleVideoConfDialog_t::closeEvent(QCloseEvent *event) { - printf("Video Config Close Window Event\n"); + //printf("Video Config Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/FamilyKeyboard.cpp b/src/drivers/Qt/FamilyKeyboard.cpp index ff512c78..6557b983 100644 --- a/src/drivers/Qt/FamilyKeyboard.cpp +++ b/src/drivers/Qt/FamilyKeyboard.cpp @@ -994,7 +994,7 @@ void FKBConfigDialog::toggleFamilyKeyboardEnable(void) //---------------------------------------------------------------------------- void FKBConfigDialog::closeEvent(QCloseEvent *event) { - printf("FKB Config Close Window Event\n"); + //printf("FKB Config Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/GameGenie.cpp b/src/drivers/Qt/GameGenie.cpp index b575b4ba..fbfbc3b6 100644 --- a/src/drivers/Qt/GameGenie.cpp +++ b/src/drivers/Qt/GameGenie.cpp @@ -243,7 +243,7 @@ GameGenieDialog_t::~GameGenieDialog_t(void) //---------------------------------------------------------------------------- void GameGenieDialog_t::closeEvent(QCloseEvent *event) { - printf("Game Genie Close Window Event\n"); + //printf("Game Genie Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/GamePadConf.cpp b/src/drivers/Qt/GamePadConf.cpp index 9ff97691..278e00af 100644 --- a/src/drivers/Qt/GamePadConf.cpp +++ b/src/drivers/Qt/GamePadConf.cpp @@ -935,7 +935,7 @@ void GamePadConfDialog_t::closeEvent(QCloseEvent *event) return; } - printf("GamePad Close Window Event\n"); + //printf("GamePad Close Window Event\n"); buttonConfigStatus = 0; done(0); deleteLater(); @@ -959,7 +959,7 @@ void GamePadConfDialog_t::closeWindow(void) return; } - printf("Close Window\n"); + //printf("Close Window\n"); buttonConfigStatus = 0; done(0); deleteLater(); diff --git a/src/drivers/Qt/GuiConf.cpp b/src/drivers/Qt/GuiConf.cpp index f2318eff..24dea68e 100644 --- a/src/drivers/Qt/GuiConf.cpp +++ b/src/drivers/Qt/GuiConf.cpp @@ -263,12 +263,12 @@ GuiConfDialog_t::GuiConfDialog_t(QWidget *parent) //---------------------------------------------------- GuiConfDialog_t::~GuiConfDialog_t(void) { - printf("Destroy GUI Config Close Window\n"); + //printf("Destroy GUI Config Close Window\n"); } //---------------------------------------------------------------------------- void GuiConfDialog_t::closeEvent(QCloseEvent *event) { - printf("GUI Config Close Window Event\n"); + //printf("GUI Config Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp index 090dc233..0c763382 100644 --- a/src/drivers/Qt/HexEditor.cpp +++ b/src/drivers/Qt/HexEditor.cpp @@ -1018,7 +1018,7 @@ HexEditorFindDialog_t::~HexEditorFindDialog_t(void) //---------------------------------------------------------------------------- void HexEditorFindDialog_t::closeEvent(QCloseEvent *event) { - printf("Hex Editor Close Window Event\n"); + //printf("Hex Editor Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/HotKeyConf.cpp b/src/drivers/Qt/HotKeyConf.cpp index 13465315..118fb4f7 100644 --- a/src/drivers/Qt/HotKeyConf.cpp +++ b/src/drivers/Qt/HotKeyConf.cpp @@ -104,12 +104,12 @@ HotKeyConfDialog_t::HotKeyConfDialog_t(QWidget *parent) //---------------------------------------------------------------------------- HotKeyConfDialog_t::~HotKeyConfDialog_t(void) { - printf("Destroy Hot Key Config Window\n"); + //printf("Destroy Hot Key Config Window\n"); } //---------------------------------------------------------------------------- void HotKeyConfDialog_t::closeEvent(QCloseEvent *event) { - printf("Hot Key Close Window Event\n"); + //printf("Hot Key Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/InputConf.cpp b/src/drivers/Qt/InputConf.cpp index ec1cfb0a..ca8ddb5c 100644 --- a/src/drivers/Qt/InputConf.cpp +++ b/src/drivers/Qt/InputConf.cpp @@ -259,7 +259,7 @@ InputConfDialog_t::InputConfDialog_t(QWidget *parent) //---------------------------------------------------------------------------- InputConfDialog_t::~InputConfDialog_t(void) { - printf("Destroy Input Config Window\n"); + //printf("Destroy Input Config Window\n"); inputTimer->stop(); if (win == this) @@ -270,7 +270,7 @@ InputConfDialog_t::~InputConfDialog_t(void) //---------------------------------------------------------------------------- void InputConfDialog_t::closeEvent(QCloseEvent *event) { - printf("Input Config Close Window Event\n"); + //printf("Input Config Close Window Event\n"); done(0); deleteLater(); event->accept(); @@ -386,7 +386,7 @@ void InputConfDialog_t::expSelect(int index) void InputConfDialog_t::fourScoreChanged(int state) { int value = (state == Qt::Unchecked) ? 0 : 1; - printf("Set 'SDL.FourScore' = %i\n", value); + //printf("Set 'SDL.FourScore' = %i\n", value); g_config->setOption("SDL.FourScore", value); setInputs(); diff --git a/src/drivers/Qt/MovieOptions.cpp b/src/drivers/Qt/MovieOptions.cpp index 8db9ad5e..a9e481ee 100644 --- a/src/drivers/Qt/MovieOptions.cpp +++ b/src/drivers/Qt/MovieOptions.cpp @@ -172,12 +172,12 @@ MovieOptionsDialog_t::MovieOptionsDialog_t(QWidget *parent) //---------------------------------------------------------------------------- MovieOptionsDialog_t::~MovieOptionsDialog_t(void) { - printf("Destroy Movie Options Window\n"); + //printf("Destroy Movie Options Window\n"); } //---------------------------------------------------------------------------- void MovieOptionsDialog_t::closeEvent(QCloseEvent *event) { - printf("Movie Options Close Window Event\n"); + //printf("Movie Options Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/PaletteConf.cpp b/src/drivers/Qt/PaletteConf.cpp index c7c54b8b..58557ec3 100644 --- a/src/drivers/Qt/PaletteConf.cpp +++ b/src/drivers/Qt/PaletteConf.cpp @@ -326,13 +326,13 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent) //---------------------------------------------------- PaletteConfDialog_t::~PaletteConfDialog_t(void) { - printf("Destroy Palette Config Window\n"); + //printf("Destroy Palette Config Window\n"); updateTimer->stop(); } //---------------------------------------------------------------------------- void PaletteConfDialog_t::closeEvent(QCloseEvent *event) { - printf("Palette Config Close Window Event\n"); + //printf("Palette Config Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/PaletteEditor.cpp b/src/drivers/Qt/PaletteEditor.cpp index fba0b135..48e40faf 100644 --- a/src/drivers/Qt/PaletteEditor.cpp +++ b/src/drivers/Qt/PaletteEditor.cpp @@ -1369,7 +1369,7 @@ nesPalettePickerDialog::nesPalettePickerDialog( int idx, QWidget *parent) //---------------------------------------------------------------------------- nesPalettePickerDialog::~nesPalettePickerDialog(void) { - printf("Destroy Palette Editor Config Window\n"); + //printf("Destroy Palette Editor Config Window\n"); } //---------------------------------------------------------------------------- void nesPalettePickerDialog::closeEvent(QCloseEvent *event) diff --git a/src/drivers/Qt/RamSearch.cpp b/src/drivers/Qt/RamSearch.cpp index 3a916fd5..40242c02 100644 --- a/src/drivers/Qt/RamSearch.cpp +++ b/src/drivers/Qt/RamSearch.cpp @@ -530,7 +530,7 @@ RamSearchDialog_t::~RamSearchDialog_t(void) //---------------------------------------------------------------------------- void RamSearchDialog_t::closeEvent(QCloseEvent *event) { - printf("RAM Search Close Window Event\n"); + //printf("RAM Search Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/SymbolicDebug.cpp b/src/drivers/Qt/SymbolicDebug.cpp index 50e211c1..4e4e772f 100644 --- a/src/drivers/Qt/SymbolicDebug.cpp +++ b/src/drivers/Qt/SymbolicDebug.cpp @@ -1362,7 +1362,7 @@ SymbolEditWindow::~SymbolEditWindow(void) //-------------------------------------------------------------- void SymbolEditWindow::closeEvent(QCloseEvent *event) { - printf("Debugger Close Window Event\n"); + //printf("Symbolic Debug Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp index 14f61e1c..3d919a92 100644 --- a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp +++ b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp @@ -6261,7 +6261,7 @@ void QPianoRoll::paintEvent(QPaintEvent *event) FCEU_CRITICAL_SECTION( emuLock ); int x, y, row, nrow, lineNum; QPainter painter(this); - QColor white(255,255,255), black(0,0,0), blkColor, rowTextColor, hdrGridColor; + QColor /*white(255,255,255),*/ black(0,0,0), blkColor, rowTextColor, hdrGridColor; static const char *buttonNames[] = { "A", "B", "S", "T", "U", "D", "L", "R", NULL }; char stmp[32]; char rowIsSel=0; diff --git a/src/drivers/Qt/TasEditor/bookmarks.cpp b/src/drivers/Qt/TasEditor/bookmarks.cpp index 209d35e4..f2880b94 100644 --- a/src/drivers/Qt/TasEditor/bookmarks.cpp +++ b/src/drivers/Qt/TasEditor/bookmarks.cpp @@ -525,7 +525,7 @@ void BOOKMARKS::paintEvent(QPaintEvent *event) FCEU_CRITICAL_SECTION( emuLock );
QPainter painter(this);
int x, y, item, cell_y;
- QColor white(255,255,255), black(0,0,0), blkColor;
+ QColor white(255,255,255), /*black(0,0,0),*/ blkColor;
char txt[256];
bool timeColBgDone = false;
diff --git a/src/drivers/Qt/TimingConf.cpp b/src/drivers/Qt/TimingConf.cpp index 08cf5156..e442d779 100644 --- a/src/drivers/Qt/TimingConf.cpp +++ b/src/drivers/Qt/TimingConf.cpp @@ -265,14 +265,14 @@ TimingConfDialog_t::TimingConfDialog_t(QWidget *parent) //---------------------------------------------------------------------------- TimingConfDialog_t::~TimingConfDialog_t(void) { - printf("Destroy Timing Config Window\n"); + //printf("Destroy Timing Config Window\n"); updateTimer->stop(); saveValues(); } //---------------------------------------------------------------------------- void TimingConfDialog_t::closeEvent(QCloseEvent *event) { - printf("Timing Close Window Event\n"); + //printf("Timing Close Window Event\n"); done(0); deleteLater(); event->accept(); diff --git a/src/drivers/Qt/TraceLogger.cpp b/src/drivers/Qt/TraceLogger.cpp index 8b1017bd..1d4c6f28 100644 --- a/src/drivers/Qt/TraceLogger.cpp +++ b/src/drivers/Qt/TraceLogger.cpp @@ -406,7 +406,7 @@ TraceLoggerDialog_t::~TraceLoggerDialog_t(void) traceLogWindow = NULL; - printf("Trace Logger Window Deleted\n"); + //printf("Trace Logger Window Deleted\n"); } //---------------------------------------------------- void TraceLoggerDialog_t::closeEvent(QCloseEvent *event) @@ -558,7 +558,7 @@ void TraceLoggerDialog_t::openLogFile(void) QString filename; QFileDialog dialog(this, tr("Select Log File")); - printf("Log File Select\n"); + //printf("Log File Select\n"); dialog.setFileMode(QFileDialog::AnyFile); @@ -2481,7 +2481,7 @@ TraceLogDiskThread_t::TraceLogDiskThread_t( QObject *parent ) //---------------------------------------------------- TraceLogDiskThread_t::~TraceLogDiskThread_t(void) { - printf("Disk Thread Cleanup\n"); + //printf("Disk Thread Cleanup\n"); #ifdef WIN32 if (logFile != INVALID_HANDLE_VALUE) { @@ -2509,7 +2509,7 @@ void TraceLogDiskThread_t::run(void) int i,idx=0; int blockSize = 4 * 1024; - printf("Trace Log Disk Start\n"); + //printf("Trace Log Disk Start\n"); setPriority( QThread::HighestPriority ); @@ -2606,7 +2606,7 @@ void TraceLogDiskThread_t::run(void) } #endif - printf("Trace Log Disk Exit\n"); + //printf("Trace Log Disk Exit\n"); emit finished(); } //---------------------------------------------------- diff --git a/src/version.h b/src/version.h index 7c69be96..8050a281 100644 --- a/src/version.h +++ b/src/version.h @@ -62,14 +62,14 @@ #define FCEU_VERSION_MAJOR 2
#define FCEU_VERSION_MINOR 6
-#define FCEU_VERSION_PATCH 3
+#define FCEU_VERSION_PATCH 4
#define FCEU_VERSION_NUMERIC ( (FCEU_VERSION_MAJOR*10000) + (FCEU_VERSION_MINOR*100) + (FCEU_VERSION_PATCH) )
#define FCEU_VERSION_MAJOR_DECODE(x) ( (x / 10000) )
#define FCEU_VERSION_MINOR_DECODE(x) ( (x / 100) % 100 )
#define FCEU_VERSION_PATCH_DECODE(x) (x % 100)
-#define FCEU_VERSION_STRING "2.6.3" FCEU_SUBVERSION_STRING FCEU_FEATURE_STRING FCEU_COMPILER
+#define FCEU_VERSION_STRING "2.6.4" FCEU_SUBVERSION_STRING FCEU_FEATURE_STRING FCEU_COMPILER
#define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING
#endif
|