1970 Commits

Author SHA1 Message Date
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
Ryan Houdek
1214bf1359 Add ARM Jit to GUI when built on ARM 2013-03-06 03:25:45 +00:00
Jordan Woyak
10d57a3402 Use standard binary multiple unit symbols for game size display.
Use integer math for the calculation as we cannot rely on floats for something as important as game size display!
2013-03-05 14:58:30 -06:00
degasus
4714e4f99c fix agl 2013-03-05 15:17:00 +01:00
Ryan Houdek
240238308c Disable SSE2 check in the GUI when building ARM. 2013-03-05 14:03:01 +00:00
Ryan Houdek
3ac7ee4623 Fix compiling Dolphin on devices that provide crazy GLES drivers 2013-03-05 03:53:25 +00:00
Jordan Woyak
bdc96342ba More string conversion cleanup. 2013-03-03 18:40:50 -06:00
Jordan Woyak
6026b29844 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
Jordan Woyak
a30636cb88 Buildfix. 2013-03-03 18:00:48 -06:00
Jordan Woyak
ae14578bc5 Eliminate some netplay gamelist ugliness. 2013-03-03 17:56:40 -06:00
Jordan Woyak
fad2b65d76 More wxString conversion cleanup. 2013-03-03 02:30:45 -06:00
Jordan Woyak
88cb11ba0a I'm confused at why SHIFT-JIS was being used here. 2013-03-02 20:42:48 -06:00
Jordan Woyak
e183711d74 wxString conversion cleanup. 2013-03-02 20:34:53 -06:00
Jordan Woyak
6c8adf6130 Eliminate the wstring game name.
Some cleanup throughout related code. (try to make logic in ISOFile understandable by a human)
Encode strings in UTF-8 rather than somehow trying to determine the encoding in the GUI code.

Non-windows OSes temporarily broken.
2013-03-02 20:00:36 -06:00
Jordan Woyak
2b1af36900 Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
Jordan Woyak
2356e5c0e7 Eliminate some baseless restrictions in PointerWrap, mainly vector<string> not working. 2013-03-02 03:32:30 -06:00
Jordan Woyak
e079d24912 Kill wstring version of game description. 2013-03-01 22:45:10 -06:00
Pierre Bourdon
a2d08d6740 Fix Dolphin starting only once then crashing at startup 2013-03-01 10:11:08 +01:00
Jordan Woyak
dea1e2827d Open std::fstream in a unicode-safe manner. 2013-02-28 19:33:39 -06:00
Jordan Woyak
95558cdc69 Buildfix. 2013-02-28 03:11:10 -06:00
Jordan Woyak
03ec9a2e08 Kill some unnecessary c_str and use StrToWxStr in a few places that I missed. 2013-02-28 02:40:03 -06:00
Jordan Woyak
56f09d3b91 Attempt to be consistent with conversions between std::string and wxString. 2013-02-28 02:30:05 -06:00
degasus
1b8d044543 clear cg from project files 2013-02-27 10:55:25 +01:00
Ryan Houdek
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Jordan Woyak
46adbfa9ed Merge branch 'real-wiimote-scanning' 2013-02-25 17:33:34 -06:00
Jonathan Jones
ba979582e2 Makes the "No banner" banner image theme-able. Current "sexy X" banner included as part of "Boomy" theme.
Fixes issue 6023.
2013-02-22 15:30:07 -05:00
degasus
bed29f843f fix spelling 2013-02-21 18:29:17 +01:00
degasus
40e17b4cb8 add option for hacked upload and disable it by default 2013-02-21 18:18:44 +01:00
degasus
fed574d08b solve merge conflict 2013-02-18 18:55:42 +01:00
degasus
a629dea4dc Merge branch 'master' into GLSL-master
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
2013-02-18 18:49:20 +01:00
skidau
1792a9d27b Added the ability to reverse the direction of the force feedback by allowing negative range values.
Fixes issue 5981.
2013-02-17 15:03:10 +11:00
Jordan Woyak
ef90b15f3e 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
Ryan Houdek
818a376bd4 Fix header guard and definitions not being set to 1 2013-02-12 14:11:29 -06:00
Jordan Woyak
da53ca8ee3 "Wait for the wiimote to connect"? I think that's a horrible idea. 2013-02-12 00:19:27 -06:00
Jordan Woyak
a6461ca186 Improve wiimote reconnection on changing wiimote sources. 2013-02-11 23:39:04 -06:00
Jordan Woyak
fa10335c55 Make continuous scanning optional. 2013-02-11 17:58:56 -06:00
Ryan Houdek
8923f0e13b Fix header guard and definitions not being set to 1 2013-02-11 15:06:40 -06:00
Jordan Woyak
1c64b1993d Change the ugly "no banner" banner to the sexy "X" from the website. 2013-02-09 17:04:41 -06:00
NeoBrainX
6645bd6fc6 Fix a crash in the FifoPlayer dialog. 2013-02-09 12:39:19 +01:00
Jordan Woyak
8ce58759e3 Remove some old nonsense. 2013-02-07 23:52:50 -06:00
Jordan Woyak
026793fa4a Fixup real wiimote GUI. 2013-02-07 23:17:51 -06:00
Jordan Woyak
c4df69a342 Merge branch 'master' into real-wiimote-scanning
Conflicts:
	Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
	Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
2013-02-07 20:22:06 -06:00
Jordan Woyak
8f5fb7e6f9 Hopefully buildfix Windows. (thanks for the patch, RachelB) 2013-02-07 14:15:47 -06:00
degasus
376a807dea first try of osx fix, mostly by pauldachz 2013-02-07 10:34:29 +01:00
Rachel Bryk
0ebe35e0ef Disable play and record buttons if an iso was selected, but is later deselected. 2013-02-07 00:31:57 -05:00
Rachel Bryk
6bc9e7579c Disable start/play recording buttons when no iso is selected. 2013-02-06 20:56:07 -05:00
skidau
03d9cca2fe Added a script to copy the OpenAL dll's to the main Dolphin folder on new builds. 2013-02-03 19:02:46 +11:00
Jordan Woyak
11a4c92325 Remove "Alternate Wiimote Timing" option. It's no longer needed.
Also kill some irrelevant comments.
2013-02-01 21:39:01 -06:00
degasus
c05f66bdd0 first try for osx core profile
now it doesn't crash, but it still hangs on startup
2013-01-31 12:20:17 +01:00
Rachel Bryk
e199d21513 Revert "Toggle full screen when double clicking the render window."
This reverts commit de27f0bea9ff541fddfea8a875b15372d6420f8d.
2013-01-31 03:54:18 -05:00