Richard Goedeken
42093fb63c
update text files and version number for upcoming 2.5 release
2015-04-26 12:33:01 -07:00
Richard Goedeken
055e332a9d
fix build warning
2015-04-26 11:42:36 -07:00
Richard Goedeken
16ca101e25
Merge pull request #54 from littleguy77/master
...
Fix build error in Android.
2015-04-20 17:15:28 -07:00
littleguy77
7433f07373
Fix build error in Android.
2015-04-19 08:54:10 -04:00
Richard Goedeken
ab9f393e3b
fix build errors in msvc2013
2015-04-12 13:56:00 -07:00
Dorian Fevrier
a4c2a9fa4c
Merge pull request #53 from gizmo98/fix_gles
...
Fix GLES regression...
2015-04-04 13:32:00 -04:00
gizmo98
fd358622d5
OGLExtensions: Don't use extensions if USE_GLES is defined
2015-03-29 14:02:21 +02:00
gizmo98
4deebf0048
Fix GLES regression...
...
...introduced with https://github.com/mupen64plus/mupen64plus-video-rice/pull/52
2015-03-27 21:14:31 +01:00
Richard Goedeken
48cde6a604
Merge pull request #52 from conchurnavid/includes
...
Cleanup includes order and add missing includes
2015-03-27 08:14:28 -07:00
Conchúr Navid
33d7c8824c
Add missing includes and forward declarations
2015-03-21 13:58:24 +01:00
Conchúr Navid
2491cfebf8
Sort the includes based on type and names
2015-03-21 13:33:24 +01:00
Conchúr Navid
665d5000af
Workaround conflicting defintions of min and max
2015-03-21 13:33:24 +01:00
Conchúr Navid
b40f3babcb
Fix build error because of missing GL type definitions
2015-03-21 13:19:36 +01:00
Conchúr Navid
958a2e7cad
Fix executable bits of files
2015-03-21 10:53:38 +01:00
Dorian Fevrier
6ec04a31d1
Merge pull request #50 from rlabrecque/patch-1
...
Fix crash if RiceVideoLinux.ini can not be found
2015-03-12 09:31:28 -04:00
Riley Labrecque
5369ebb923
Fix crash if RiceVideoLinux.ini can not be found
...
This fixes a null pointer usage crash that I get every single time that I set up m64p from source on Windows when I don't have any config or data files moved over yet.
2015-03-12 04:11:37 -06:00
Richard Goedeken
3b9d2ab337
added project/solution file for Visual Studio 2013. removed older MSVS project files. fix code compatilibity problems with MSVC
2015-02-22 07:13:34 -08:00
Dorian Fevrier
1871971e6a
Merge pull request #44 from gizmo98/RPI-compatibility
...
Makefile: Add VC target for raspberry pi
2015-02-18 21:25:50 -05:00
gizmo98
754302d24f
Makefile: VC target for raspberry pi
...
Add VC target with broadcom includes and libs so mupen64plus-video-rice can be build for raspberry pis broadcom soc.
Compiles and runs. The default settings must be tuned (ScreenUpdateSetting=6).
2015-02-17 19:30:34 +01:00
Dorian Fevrier
36f1fab96e
Merge pull request #43 from littleguy77/master
...
Revert "implement Rotate={0,1,2,3} in the GLES codepath"
2015-01-27 22:28:05 -05:00
littleguy77
e08215cb3a
Revert "implement Rotate={0,1,2,3} in the GLES codepath"
...
This reverts commit e9ef968bd5
2015-01-27 09:19:39 -05:00
Richard Goedeken
eb4475ec4b
Merge pull request #39 from Gillou68310/master
...
Added project file for MSVC2010
2015-01-07 22:54:48 -08:00
Richard Goedeken
223d04e9ea
Merge pull request #38 from mupen64plus-ae/vanilla
...
Merge Android Edition history
2015-01-07 22:44:04 -08:00
Gillou68310
7dc68f3610
Added project file for MSVC2010
2015-01-07 15:11:54 +01:00
Dorian Fevrier
cf62497498
Merge pull request #35 from littleguy77/master
...
Add documentation comments for polygon offset settings.
2014-12-21 16:30:45 -05:00
littleguy77
dc6cc61824
Add documentation comments for polygon offset settings.
2014-12-20 22:40:44 -05:00
littleguy77
e8c4647ace
build: Remove Android makefile.
2014-12-18 22:03:36 -05:00
littleguy77
9f0f892a23
Merge remote-tracking branch 'upstream/master'
2014-12-18 22:02:05 -05:00
Richard Goedeken
a066f9e819
Merge pull request #33 from littleguy77/master
...
Allow user/front-end to override polygon offset values
2014-12-17 21:22:21 -08:00
littleguy77
8e4b55a442
Add config option to force polygon offset values.
...
Provides a mechanism to workaround certain mobile hardware quirks.
2014-12-17 18:12:50 -05:00
Paul Lamb
e48c50542b
Merge from upstream
2014-12-02 19:16:16 -06:00
Paul Lamb
9609ab5d70
Merge from upstream
2014-12-02 19:14:38 -06:00
Richard Goedeken
6f2c4c7678
Merge pull request #17 from krnlyng/rotate
...
implement Rotate={0,1,2,3} in the GLES codepath
2014-11-26 23:17:37 -08:00
Richard Goedeken
4d27362cf6
Merge pull request #16 from paulscode/master
...
GLES2 screenshot support
2014-11-26 23:13:56 -08:00
Gillou68310
b730c3dce9
Use malloc for the temporary framebuffer
2014-11-26 08:27:29 -06:00
Gillou68310
5ba05463e7
Use malloc for the temporary framebuffer
2014-11-26 08:15:46 -06:00
Frajo Haider
e9ef968bd5
implement Rotate={0,1,2,3} in the GLES codepath
2014-11-25 14:04:04 +01:00
Gillou68310
94c20e5f66
GLES2 screenshot support
2014-11-24 19:57:33 -06:00
Gillou68310
7287dd41b9
GLES2 screenshot support
2014-11-24 18:53:27 -06:00
Paul Lamb
223e6ff22f
Update Android project
2014-11-24 18:20:13 -06:00
Paul Lamb
eb373e20e4
Merge from upstream
2014-11-24 18:19:07 -06:00
Richard Goedeken
17f4c69575
Merge pull request #15 from fayvel/gles2_fixes
...
OpenGL ES2 fixes
2014-11-12 16:52:06 -08:00
Fayvel Victor
59a12ba80a
Generate Mipmaps in GLES after texture is loaded
2014-11-09 22:15:51 +01:00
Fayvel Victor
7f20efdb6f
Limit texture units to 8 to avoid buffer overflows
2014-11-09 22:15:51 +01:00
Fayvel Victor
979e0bd847
Fix preprocessor checks to compile against GLESv2
2014-11-09 22:15:51 +01:00
Paul Lamb
160249849e
Update Android project
2014-11-08 18:16:50 -06:00
Paul Lamb
0e4333f9f5
Merge from upstream
2014-11-08 11:29:08 -06:00
Richard Goedeken
7bc04fda0d
Merge pull request #13 from fayvel/win_config
...
Fix Config file loading under Windows
2014-09-15 21:18:49 -07:00
Fayvel Victor
96b3cb7eb6
Fix Config file loading under Windows
2014-09-15 13:45:30 +02:00
Richard Goedeken
134f5dc1e7
Merge pull request #12 from fayvel/travisci
...
Add Travis CI configuration file for automatic build tests
2014-07-07 22:04:08 -07:00
