Commit graph

46 commits

Author SHA1 Message Date
Jesse Dean
70f7a1659c Reintegrated netplay core into vi handler, added netplay gui to make
clean.  Ensure emulator starts in paused state
2008-08-03 20:51:55 +00:00
Jesse Dean
7e70821f20 First commit of netplay refactoring to current trunk, netplay core compiles, netplay gui does not 2008-07-25 21:00:12 +00:00
Richard Goedeken
09c63269ff uncommented KDE4-GUI build dependency until we can figure out a better way to do this. 2008-07-21 12:20:47 +00:00
Scott Knauert
94e853099e Fix two KDE4 GUI crashing bugs (load bad ROM and user opt to close it, press Play without ROM loaded), altered makefile to only rebuild .cpp files with changes. 2008-07-21 01:51:39 +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
Scott Knauert
eae8168fbb Makefile changes for 7zip. No idea why this didn't go in in previous commit... 2008-06-30 01:15:38 +00:00
Richard Goedeken
16bc592cf6 fixed small problem in makefile - make clean was not deleting the object files in the main/ziptypes folders 2008-06-25 12:59:19 +00:00
Scott Knauert
35046d1519 LZMA support. 2008-06-21 03:25:10 +00:00
Jesse Dean
5e46bfc862 Added (undocumented) RELEASE flag to makefiles to allow automatic stripping of SVN info from
versions when doing a major release
2008-06-20 13:56:23 +00:00
Scott Knauert
c6e067fbd2 Added bzip2 support, readded unstream fixes from minizip library and redeleted MupenIniApi (cleanup from merge). 2008-06-19 07:40:49 +00:00
Richard Goedeken
9eebbdb55b Rom Cache System has landed in the trunk. 2008-06-19 04:29:35 +00:00
Richard Goedeken
8ec163dcaf Moved new minzip files from compression/zip to main/zip (too many folders in root), removed old unzip.* and ioapi.* files in main 2008-06-17 03:22:17 +00:00
Scott Knauert
4d6691b363 Updated zip decompression library to 1.01e from 0.18. 2008-06-16 01:09:51 +00:00
Richard Goedeken
e0d97e7dfe Build mupen64plus instead of mupen64plus_dbg when DBG=1 to avoid install failure; do update_breakpoints() at end of init_breakpoints() in main/gui_gtk/debugger/breakpoints.c to populate list with previously set breakpoints 2008-06-11 13:33:45 +00:00
Richard Goedeken
31fa5350f8 Removed mupen64_audio: the source is crap, littered with commented out code, it writes directly to alsa device (no SDL), sound output stutters, doesnt support speedup/slowdown, etc. kthxbai 2008-06-11 13:14:31 +00:00
Richard Goedeken
38e92c3a76 Merged r0286-debugger branch into trunk 2008-06-06 18:25:59 +00:00
Louai Al-Khanji
8ba70595bb Better kde4 gui compilation courtesy of Tub. This actually workds
properly.
2008-05-27 18:09:45 +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
Richard Goedeken
0ff7d2d10b Fixed makefiles for OSD feature 2008-05-16 05:33:13 +00:00
Richard Goedeken
12842f44b8 New feature: On Screen Display. Merged branch r0261-OSD-ebenblues up until rev 450 into trunk 2008-05-16 04:46:48 +00:00
Louai Al-Khanji
ee14adc137 Fix KDE4 stuff. qt4-config not yet compiled automatically. glN64 still
broken. First time this works for me.
2008-05-15 22:19:07 +00:00
Richard Goedeken
71578f2d36 KDE4 GUI builds now with makefiles 2008-05-04 14:20:27 +00:00
Jesse Dean
cdf2acdba8 Merging fixes to debugger into trunk, this will allow compiling with DBG=1 and use of debugger with GTK
frontend.
2008-04-25 01:28:48 +00:00
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
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
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
df25dc8bbe some fixes to the cheat core, mainly can ignore this as it is just for collaborating 2008-04-08 04:43:40 +00:00
Richard Goedeken
02cb12172b Added NO_ASM makefile parameter to compile mupen64plus with no dynarec or mmx/sse code. This is useful for building on non-intel architectures like PPC or Sparc. glide64 and rice video will probably not work 2008-04-07 03:14:17 +00:00
Richard Goedeken
c512cb02ff Changed NOGUI_ONLY build option to NO_GUI 2008-04-06 23:41:23 +00:00
Richard Goedeken
eb4b026e8f Moved libsamplerate detection from pre.mk to jttl_audio/Makefile. Added NO_RESAMPLE option to disable samplerate library for building 32-bit binary on 64-bit machine without 32-bit static libs 2008-04-06 17:20:43 +00:00
Richard Goedeken
2c56bf8c45 added reassuring message to libsamplerate warning. added dummy_video to makefile clean chain 2008-04-06 00:50:47 +00:00
Richard Goedeken
83c354233e Removed PPC dynarec stub functions; I want to do this a different way to support more linux architectures than just PPC by totally detaching the dynarec. Nobody's going to be merging a PPC dynarec anytime soon anyway 2008-04-03 03:14:03 +00:00
John Chadwick
b864c5aae2 - Stub PPC's dynarec 2008-04-03 00:58:00 +00:00
John Chadwick
5c760a134e Makefile:
- Add "dummy_video" to the builder
2008-03-31 20:44:14 +00:00
James Hood
4560ee585a -Added support for adjusting the volume (PCM channel via /dev/mixer) during emulation. Volume functions are in new files volume.[ch]. Also added support for volume keyboard shortcuts and LIRC commands.
-Made minor changes to main for cleanup.
-replaced tabs in lirc.c with spaces as suggested by coding guidelines.
2008-03-30 05:07:14 +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
eafbf49b66 -Created install.sh and uninstall.sh scripts in trunk. These scripts will be used to do install/uninstall in the source and binary distributions for Mupen64Plus.
-Modified top-level Makefile so 'make install' and 'make uninstall' call install.sh and uninstall.sh, respectively.
2008-03-17 06:18:41 +00:00
James Hood
e81f213c6f -Created config/ dir and moved all config files to it.
-Modified Makefile so 'make install' will copy default config files to install dir
-Modified gui_gtk/rombrowser.c so rombrowser.cache file is saved to user config dir.
-Modified main/main.c so on creation of user config dir ~/.mupen64plus, all config files from install dir are copied to user config dir.
2008-03-17 00:40:43 +00:00
Richard Goedeken
0fbedebac6 add .ini file copy for both rice video and glide64 plugins after building them in the makefile 2008-03-16 00:16:05 +00:00
Richard Goedeken
ac35c5f28e Integrated glide64 plugin into mupen64plus build system. Removed -Wall from pre.mk 2008-03-15 18:30:48 +00:00
Richard Goedeken
a5e27c1efb integrated rice video into mupen64plus build system 2008-03-15 17:58:10 +00:00
Richard Goedeken
3ad9e08591 Changed project name to Mupen64Plus 2008-03-15 16:23:36 +00:00
Richard Goedeken
3a1018ba07 Removed mupen64_soft_gfx plugin, as it is very broken 2008-03-15 15:20:20 +00:00
Richard Goedeken
cf8b8ca208 Imported mupen64plus/trunk from mupen64-amd64/trunk/mupen64-64bit rev 254 2008-03-15 14:33:00 +00:00