Richard Goedeken
071256104b
Added OSD messages for volume change, mute on/off, playback speed change, fast-forward
2008-05-15 04:44:43 +00:00
James Hood
877f2eaa66
removed alert message for no save state file found since OSD message handles this now
2008-05-14 16:44:27 +00:00
Richard Goedeken
a6e6474b8e
Changed timing and disabled scrolling for middle OSD messages. Changed pause and start message positions
2008-05-14 04:11:37 +00:00
Richard Goedeken
ba9e21f696
More intuitive numbering of savestate slots (1-10), give state loading errors in OSD
2008-05-14 03:39:57 +00:00
Richard Goedeken
56d7dce1b6
Fixed bug preventing OSD messages in top corners from working correctly
2008-05-13 04:50:16 +00:00
Richard Goedeken
a2e3b54562
OSD changes: reversed list order, added scrolling, added ability to choose corner when adding message
2008-05-13 04:39:30 +00:00
Richard Goedeken
9770b55707
Re-enabled GL_BLEND for fading; set background to black, which doesnt matter for Monochrome font class but does for Grayscale
2008-05-13 01:58:05 +00:00
Richard Goedeken
02331dc57c
Fixed multitexturing bug in OSD
2008-05-12 05:23:58 +00:00
Scott Gorman
d9d6abf6dd
Better handeling of GL_COLOR_ARRAY
2008-05-09 15:48:06 +00:00
Scott Gorman
99c9ca1a73
Fixed a regression with the color, OSD seems to be working perfect on all 3 plugins on my computer.
2008-05-09 15:42:01 +00:00
Richard Goedeken
5a37f1c859
Revised OGL state saving/restoring code, removed some unnecessary code, added some printfs for debugging
2008-05-09 13:12:47 +00:00
James Hood
5f768644d8
added OSD utility functions.
2008-05-05 05:36:51 +00:00
James Hood
229d7d3edb
-Added support for putting multiple messages in the same corner above or below each other.
...
-Added "Pause" OSD message. Had to move the rompause code in interupt.c lower so that the OSD message would be rendered on pause.
2008-05-05 05:20:50 +00:00
John Chadwick
8f61257fe7
Removes requirement of plugins sending their width/height via the renderCallback. (We use glGet to obtain this data instead)
2008-05-05 02:27:25 +00:00
Scott Gorman
e17901c803
Fixes OSD, it should work properly with maybe a minor bug... needs a little bit more testing.
2008-05-05 01:12:24 +00:00
James Hood
06071fbf98
Added OSD function to modify message string
2008-05-03 00:39:03 +00:00
James Hood
da83eb929c
added ability to set timeout on a OSD message to infinity so the message stays on the screen unless the user manually removes it
2008-05-03 00:34:53 +00:00
James Hood
59cd9f8da1
Wrote message queuing code for OSD. Added support for fade in/out animations. Added more flexible framework for animations so different animations can be added later.
...
Note: Currently, multiple messages in the same corner of the screen will be rendered over each other instead of moving above or below the other messages. I'll fix this soon. Also, until nmn implements the opengl viewport code in the graphics plugins, the position of the OSD messages will not work correctly.
2008-05-02 21:38:14 +00:00
James Hood
d4bd29711a
we found drawing the string to (0,0) will render it at the top right in rice and dead center in glN64
2008-04-29 22:35:35 +00:00
James Hood
a009fd630d
Oops, didn't actually add osd files. Adding them now.
2008-04-29 20:38:42 +00:00
James Hood
0144959c7b
minor cleanup
2008-04-29 16:37:14 +00:00
James Hood
87311a4951
Implemented rendering callback API call in rice video and glN64. I created main/osd.cpp for handling the message queue and rendering the on-screen display. Right now it's incomplete and the osd doesn't work. I'm mainly committing this so people can see the render callback structure
2008-04-29 16:28:51 +00:00
James Hood
f10b5fdb92
merged changes from nmn's branch (without the file deletions)
2008-04-28 05:51:02 +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
