degasus a1c5e90083 Merge branch 'master' into GLSL-master ...

Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp

2013-03-06 15:59:29 +01:00

..

Debugger

wxString conversion cleanup.

2013-03-02 20:34:53 -06:00

GLInterface

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

MemoryCards

Move GCMemcard from DolphinWX/Memorycards to Core/HW

2011-10-04 13:14:18 -07:00

AboutDolphin.cpp

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

AboutDolphin.h

More work on making dialogs close when escape is pressed, and some general GUI code clean up.

2011-03-16 22:22:21 +00:00

ARCodeAddEdit.cpp

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

ARCodeAddEdit.h

Revert "Ctrl+A support in the action replay code editing menu."

2013-01-21 00:11:53 -05:00

CheatsWindow.cpp

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

CheatsWindow.h

Eliminate nearly all the _connect_macro_ ugliness by using wxw's newish Bind functions.

2013-01-13 03:06:56 -06:00

ConfigMain.cpp

Add ARM Jit to GUI when built on ARM

2013-03-06 03:25:45 +00:00

ConfigMain.h

Merge branch 'external-theme'

2013-01-16 19:00:19 -06:00

FifoPlayerDlg.cpp

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

FifoPlayerDlg.h

Replace all of Connect/Disconnect with Bind/Unbind.

2013-01-13 12:45:33 -06:00

Frame.cpp

Eliminate some netplay gamelist ugliness.

2013-03-03 17:56:40 -06:00

Frame.h

Kill themes in the config and load pngs from "theme" directory for now.

2013-01-13 13:12:50 -06:00

FrameAui.cpp

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

FrameTools.cpp

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

GameListCtrl.cpp

Use standard binary multiple unit symbols for game size display.

2013-03-05 14:58:30 -06:00

GameListCtrl.h

Eliminate some netplay gamelist ugliness.

2013-03-03 17:56:40 -06:00

GCMicDlg.cpp

Replace all of Connect/Disconnect with Bind/Unbind.

2013-01-13 12:45:33 -06:00

GCMicDlg.h

ok...just need to update the button...

2011-10-09 01:11:48 -07:00

GeckoCodeDiag.cpp

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

GeckoCodeDiag.h

Added a note to try the native code handler in the error message window.

2012-01-03 01:24:16 -05:00

GLInterface.h

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

Globals.h

Remove some unused resource files.

2013-01-16 17:09:09 -06:00

HotkeyDlg.cpp

Replace all of Connect/Disconnect with Bind/Unbind.

2013-01-13 12:45:33 -06:00

HotkeyDlg.h

Fix and issue with the escape button closing the hotkey dialog when trying to set a hotkey to escape.

2011-03-16 12:59:05 +00:00

InputConfigDiag.cpp

Buildfix.

2013-02-28 03:11:10 -06:00

InputConfigDiag.h

Eliminate nearly all the _connect_macro_ ugliness by using wxw's newish Bind functions.

2013-01-13 03:06:56 -06:00

InputConfigDiagBitmaps.cpp

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

ISOFile.cpp

Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases.

2013-03-03 18:34:03 -06:00

ISOFile.h

Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases.

2013-03-03 18:34:03 -06:00

ISOProperties.cpp

Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases.

2013-03-03 18:34:03 -06:00

ISOProperties.h

Remove "Alternate Wiimote Timing" option. It's no longer needed.

2013-02-01 21:39:01 -06:00

LogConfigWindow.cpp

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

LogConfigWindow.h

added an option to log to the attached Windows debugger (so e.g. NOTICE_LOG messages can show up in Visual Studio's output window)

2012-01-07 23:04:18 -08:00

LogWindow.cpp

More string conversion cleanup.

2013-03-03 18:40:50 -06:00

LogWindow.h

I'm confused at why SHIFT-JIS was being used here.

2013-03-02 20:42:48 -06:00

Main.cpp

Disable SSE2 check in the GUI when building ARM.

2013-03-05 14:03:01 +00:00

Main.h

Reinstate AfterInit(), which is still needed for MacOpenFile()

2011-03-16 01:50:46 +00:00

MainAndroid.cpp

ARM Support without GLSL

2013-02-26 13:49:00 -06:00

MainNoGUI.cpp

Have the ability to disable screensaver due to Nvidia + Displayport can cause annoying flickering

2011-08-26 13:29:01 -07:00

MemcardManager.cpp

More wxString conversion cleanup.

2013-03-03 02:30:45 -06:00

MemcardManager.h

Replace all of Connect/Disconnect with Bind/Unbind.

2013-01-13 12:45:33 -06:00

NetWindow.cpp

Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases.

2013-03-03 18:34:03 -06:00

NetWindow.h

build against wxWidgets3 from Externals on Windows.

2012-03-18 02:31:19 -07:00

PatchAddEdit.cpp

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

PatchAddEdit.h

Make PatchAddEdit complain and not modify entry if fields are invalid instead of just filling in zeros. Fixes issue 4291.

2011-07-09 21:00:30 +00:00

PHackSettings.cpp

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

PHackSettings.h

Finish making dialogs close when escape is pressed. Fixes issue 4265. At least I think I got them all.

2011-03-17 04:26:01 +00:00

stdafx.cpp

Now ALL copyright dates are fixed to the legally correct year: The year in which the project began. Now we don't have to change it every year :)

2009-07-28 21:32:10 +00:00

stdafx.h

Removed extra space character in "Use FPS For Limiting". Changed "Frame Stepping" to "Frame Advance". Some minor preprocessor cleanup.

2011-01-25 11:14:11 +00:00

TASInputDlg.cpp

Fix the majority of the compiler warnings unearthed by the addition of

2013-01-29 23:24:51 -06:00

TASInputDlg.h

Revert "support retina display"

2012-12-24 08:01:44 +13:00

UDPConfigDiag.cpp

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

UDPConfigDiag.h

Move UDPConfigDiag into Dolphin, to allow building of UDP Wiimote again.

2010-11-14 13:30:57 +00:00

VideoConfigDiag.cpp

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

VideoConfigDiag.h

Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.

2013-02-28 02:40:03 -06:00

WiimoteConfigDiag.cpp

Provide an option to not send speaker data. It can cause rumble lag even when the speaker is muted.

2013-02-15 03:00:31 -06:00

WiimoteConfigDiag.h

Provide an option to not send speaker data. It can cause rumble lag even when the speaker is muted.

2013-02-15 03:00:31 -06:00

WXInputBase.cpp

build against wxWidgets3 from Externals on Windows.

2012-03-18 02:31:19 -07:00

WXInputBase.h

Clean up nowx and stop cocoaApp busy-waiting in the main loop.

2011-01-15 10:33:07 +00:00

WxUtils.cpp

Buildfix.

2013-02-28 03:11:10 -06:00

WxUtils.h

Attempt to be consistent with conversions between std::string and wxString.

2013-02-28 02:30:05 -06:00

X11Utils.cpp

Fix compiling Dolphin on devices that provide crazy GLES drivers

2013-03-05 03:53:25 +00:00

X11Utils.h

On linux don't check to see if the xdg-screensaver program is present at build time. Just build in the code to call the program. If the program does not exist it will silently fail, and the screensaver will not be inhibited.

2011-06-17 13:14:55 +00:00