Commit graph

68 commits

Author SHA1 Message Date
Richard Goedeken
0ea1338a35 added missing header include in main.c 2008-07-12 12:34:36 +00:00
Richard Goedeken
299f754fd6 Merged many bugfixes from trunk revs 587 to 694 into v1.4-branch. Details are in RELEASE file 2008-06-29 14:45:57 +00:00
Richard Goedeken
a28732db72 merge fix in trunk rev 619 into v1.4 branch: fix LIRC build to integrate w/ new screenshot mechanism; some refactoring 2008-06-18 01:58:44 +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
James Hood
13bc1f9744 D'oh, my last implementation of GS Button didn't work because of how SDL handles keyup events. I had to change the implementation. Now there's a function in cheat.c that will allow you to query whether the GS button is pressed or not. 2008-04-09 20:33:20 +00:00
James Hood
0165af30c5 -Added global variable representing whether the Gameshark button is pressed or not.
-Added 'g' shortcut key that will act as the Gameshark button.
-Added user ability to map a joystick button to the Gameshark button.

Note, I did not add support for the Gameshark button to the emulator core yet, so cheats triggered by the GS button will not work until that's done.
2008-04-09 17:11:00 +00:00
James Hood
5f40aa84cc -major cleanup of the cheat code.
-Changed name of cheat config file to cheats.cfg. File is now read in on startup and written out on exit.
-Changed cheat config file format to the following:

{Some Game's CRC}
name=Some Game

[Cheat Name 1]
enabled=1
XXXXXXXX YYYY <-- cheat code (address, new value)
XXXXXXXX YYYY
XXXXXXXX YYYY

[Cheat Name 2]
enabled=0
XXXXXXXX YYYY
XXXXXXXX YYYY
XXXXXXXX YYYY

{Another Game's CRC}
name=Another Game
...

Here's the cheats.cfg I used for testing:

{635a2bff 8b022326}
name=SUPER MARIO 64

[Super Mega Jumps]
enabled=1
8133b176 0008

[Jesus Mode Mario]
enabled=1
81381764 0800
81381766 0024
81000090 3c04
81000092 8034
81000094 8484
81000096 b1e6
81000098 4484
8100009a 3000
810000a0 4680
810000a2 3120
810000a4 4604
810000a6 903c
810000ac 4500
810000ae 0002
810000b4 4600
810000b6 2486
810000b8 080e
810000ba 05db
810000bc e712
2008-04-09 06:59:41 +00:00
John Chadwick
39ee4f940c More work on the cheating core, added usage load_cheats into main.c 2008-04-08 07:09:22 +00:00
Richard Goedeken
c512cb02ff Changed NOGUI_ONLY build option to NO_GUI 2008-04-06 23:41:23 +00:00
James Hood
117a8e545e minor whitespace changes 2008-04-06 22:55:37 +00:00
Richard Goedeken
5f32c254fe Converted all tabs to 4-spaces, and all line endings to LF-only 2008-04-06 14:55:37 +00:00
John Chadwick
c3c53540eb Adds "FPS Limiter" Option, enabled by default. Some things need to have this off to operate properly. 2008-04-05 19:26:05 +00:00
James Hood
dd00ce7987 -Added support for mapping emulator special functions (fullscreen, stop emulation, etc) to joystick buttons or axis movements.
-Added new tab to configuration dialog for user to create mappings.
-Minor fix: Reset configuration dialog to have first tab selected everytime it's shown.
2008-04-03 22:07:45 +00:00
James Hood
64e7edc15d Changed screenshot shortcut key to F12 to match code pre gui/nogui merge 2008-04-02 06:14:29 +00:00
James Hood
5796a69ca9 Mapped Print Screen button to screenshot function 2008-04-02 01:13:41 +00:00
James Hood
af3b85e37f -Fixed the rest of the places where deprecated GtkFileSelection widget was being used. Converted to GtkFileChooserDialog.
-Added file filters to load dialogs for a more polished file chooser.
-Removed chdir to the config dir (~/.mupen64plus) from setPaths function. This was a hack to get around the fact that plugins were looking in the current working dir for config files. I've since fixed that issue, so the chdir is no longer necessary. Plus, the chdir was causing the file chooser dialogs to default to ~/.mupen64plus, which could be confusing to a user.
2008-04-01 20:34:53 +00:00