Commit graph

18 commits

Author SHA1 Message Date
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
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