ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,745 Commits 6 Branches 12 Tags 1.3 GiB
Commit Graph

1827 Commits

Author SHA1 Message Date
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
rog 4c7b63cf0e Save secondary list sorting. 
Allow sorting by platform ascending.

Fixes issue 5774.
 2012-12-17 06:08:45 -05:00
Glenn Rice 0a918782cf Reorder the inclusions to hopefully fix the icon issue. 2012-12-17 00:11:59 -06:00
Glenn Rice ff7041804c Make sure that the wxWidgets manifest does not override the dolphin one. 2012-12-16 23:55:22 -06:00
Glenn Rice 832a5a0b26 Add the resource include in only one place for all builds. 2012-12-16 23:39:05 -06:00
Glenn Rice d34fb84734 Add the resource inclusion to the other builds. 2012-12-16 23:21:11 -06:00
Glenn Rice a581c75a37 Make the resource include path relative. 2012-12-16 22:52:29 -06:00
Glenn Rice d1a812231e Rework the way that windows mouse cursor hiding is done to use the built 
in wxWidgets methods.
 2012-12-16 21:32:14 -06:00
Ryan Houdek 8838944cd3 Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956." 
This reverts commit 884006e4c8.
 2012-12-15 00:04:10 -06:00
Ryan Houdek 884006e4c8 Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956. 2012-12-14 15:19:22 -06:00
Glenn Rice a6374f25fd Fix OSX build once again. Apparently OSX needs to get with the times. 2012-12-10 10:31:08 -06:00