Commit graph

42 commits

Author SHA1 Message Date
Richard Goedeken
693487e7c8 Merged 7 commits with bugfixes from the trunk 2008-07-22 03:46:46 +00:00
Richard Goedeken
15547b5f96 Updated rice_video, kde4 gui, and jttl_audio to take version numbers from main/version.h. 2008-06-14 21:53:20 +00:00
Richard Goedeken
c5228119f2 better fix for the bug which gcc 4.3.1 caught in rice_video/RDP_Texture.h 2008-06-13 01:41:23 +00:00
Scott Knauert
8fa77f05ac Fixed compiler warnings for gcc 4.3.1. 2008-06-13 01:30:03 +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
Richard Goedeken
269a94cecc Cleaned up some weird code 2008-05-15 19:33:23 +00:00
Richard Goedeken
869cbf09b8 fixed a bunch of recent warnings from rice_video. I assume these came from re-activating the -O3 compiler switch. The one in RDP_Texture.h was actually a bad bug; I wonder if it affected any games 2008-04-23 04:32:03 +00:00
Richard Goedeken
578f272278 Reworked screenshot mechanism. Now screenshots are retrieved from video plugins with ReadScreen instead of CaptureScreen, and compressed/saved from main core instead of plugins. Fixed 64-bit bug in Glide64. 2008-04-23 03:59:09 +00:00
Scott Knauert
59f63818ac Okay, this should really fix the Rice regressions by
reverting to the older OGLRender.cpp. Assuming svn 
actually commits it to head. I don't know why my mere /
commit wasn't going through before.
2008-04-22 22:40:03 +00:00
Scott Knauert
c846968e24 The previous revert didn't work. 2008-04-22 16:35:56 +00:00
Scott Knauert
f12b192d95 Reverting Rice to pre-widescreen support due to
Issues 69 and 72. No easy fix.
2008-04-22 16:23:09 +00:00
Richard Goedeken
6adfa80ecf reverted commits 262-267 in trunk 2008-04-22 11:59:50 +00:00
John Chadwick
d54963521e Needs more work, because it doesn't work, but this is the outline of status message support. 2008-04-22 05:58:11 +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
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
Scott Knauert
6500bc445b Widescreen fixes. 2008-04-18 14:53:17 +00:00
Scott Knauert
707511a6d7 More preliminary Rice widescreen fixes. 2008-04-18 01:08:49 +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
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
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
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
179dfa85cb Fixed a bunch of miscellaneous warnings found on a Gentoo 64-bit system with GCC 4.1.2 2008-04-06 16:58:28 +00:00
Richard Goedeken
192f662c98 Fixed virtual destructor warnings in Rice Video with GCC 4.1.2 2008-04-06 15:56:49 +00:00
Richard Goedeken
5f32c254fe Converted all tabs to 4-spaces, and all line endings to LF-only 2008-04-06 14:55:37 +00:00
Scott Knauert
edcef05047 Changes: Fixed nearly all warnings in Rice (Issue 24) except
one pointer arithmetic one in TextureFilters.cpp (see tracker).
Once that is fixed Issue 24 in current form can be closed.

Testing done: Code compiles for normal and debug use without 
any -Wall warnings and seems to yield the same results and previous 
svn on my r300.
2008-04-04 19:18:54 +00:00
Scott Knauert
c734abce89 Chnages: Fixed deprecated conversion from string constant to 'char*' in
Rice Video as part of compiler warning code cleanup (Issue 24).

Testing done: Code compiles for normal and debug use without
general level warning and seems to yield the same results as previous
svn on my r300.
2008-04-04 13:08:55 +00:00
John Chadwick
870f42c857 - Fix the hires texturing to make it more flexible. Now Alternate Cartoon Super Mario 64 plays ;) 2008-04-03 03:07:01 +00:00
Richard Goedeken
30a84705b9 Updated version numbers for post-1.3 tag 2008-03-29 19:40:20 +00:00
Richard Goedeken
4e3b9647fe Updated version numbers for 1.3 tag 2008-03-29 19:37:52 +00:00
Richard Goedeken
eb9a6c6482 Updated RELEASE file for 1.3 tag, removed TODO and RELEASE from rice video 2008-03-29 19:14:14 +00:00
James Hood
e42b06f00a including limits.h should provide definition of PATH_MAX 2008-03-27 20:39:07 +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
15f50b9603 Some systems fail compile because PATH_MAX is not defined 2008-03-27 20:24:31 +00:00
James Hood
54f1dd1602 2008-03-26 22:42:26 +00:00
Scott Gorman
932682f9ed fixed the config error, now it displays proper resolution 2008-03-19 16:04:11 +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
James Hood
605abd80a1 Implemented SetConfigDir API call for RiceVideo. This config dir is used to find the RiceVideo.cfg and RiceVideoLinux.ini files. It is also used as the base path for the hires_texture/ and texture_dump/ directories. 2008-03-16 22:59:18 +00:00
James Hood
42e8448c24 Removed copy instructions from glide64 and rice_video Makefile's since now the top-level Makefile will automatically copy the plugins to the plugins/ dir after building. 2008-03-16 16:34:40 +00:00
Richard Goedeken
405b099723 set default screen update setting to 1 for super mario 64 to fix artifacts 2008-03-15 23:58:04 +00:00
Richard Goedeken
a5e27c1efb integrated rice video into mupen64plus build system 2008-03-15 17:58:10 +00:00
Richard Goedeken
2dd0da478c Imported mupen64plus/trunk/rice_video from mupen64-amd64/trunk/ricevideo610-64bit rev 254 2008-03-15 14:36:11 +00:00