Scott Knauert
990d14f8fc
Changed open_rom() API. Updated its use in main and the Gtk GUI accordingly. Removed Gtk GUI title change to previous - rom internal name when loading via the file chooser since its silly and we don't do it when loading roms other ways. Moved open_rom() and close_rom() to rom.c and cleaned up the merged open_rom()/rom_read() function consolidating code, fixing a seg fault when the .ini couldn't assign a goodname to the loading rom.
2008-06-26 21:02:53 +00:00
Richard Goedeken
65de6b5d79
fixed OSD crash bug after running a game, disabling OSD, then running another game
2008-06-26 20:01:33 +00:00
Richard Goedeken
4bf03541d0
A few small changes to the new messaging code: dont use newlines in message strings, print to console even if gui is enabled, OSD pause message should be in center, print config/install dir info message to console. Small bugfix in gtk gui statusbar variable-arg code
2008-06-26 02:57:21 +00:00
Richard Goedeken
eaa7093f42
reverted commit 677, which introduced a bug which causes very bad things to happen if you run the same game twice. I suspect this is related to the g_MemHasBeenBSwapped mechanism which was removed in this commit, but there were too many changes to pinpoint the exact cause
2008-06-26 01:10:56 +00:00
Scott Knauert
d607893707
Tied rcs messages with new main_messaging system. Fixed longstanding rcs Gtk GUI bug (cannot load rom via play button), added multifile zip support, cleaned up rom loading functions.
2008-06-25 19:48:49 +00:00
Scott Knauert
059fcd3989
Fixed inability to configure plugins in GUI due to call order in main() from last commit.
2008-06-23 13:46:29 +00:00
Scott Knauert
b39789413d
Minor changes to how GUI=NONE is built, mainly to strip out unneeded RCS code. Also since info_message is not needed (and ideally its friends will be phased out too) removed that and the no-op gui functions in guifuncs.c since its confusing and hacky when working in main.
2008-06-23 11:15:04 +00:00
Scott Knauert
b2c2462587
Integrated 2 icons out of 4 icons into theme which I missed, deleted 2 extra unused icons. We now actually make use of the config integration with MainWindowWidth/Height. Many Gtk GUI statusbar improvements. Implemented a unified console/GUI/OSB main_message function as per Richards suggestions. This is a little rough, I'd like suggestions to improve it and include the confirm message code.
2008-06-23 05:32:45 +00:00
Scott Knauert
ec306a5b63
Fixed eeprom issue crash for nogui version due to database RCS dependence. Set default savestate to 0. Savestate now persistent via config integration. Integrated sort column and method with config. Minor speedup to sorting.
2008-06-22 16:20:06 +00:00
Richard Goedeken
9cda3e9d69
dont launch rom cache thread when emulator is in nogui mode. Fixed null pointer access in rom.c
2008-06-22 04:21:55 +00:00
Jesse Dean
59a83f1030
Added version number to information displayed on stdout
2008-06-20 08:07:20 +00:00
Richard Goedeken
9eebbdb55b
Rom Cache System has landed in the trunk.
2008-06-19 04:29:35 +00:00
Richard Goedeken
62da9e3122
refactored the recent speed/pause/advance changes to be a bit more object oriented. Instead of making the local variables global and spreading the code around in the files, write new global functions which manipulate the local variables and can be called from other places. This also decreases source code size slightly
2008-06-19 02:13:26 +00:00
Jesse Dean
ec94be6322
Added speedup, slowdown, pause and frame advance to LIRC support
2008-06-18 18:52:17 +00:00
Richard Goedeken
c0853c464b
fix LIRC build to integrate w/ new screenshot mechanism; some refactoring
2008-06-18 01:56:30 +00:00
Richard Goedeken
8355b89053
put some sanity back into the save slot numbering scheme
2008-06-15 02:54:01 +00:00
Scott Knauert
3938f7024d
Added a toggle for the Gtk GUI which turns OSD on or off without restarting. Documented --noosd flag. Integrated with config file. Removed old Gtk GUI config defaults from mupen64plus.conf which are no longer used (and haven't been since ~r420). Config overridden on startup by commandline flag so no loss of function for nogui users.
2008-06-14 04:15:17 +00:00
Richard Goedeken
38e92c3a76
Merged r0286-debugger branch into trunk
2008-06-06 18:25:59 +00:00
Richard Goedeken
44738c78b2
Removed NoAudioDelay core option to resolve issue #48 . The Mupen64 v0.5 readme.pdf states that this option is not needed for Mupen64 v0.5, so I believe that it is unnecessary and can be removed
2008-06-03 03:43:00 +00:00
Richard Goedeken
88de0f7f80
bugfixes in OSD: no screenshots when OSD was disabled, adding new messages to OSD list even when OSD was disabled
2008-05-30 04:17:46 +00:00
Richard Goedeken
962a58f6ff
A few OSD changes: disable OSD with option --noosd, replaced font with Bitstream Vera sans-serif font, used slightly smaller font size which is now also proportional to screen size. Tested with 640x480 and 1280x960
2008-05-28 03:53:32 +00:00
Richard Goedeken
85b700e9cb
Moved osd.cpp from main/ into opengl/, moved screenshot code from main.c into opengl/screenshot.cpp, refactored screenshot mechanism to grab screenshots without the OSD overlay
2008-05-18 20:54:10 +00:00
Richard Goedeken
12842f44b8
New feature: On Screen Display. Merged branch r0261-OSD-ebenblues up until rev 450 into trunk
2008-05-16 04:46:48 +00:00
Scott Knauert
eb8755b000
Overhaul of rom handling functions.
...
- Calculating MD5 in Gtk GUI rom properties dialogue now works.
- Gtk GUI open rom filter now has .z64, .v64, and .n64 extensions.
- Rom file decompression handled at single point (as opposed to
2-3) to prevent duplication of code and make adding 7zip support easier.
- General code cleanup, renaming / comments, etc.
Testing done:
- Tested .zipped (singe and multifile archives), .gzipped, and
uncompressed .z64 amd .v64 roms.
2008-05-11 08:20:37 +00:00
Jesse Dean
4a0ae5000f
Resubmitting fixes to debugger.
2008-04-30 23:34:47 +00:00
James Hood
53b40c8cd5
-cleaned up save state autoincrement feature.
...
-added joystick mapping support for incrementing the save state slot.
2008-04-26 00:57:37 +00:00
James Hood
2ead0b2a03
converted emulator playback speed printf's to info_message calls so they don't clutter up the console
2008-04-24 19:53:31 +00:00
Richard Goedeken
eea1e01066
renamed static variables in main.c to replace the incorrect g_ (global) prefix with l_ for local
2008-04-24 04:38:13 +00:00
Richard Goedeken
7cc1373c60
Added 2 small features to support regression test. One is to count frame numbers and print current frame for each screenshot taken. Second is to accept new parameter --testshots with comma-separated list of frames at which to take screenshots. Tested with all 3 video plugins and PNG md5sums match between manual and automatic screenshots
2008-04-24 04:15:44 +00:00
Richard Goedeken
7be0f6a771
simplified screenshot naming code. change spaces to underscores instead of removing. fixed bug
2008-04-23 13:30:58 +00:00
Richard Goedeken
47623cc7e6
reverted changes in 287 because debugger has a branch
2008-04-23 12:29:16 +00:00
Jesse Dean
e2fb5b7dd2
Initial cleanup of debugger & gtk gui code to allow use of DBG=1 flag. Code now compiles, and debugger shows up,
...
although at this time it does little else, and does prevent emulation from running properly. --Jes
2008-04-23 11:25:24 +00:00
Scott Gorman
a0b5b1b830
added a lowercase function. changes a string to lowercase.
...
stub: void lowercase(char string[]);
modified the screenshot function to use the roms header (without spaces, and converted to lowercase) name:
example: supermario64_001.png
2008-04-23 06:05:55 +00:00
Richard Goedeken
578f272278
Reworked screenshot mechanism. Now screenshots are retrieved from video plugins with ReadScreen instead of CaptureScreen, and compressed/saved from main core instead of plugins. Fixed 64-bit bug in Glide64.
2008-04-23 03:59:09 +00:00
James Hood
605a4a02b1
Changed pause/continue keyboard shortcut to Pause/Break key because the previous shortcut 'p' was conflicting with the new rom filter.
2008-04-22 20:49:45 +00:00
Richard Goedeken
6adfa80ecf
reverted commits 262-267 in trunk
2008-04-22 11:59:50 +00:00
John Chadwick
d54963521e
Needs more work, because it doesn't work, but this is the outline of status message support.
2008-04-22 05:58:11 +00:00
John Chadwick
8e58d6c774
Fixes compile errors since last revision
2008-04-22 04:49:24 +00:00
Scott Gorman
d029a9054a
added functions for maintaining a list of TXT_OBJECTS
...
#define TXTOBJECTSIZE 12
2008-04-22 04:27:26 +00:00
James Hood
64fcb851fe
-Moved ability for start emulation to also continue emulation (committed in r237) to startEmulation function of main/main.c, so other gui's don't have to re-implement it.
...
-Also removed gui code that tries to change the name of the pause toolbar item to either "Pause" or "Resume". I think most users understand that the pause key will also unpause. Plus the name can get out of sync due to the many alternative ways to pause/continue emulation (lirc, keyboard shortcut, mapped controller button).
2008-04-19 23:32:34 +00:00
James Hood
175cbb86a3
whitespace changes
2008-04-18 16:47:11 +00:00
Richard Goedeken
22b3a8bf97
removed unnecessary if statement. forced rompause=0 instead of calling pauseContinueEmulation to avoid getting messages when stepping frames
2008-04-18 00:19:10 +00:00
Scott Gorman
e5bb344109
Added frame advanced feature, press '/' or '?' to advance a frame and pause the game (great for recording TAS videos).
2008-04-17 18:29:08 +00:00
Richard Goedeken
cbc32cb208
Removed unused LimitFPS option
2008-04-17 15:27:04 +00:00
Richard Goedeken
2d8be8299c
Merged r0177-speed-change branch into trunk
2008-04-17 15:15:41 +00:00
James Hood
f6d65f0ab6
-Added multi-threading support to gtk gui. This allows info_message, confirm_message, alert_message functions to safely be called from any thread.
...
-I also changed the name of gui_parseArgs to gui_init, which will affect the kde4 gui code slightly when it's merged back into trunk.
2008-04-15 23:38:29 +00:00
Richard Goedeken
9f10d202be
Reverted all changes on trunk from rev 189. The reason why I made a branch was so that you would not commit these things on the trunk.
2008-04-14 11:29:15 +00:00
John Chadwick
ec8445cc55
Attempt 3 at commiting the patches.
...
THIS PATCH IS PRELIMINARY AND DOES NOT WORK.
It also needs some major cleanup and most plugins are not yet compiling. Going to need any help I can get here, but I'll be working on it.
2008-04-14 04:37:57 +00:00
Richard Goedeken
2fbc704681
Reverted speed changing / fast forward code in commit 178. This is now on a branch
2008-04-11 01:05:18 +00:00
Scott Gorman
e38581339a
Added FPS_Modifier functions, however due to plugin code, if you do not disable audio sync in your plugin configuration, the modifiers will not work and may make gameplay choppy. I suggest we write a small GUI for jttl audio, and disable audio sync by default.
2008-04-10 14:40:51 +00:00
