Commit graph

241 commits

Author SHA1 Message Date
Richard Goedeken
ad77d37228 KDE4 GUI merge: Added CFLAGS and LDLIBS for KDE GUI. Removed NO_GUI=1 option and added GUI=NONE, GUI=GTK2, and GUI=KDE4 options 2008-04-21 20:03:46 +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
6bfa7f5909 KDE4 GUI merge: added japanusa.png icon 2008-04-21 00:05:44 +00:00
Richard Goedeken
b1fa40be7d KDE4 GUI merge: removed weird version file dependency in blight_input 2008-04-21 00:02:26 +00:00
Richard Goedeken
a53dcfa683 KDE4 GUI merge: added main/gui_kde4 directory 2008-04-20 23:57:12 +00:00
Richard Goedeken
015cac7e91 KDE4 GUI merge: glN64 Config file changes, .kcfg and .ui files for KDE gui 2008-04-20 23:52:42 +00:00
Richard Goedeken
90eb204c85 KDE4 GUI merge: removed hash marks from files in mupen64_audio and mupen64_input plugins 2008-04-20 23:32:21 +00:00
Richard Goedeken
98d7978c0c KDE4 GUI merge: removed hash marks from files in jttl_audio plugin 2008-04-20 23:23:30 +00:00
Richard Goedeken
fee30b72a7 KDE4 GUI merge: removed hash marks from files in rsp_hle plugin 2008-04-20 23:18:18 +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
Richard Goedeken
5de3961515 Fixed warning in rice video OGLRender.cpp. Also do not compare floats for equality 2008-04-19 12:27:17 +00:00
Richard Goedeken
a40cec8e1b Tweaked blight input force feedback code to work on more systems 2008-04-19 12:22:05 +00:00
James Hood
175cbb86a3 whitespace changes 2008-04-18 16:47:11 +00:00
Scott Knauert
310fb374f0 Revert r231 glViewport() commenting, needed when switching back from rendering to a texture,
i.e. most text stops working in Mario64.
2008-04-18 16:30:32 +00:00
James Hood
fb77ce4a11 Removed -g option from jttl_audio cflags. If you pass DBGSYM=1 to make, it'll automatically add -g and not strip the binary of its symbol table. Please use this flag for debug in the future. 2008-04-18 15:29:23 +00:00
Scott Knauert
6500bc445b Widescreen fixes. 2008-04-18 14:53:17 +00:00
Richard Goedeken
802f7d8b0a Revert commit 102. This fix does not address the underlying problem. The commit message did not contain information to reproduce the crash, so further diagnosis and correction is not possible. 2008-04-18 13:31:37 +00:00
Richard Goedeken
461893ebfc Removed RESAMPLE 0 option (no resampling) - no-one would ever want this 2008-04-18 03:57:07 +00:00
Richard Goedeken
ff6a31553a re-added -O3 compile option 2008-04-18 03:38:24 +00:00
Scott Knauert
707511a6d7 More preliminary Rice widescreen fixes. 2008-04-18 01:08:49 +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 Knauert
69de736fa1 Preliminary Rice widescreen support. Try out the 960x600 resolution I
added to the plugin. It pillerboxes and has theoretical support for
arbitrary resolution with GUI extension, but Rice is doing something
funky with actually clearing the window, so if you move it, the
pillerboxes are no longer black. A simple glClear(GL_COLOR_BUFFER_BIT)
makes the whole window black.
2008-04-17 23:38:57 +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
b28b426ecb removed commented-out code 2008-04-14 02:03:37 +00:00
Richard Goedeken
9aa6eea11b Improved error logging for rumble feature. Dont allow switching to rumble pak if rumble not enabled 2008-04-14 02:02:26 +00:00
Richard Goedeken
5d42cd6e7d Removed register dump at r4300 termination; it's not needed 2008-04-13 17:06:14 +00:00
Richard Goedeken
81d5e28d83 tentative fix for rice video hi-res texture non-integral scaling problem. Needs to be verified 2008-04-12 21:06:06 +00:00
Richard Goedeken
645c2f615f trivial change to test new commit email functionality 2008-04-12 15:34:31 +00:00
Richard Goedeken
b3c072a547 Added Swedish language translation from Tux0r 2008-04-11 12:24:20 +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