Scott Knauert
082dd4de98
Some more SDL input cleanup in the branch. No gui mode works. The slowdown should be solved but we get faster speed that nogui (branch or trunk) and indistinguishable speed in gui mode from trunk. Also, a few changes to prevent the debugger from crashing no matter how you attempt to close emulation. The debugger still needs a ton of work, but most of crasher bugs are cleaned up.
2008-10-28 06:14:14 +00:00
Scott Knauert
776686d520
SDL cleanup in the branch, only minor slowndown on linux, should fix OSX keyboard input issue. Still may need some more tweaking.
2008-10-28 00:35:17 +00:00
Scott Knauert
4d883d2725
Another possible way to fix the lack of OSX keyboard input issue. This doesn't have the slowdown associated with the other method.
2008-10-26 19:25:45 +00:00
Scott Knauert
a39df3aa94
Fix lack of newline breakage. Sorry about that, gcc 4.3 doesn't give those warnings even on -Wall. One -Wall fix, and remove hardcoded 1024 PATH_MAX to use limits.h. Also re-added rice hard gtk dependency.
2008-09-26 19:08:12 +00:00
Richard Goedeken
b69eb75714
merged r0970-sdl-threads branch into trunk. fixed old bug in signal handler
2008-09-06 05:27:50 +00:00
Louai Al-Khanji
75f324cfc6
Merge win32 branch
2008-09-01 12:44:16 +00:00
Louai Al-Khanji
70155cb18d
Remove all things KDE. Renaming still needs to be done.
2008-08-22 04:02:28 +00:00
Richard Goedeken
80b56a4fff
Merged volume changing patch from Wahrhaft, with lots of changes by Richard42. Now both SDL-based and OSS-based volume controls are supported.
2008-07-16 04:39:14 +00:00
Scott Knauert
a2ed083f95
Overhaul of messaging system. Mainly remove guifuncs.c and the associated includes. Double checked GUI=NONE build. Also changed alert_message to error_message as this is the more logical name. Also merged the three gui message functions which included a lot of repeated code as to simplify the gui api.
2008-07-14 06:42:33 +00:00
James Hood
61a39ba35d
Added "Always Start in Full Screen Mode" checkbox to config dialog.
2008-07-01 18:04:20 +00:00
Scott Knauert
8ea4bb4f53
Two more bugfixes thanks to Valgrind. Free string returned from gtk_combo_box_get_active_text, more correctly hanle RCS pthread. Fixed possible seg fault in filefrompath (although there still seems to be a leak somewhere here).
2008-06-30 17:44:45 +00:00
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
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
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
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
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
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
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
Richard Goedeken
6adfa80ecf
reverted commits 262-267 in trunk
2008-04-22 11:59:50 +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
Richard Goedeken
cbc32cb208
Removed unused LimitFPS option
2008-04-17 15:27:04 +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
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
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
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
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
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
Richard Goedeken
cf8b8ca208
Imported mupen64plus/trunk from mupen64-amd64/trunk/mupen64-64bit rev 254
2008-03-15 14:33:00 +00:00