Commit graph

99 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
John Chadwick
084516ff54 - Fixes stupid bug I made
- Adds dynamic font size
2008-04-26 23:52:52 +00:00
John Chadwick
159a49246c - Added explanation of corners and offset.
- Added a new 'corner', the center of the screen.
2008-04-26 19:25:44 +00:00
John Chadwick
882e316288 More things:
- Committed missing files
- Added Save/Load/Switch State messages
- Added Support for TXT_OBJECT. (Untested!) 
- More work on the initial support


BTW, This patch does not unify the def of TXT_OBJECT. Why? Because GFX_INFO and the function prototypes are defined twice in the exact same manor - All I can recieve from that is that gfx.h needs to stay different than the original spec file, and so solving the issue of having two defs of TXT_OBJECT is outside the scope of this branch. It's not my decision, but I think it's important to note this anyways.
2008-04-26 19:13:19 +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
Richard Goedeken
5df1959b04 KDE4 GUI merge: give default visibility attribute with dllexport declspec 2008-04-21 00:15:04 +00:00
Richard Goedeken
0d214a07bb KDE4 GUI merge: error logging when plugin fails to load 2008-04-21 00:13:50 +00:00
Richard Goedeken
a53dcfa683 KDE4 GUI merge: added main/gui_kde4 directory 2008-04-20 23:57:12 +00:00
Scott Knauert
e984cab71a Removed second status bar which was not used (even in 0.5)
as it caused two Gtk resize handles to be drawn on the 
main window. Left in framework for multiple status bars
in case we actually want to use this in the future.
2008-04-20 22:51:23 +00:00
Scott Knauert
4f87fa787f Minor update to the ROM Properties dialogue. Minor
GUI style corrections. Made hitting enter in the comments 
dialogue apply the changes. Partially fixes Issue 66.
2008-04-20 20:33:20 +00:00
James Hood
d37739f761 Fixed segfault introduced by r244. Segfault would happen if you start mupen64plus, press the play button without selecting any roms in the rombrowser. When the dialog pops up asking if you want to load a rom, select yes and select a rom via the file chooser and click open. 2008-04-20 15:24:54 +00:00
Scott Knauert
f272302d26 Fixed Issue 6, if a ROM is selected in the ROM browser and
the 'play' is pressed, emulation will start if mupen can 
load the ROM.
2008-04-20 09:28:49 +00:00
Scott Knauert
b2c0dafa81 After the Comment is altered in the ROM Properties dialogue,
the ROM browser is updated. Minor changes to the sorting and 
refresh functions as I had incorrectly renamed the sorting 
function when I rewrote it in commit 242. Also set the default
sort elsewhere to refresh to be general and not effect sorting.
2008-04-20 08:59:39 +00:00
Scott Knauert
48846dd477 Fixed Issue 62, restored ROM browser column sorting as in 0.5
with the change of the default sort category being the Filename 
istead of the GoodName. This is easily changed if after the GoodName 
update we want to put it back. 

Also changed the column sizing policy to be more sane, allowing 
the user to resize and reorder columns and for columns which normally 
contain large strings (FileName, GoodName, Comments) to expand on 
resize.
2008-04-20 08:10:28 +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
Scott Knauert
f3a922e71f Adds the ability for GUI start to also continue emulation. This minor GUI fix
makes our Play/Pause/Stop follow convention.
2008-04-19 22:02:23 +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
49aad76ff0 Implemented accelerator keys in the gtk gui. These are keyboard shortcuts that cause certain menu items to be activated, e.g., Alt+Return activates the fullscreen menu item. This also adds the accelerator keys to the menu items so the user can see the shortcut for that function. 2008-04-17 06:38:26 +00:00
James Hood
5a27989463 -Fixed menu "accelerator" problem. The correct term to use for the underlined letter in the file menu items is "mnemonic". Anyway, they work now.
-Minor change to man page.
2008-04-17 06:00:23 +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
James Hood
2baec5c8eb Added cheat menu and implemented dialog to enable/disable cheats during gameplay. This dialog does not allow you to add/edit cheats. That's coming soon. 2008-04-14 19:32:07 +00:00
Louai Al-Khanji
61e36c3925 Fix a header/implementation disrepancy. 2008-04-14 17:54:22 +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
ee9cc495dc Simplified execute_cheat function 2008-04-10 06:15:07 +00:00
Scott Gorman
a5ea948c58 Added more cases, fixed a few bugs. 2008-04-09 22:50:45 +00:00
James Hood
f7339c8d4f fixed minor syntax error introduced during debug testing 2008-04-09 22:18:06 +00:00
James Hood
04112142fc -Added GS button support in cheat_apply_cheats.
-Readded boot code handling (it was lost during cleanup).
-Made conditional cheat code handling cleaner (got rid of do_next var).
2008-04-09 21:13:26 +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
Scott Gorman
c133e08e6c removed always_enabled but changed it to enabled.
i dont see why this is needed.
2008-04-09 13:51:20 +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
Scott Gorman
762e122f81 fixed a infinite loop for games that did not have a cheats.gs entry. 2008-04-09 05:38:57 +00:00
John Chadwick
20295c5989 removes a few now unnecessary things from the gameshark system. 2008-04-09 04:54:12 +00:00
John Chadwick
dc17ec142b Needs clean up, but fixes the conditionals system in the cheating core. 2008-04-09 04:49:24 +00:00
Richard Goedeken
8fd1a809a9 added header files to cheat.c to fix compiler warnings 2008-04-09 02:43:50 +00:00
James Hood
1838894052 fixed segfault if no cheats.gs file exists 2008-04-08 16:05:03 +00:00
Scott Gorman
6ad7a2b218 this should fix it 2008-04-08 14:44:49 +00:00
Scott Gorman
12cdb8b585 this should fix it 2008-04-08 14:44:35 +00:00
Scott Gorman
e7b568cd44 this might update or delete the file 2008-04-08 14:44:22 +00:00
Scott Gorman
51bfc3d9fa Fixed the file reading... successfully reads 1 cheat from /.mupen64plus/cheats.gs
example: (Mario 64)

1
:635a2bff 8b022326
Super Mega Jumps
1
<
8133B1760008
>

This might contain tabs, I'm sorry my editor is messed up... and it's late and I need to goto bed. (I'm working on fixing my editor though... I promise)
2008-04-08 08:38:03 +00:00
James Hood
fa74232ba2 -Replaced custom directory browser in (appeared when you clicked the "Add" button in the "Rom Browser" tab of the config dialog) with a gtk file chooser. Was able to remove dirbrowser.[ch] because of this.
-Removed "Remove All" button from rom browser config tab. There wasn't a stock gtk button for remove all and it didn't really seem necessary since you can select all of the directories and then click the "Remove" button.
-Removed unnecessary callback functions for about dialog, made about dialog not resizable.
2008-04-08 07:32:55 +00:00
John Chadwick
0a170d46e3 even more cheat work, yawn 2008-04-08 07:30:28 +00:00