Commit graph

44 commits

Author SHA1 Message Date
Scott Gorman
0aef4e0751 nvm they were dumb 2008-04-27 00:14:59 +00:00
Scott Gorman
6759e1c85f Added some newMessage functions. 2008-04-27 00:13:46 +00:00
Richard Goedeken
1961344b69 merged changes from trunk in revs 262 through 267 to r0261-OSD branch 2008-04-22 11:55:43 +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
James Hood
4560ee585a -Added support for adjusting the volume (PCM channel via /dev/mixer) during emulation. Volume functions are in new files volume.[ch]. Also added support for volume keyboard shortcuts and LIRC commands.
-Made minor changes to main for cleanup.
-replaced tabs in lirc.c with spaces as suggested by coding guidelines.
2008-03-30 05:07:14 +00:00
Richard Goedeken
d9b9f38605 Removed speedmod() functions in revs 56-57 for tag and release, since this feature is not complete. To add back, do from trunk folder of local copy: svn merge -r 55:57 . 2008-03-29 16:39:48 +00:00
John Chadwick
28fcce941d * Fixed some compilation problems (defines PATH_MAX to 1024 in a couple files, if they aren't already defined)
* More GUI work ("Toolbar Style" now works)
2008-03-27 20:29:30 +00:00
Scott Gorman
66825e9c8f 2008-03-27 00:28:57 +00:00
Scott Gorman
73e94541d5 wrote some speedmod functions, all that is left is to implement some accelerators in the GUI.
void set_speedmod(double val0) - sets speedmod to val0
void inc_speedmod(double val0) - increases speedmod by val0 (accepts negatives)
double get_speedmod() - returns speedmod
2008-03-27 00:27:10 +00:00
James Hood
ed26e44479 Removed gui_load_rom call from guifuncs.h. It's not a necessary call for common code. 2008-03-26 23:16:51 +00:00
James Hood
3d1123ee55 -screenshots directory will now default to "screenshots" subdir of .mupen64plus config dir. 2008-03-25 06:04:21 +00:00
James Hood
74a6a52a02 -Fixed LIRC support (it was broken during gui/nogui merge).
-Separated LIRC functions into new lirc.c file so they can be used in gui or nogui build.
-Added pause/continue functionality to LIRC.
-Made it so LIRC commands work while emulation is paused.
-Added wiki page on how to setup LIRC for Mupen64Plus.
-Fixed minor bug with g_EmulationRunning (it was being set to 1 during stopEmulation).
2008-03-25 05:40:42 +00:00
Richard Goedeken
3cbcfd6737 Had to recreate g_EmulatorRunning variable to properly handle pause command when running in _nogui mode 2008-03-22 19:47:28 +00:00
James Hood
9351f625b4 Changed search priority for install dir to this order:
-PREFIX/share/mupen64plus
	-same dir as binary
	-current working dir

I decided to put CWD last instead of the binary dir because it is the least consistent one. This should solve the Konquerer problem that was reported.
2008-03-19 16:13:32 +00:00
Scott Gorman
5406a2d361 commented out SDL_SetVideoMode 2008-03-19 15:16:19 +00:00
James Hood
66eaf1213c -Made changes so only plugin filenames (not paths) are stored in the mupen64plus.conf file.
-Added default plugins to mupen64plus.conf file:
	-Gfx: ricevideo.so
	-Audio: mupen64_audio.so
	-Input: blight_input.so
	-RSP: mupen64_hle_rsp_azimer.so

These two fixes address the problem of no plugins being selected on first load of mupen64plus.
2008-03-19 07:59:47 +00:00
James Hood
3234747a0c Closing SDL window now stops emulation. 2008-03-19 06:32:39 +00:00
James Hood
92dcc10257 -Change fullscreen hotkey to Alt+Enter 2008-03-19 06:20:26 +00:00
James Hood
58773a915a -bugfix: newlines in Catalan translation file were causing problems with that translation.
-Readded --noask functionality (it was lost during gui/nogui merge).
-Added config dialog checkbox to toggle noask setting.
-Fixed problem with too many dialog windows when loading a bad dump or hacked rom.
2008-03-19 01:29:19 +00:00
James Hood
e81f213c6f -Created config/ dir and moved all config files to it.
-Modified Makefile so 'make install' will copy default config files to install dir
-Modified gui_gtk/rombrowser.c so rombrowser.cache file is saved to user config dir.
-Modified main/main.c so on creation of user config dir ~/.mupen64plus, all config files from install dir are copied to user config dir.
2008-03-17 00:40:43 +00:00
Richard Goedeken
3ad9e08591 Changed project name to Mupen64Plus 2008-03-15 16:23:36 +00:00
Richard Goedeken
cf8b8ca208 Imported mupen64plus/trunk from mupen64-amd64/trunk/mupen64-64bit rev 254 2008-03-15 14:33:00 +00:00