Commit graph

1837 commits

Author SHA1 Message Date
degasus
bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2013-01-09 11:00:26 +01:00
degasus
84debc17d5 fix msaa
blitting between msaa fbos may not scale. So we need to resolve the efb before swapping.
2013-01-09 01:50:52 +01:00
Rachel Bryk
91023e133b Move widescreen hack to enhancements tab. 2013-01-02 01:21:20 -05:00
Matthew Parlane
4c374cd58a Improve file search speeds by deleting an unused file. 2012-12-31 15:27:36 +13:00
Pierre Bourdon
bcf1f54c65 Optimized the Dolphin SEO process a bit 2012-12-31 02:31:55 +01:00
Ryan Houdek
64afbade33 Fix 4 warnings on OSX 2012-12-30 04:32:37 -06:00
rog
670ca7e993 Toggle wiimote status based on the actual status, instead of some dumb checkbox that is almost never even right.
The checkbox is still wrong when starting emulation, but it's now purely cosmetic.

Actually fixes issue 5594.
2012-12-29 02:48:20 -05:00
rog
3ec3b7683e Fix (dis)connecting wiimotes via hotkey.
Fixes issue 5594.
2012-12-28 11:21:08 -05:00
Glenn Rice
c303669dd0 Clean up some messy code issues that have been annoying me. 2012-12-28 09:58:06 -06: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
degasus
d7f43c7a68 remove cg from windows project files 2012-12-28 01:08:29 +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
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
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
rog
b3714f4874 Don't show compress iso option for wbfs and ciso files.
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
NeoBrainX
4798524b75 Dolphin 3.5 release. 2012-12-24 21:29:24 +01:00
NeoBrainX
249afa5eac Change copyright year to 2013 in the about dialog. 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
09b05c0f6c Add header guards to InterfaceBase.h 2012-12-24 09:46:37 -06:00
Matthew Parlane
eedca57270 Revert "support retina display"
This reverts commit 3aa9901618.
2012-12-24 08:01:44 +13:00
Matthew Parlane
f865450b5a Changed to non conflicting overload. 2012-12-24 00:00:45 +13:00
Matthew Parlane
4dbd2ed7fb Unused variable. 2012-12-23 23:59:44 +13:00
Grant Paul
3aa9901618 support retina display 2012-12-23 21:33:52 +13:00
Matthew Parlane
3a2c0b778a Fixed stupid bool to int conversion warnings. 2012-12-23 19:53:15 +13:00
Matthew Parlane
1c01fd9c9d Remove warning about ambigious if/else. 2012-12-23 19:24:30 +13:00
rog
d66dd970cd Implement select audio backend CLI option.
Fixes issue 4920.
2012-12-22 18:25:52 -05:00
rog
16ac7803f1 Add support for recording bongos. 2012-12-18 23:20:26 -05:00
Glenn Rice
1bd42b7acc Merge branch 'rehash-msw-cursor-hide' 2012-12-18 08:07:47 -06:00
Ryan Houdek
f6ef6fa0d9 I had the wrong header for Windows in GLVideoInterface.h 2012-12-17 16:23:02 -06:00
Ryan Houdek
f2004b2474 Blindly add WGL.cpp file to the Windows project file. Just for Neo 2012-12-17 16:19:55 -06:00
Ryan Houdek
6099148541 Blind coding fail 2012-12-17 15:33:19 -06:00
Ryan Houdek
8082323c44 Should hopefully fix OSX 2012-12-17 15:29:38 -06:00
Ryan Houdek
3cb5dffbc9 Missed the video interface files. 2012-12-17 15:01:52 -06:00
Ryan Houdek
b78f5debe6 Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
Glenn Rice
98ed34d50b Use wxNullCursor to put the cursor back to its default instead of
explicitly setting the cursor to the arrow.
2012-12-17 11:32:10 -06:00
Glenn Rice
f1cc5c2ff9 Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not. 2012-12-17 08:33:42 -06:00