Commit Graph

8798 Commits

Author SHA1 Message Date
degasus 48ede4dd30 switch to glsl 130, more than OpenGL 3.1 isn't needed 2012-12-28 16:05:14 +01:00
degasus 70c63ce6cf fix dual pass alpha 2012-12-28 14:24:12 +01:00
degasus 82b33471ae cleanup rasterfont 2012-12-28 11:46:00 +01:00
rog af2820ac88 Don't show multiple exit confirmation dialogues.
Pause emulation while waiting for confirmation to exit.

Fixes issue 5822.
2012-12-28 03:39:34 -05:00
Ryan Houdek 225d29f3f6 Fix this annoying warning in ChunkFile.h 2012-12-27 23:43:59 -06:00
Ryan Houdek 7d93834cd8 Bit more cleanup from removing Nvidia CG 2012-12-27 22:53:07 -06:00
degasus d7f43c7a68 remove cg from windows project files 2012-12-28 01:08:29 +01:00
degasus 193056493a also use shaderCaches in rasterFont 2012-12-28 00:52:44 +01:00
degasus 316a33d1e6 Merge branch 'master' into GLSL-master
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
rog 94116bf89c Always use the right user dir on windows. 2012-12-26 19:55:45 -05:00
degasus db5f4c8c20 fix byte order in osd rasterfont 2012-12-26 23:48:33 +01:00
Ryan Houdek 01cdcc83a3 Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated. 2012-12-26 13:15:19 -06:00
Ryan Houdek 67c1c6b062 Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Ryan Houdek 5169804a61 Remove duplicated X11 code. 2012-12-26 12:12:26 -06:00
Ryan Houdek 93f72d8463 Don't add superfluous whitespace to the CMake file 2012-12-26 11:07:33 -06:00
Ryan Houdek 2d4c3c7c91 Beautify some tabs. 2012-12-26 10:33:45 -06:00
Ryan Houdek e2489196e4 Got overzealous. We aren't removing CG quite yet with this branch. 2012-12-26 00:41:25 -06:00
Ryan Houdek 9a58f9a3bb Rename another function... 2012-12-26 00:34:09 -06:00
Ryan Houdek c43a0dac2e Add to more than 32bit debug 2012-12-26 00:25:49 -06:00
Ryan Houdek fa9abfdc42 Add a include directory 2012-12-26 00:22:17 -06:00
Ryan Houdek a35c5a7f22 Add a include directory 2012-12-26 00:20:09 -06:00
Ryan Houdek f4e7a280a9 Remove cg.lib from some files for Windows and renaming a function. 2012-12-26 00:07:43 -06:00
Ryan Houdek e9099459bb Maybe fix Windows compiling. 2012-12-25 22:52:30 -06:00
Glenn Rice 0de073edea When using the "Keep window on top option" make sure that the effect of
that option ends when emulation ends when using render to main.
2012-12-25 21:12:51 -06:00
Ryan Houdek c884dbf654 Mistype in WX.cpp 2012-12-25 19:18:03 -06:00
Ryan Houdek 01953ff64a Rename the interface files and hopefully fix OSX building. 2012-12-25 19:08:24 -06:00
Pierre Bourdon b3ed3bdb91 Define NvOptimusEnablement to tell the Nvidia driver we need high performance 2012-12-25 13:51:13 +01:00
Pierre Bourdon ba348c29d7 Merge branch 'new-ax-hle'
Only AX GC is merged so far, the new Wii AX development will be done in a
separate branch when I'll start working on it.

There are still a few AX GC bugs remaining, but overall a lot less games have
sound issues than before.

Thanks to everyone who helped test the development builds of this branch and
reported results on the forum thread.

Conflicts:
	Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
2012-12-25 13:33:53 +01:00
Pierre Bourdon 4a74da3e87 Readd the old AXWii (rename the new version to NewAXWii) and set it as default 2012-12-25 13:30:55 +01:00
degasus bff0faea2d Merge branch 'immediate-removal'
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
rog b3714f4874 Don't show compress iso option for wbfs and ciso files.
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
degasus 399a6af66d revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough 2012-12-25 12:22:02 +01:00
NeoBrainX 5ac1e908b1 Truly unstable. 2012-12-24 22:12:33 +01:00
NeoBrainX 9a9f567f28 ... and back to unstable again 2012-12-24 21:29:24 +01:00
NeoBrainX 4798524b75 Dolphin 3.5 release. 2012-12-24 21:29:24 +01:00
NeoBrainX e3e14af0dd Revert "VertexShaderGen: Fix a shader compilation error.". I'm an idiot :p
This reverts commit 4d868705fd.
2012-12-24 21:29:24 +01:00
Pierre Bourdon 2c58385fe2 Revert "Uninitialized usage.. or so it thought."
This reverts commit 7839676c87.

Parlane, I hate you.
2012-12-24 21:23:28 +01:00
Glenn Rice 02acafce52 Merge branch 'translations-update' 2012-12-24 14:09:43 -06:00
NeoBrainX 4d868705fd VertexShaderGen: Fix a shader compilation error. 2012-12-24 19:50:16 +01:00
NeoBrainX 5a78351033 TextureCacheBase: Fix a potential bug when using custom textures. 2012-12-24 19:50:16 +01:00
NeoBrainX 249afa5eac Change copyright year to 2013 in the about dialog. 2012-12-24 19:50:16 +01:00
NeoBrainX 2fedab3bad OGL: Make OSD messages fade out properly instead of having them disappear spontaneously. 2012-12-24 19:50:16 +01:00
rog 2dd570c880 Should completely fix game list sorting. 2012-12-24 13:29:19 -05:00
Ryan Houdek 53398ca5d8 Remove GLSL option from video options 2012-12-24 12:22:02 -06:00
rog da5e61b45b Fix another sorting bug. 2012-12-24 13:04:57 -05:00
rog 14a31d9b3a Fix sorting bug. 2012-12-24 12:48:14 -05:00
Ryan Houdek 9209253e0d Initial removal of Nvidia CG. Still some more cleanup to go 2012-12-24 11:09:52 -06:00
Ryan Houdek 09b05c0f6c Add header guards to InterfaceBase.h 2012-12-24 09:46:37 -06:00
Ryan Houdek 296b9b1c16 Small bit of clean up in GLES-software. 2012-12-24 09:37:12 -06:00
degasus 78ff8a769c Merge branch 'osx-savegame-fix' 2012-12-24 13:30:59 +01:00