6e58c50065
Merge branch 'master' into wii-network
2013-01-13 15:13:56 +13:00
dfc0c4b08d
Fix two signed/unsigned mismatch warnings.
...
Also tidied up SDCardUtil - made the variables make more sense (typewise)
2013-01-11 19:38:04 -05:00
465df943a5
Merge branch 'master' into wii-network
2013-01-12 00:01:27 +13:00
9754fda516
Merge branch 'wii-usb' into temp merge branch
...
Conflicts:
Source/Core/Common/Src/Log.h
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-01-11 23:07:12 +13:00
51a1d4cde7
Revert "Very tiny cleanup of ChunkFile.h."
...
int/size_t change without updating the rev# caused crash on Dolphin start
This reverts commit cf942450e0
2013-01-10 17:41:12 -06:00
cf942450e0
Very tiny cleanup of ChunkFile.h.
...
Also changed the size parameter from DoVoid to size_t. As far as I know, that should never be negative.
Also changed the the count parameter of DoArray to size_t, this also should never be negative.
Got rid of some typecasts.
2013-01-10 17:38:38 -05:00
4f4aa4860d
Fix a currently unused unique_lock function. Thanks to Lioncash.
2013-01-08 16:50:09 -06:00
baa29f571c
Fix incorrect iterator usage in BreakPoints::Clear
2013-01-08 15:02:50 -06:00
4925a28f94
PixelShaderGen: Shader uid maintainance
2013-01-08 18:56:01 +01:00
b06f30f845
Remove the per pixel depth option.
...
Depth calculations are always done in the pixel shader now.
Due to the unpredictability of our zcomploc hacks this commit probably changes the behavior of some games which use zcomploc.
2013-01-08 18:16:48 +01:00
876eee5e60
PixelShaderGen: Don't disable depth texture emulation if z writing is disabled (this is what VideoSoftware is doing).
2013-01-08 18:16:48 +01:00
e8624cc0f2
Merge branch 'gdbstub' into wii-network
...
Conflicts:
Source/Core/Core/Src/ConfigManager.cpp
2013-01-08 21:21:05 +13:00
5b96fb766f
Merge branch 'master' into wii-network
2013-01-08 21:18:48 +13:00
0ec7ef4b99
Merge branch 'master' into gdbstub
2013-01-08 20:27:34 +13:00
d0301ca89d
Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae
2013-01-07 13:47:34 -06:00
b7fd1225ba
Started gdb stub support.
2013-01-06 23:28:27 +13:00
67d0e66af4
Add generate id support.
...
Add hollywood id to config file.
SSL and WC24 have their own logs now.
2013-01-04 22:36:44 +13:00
9b51c99c6b
Make sure the null character is not included in the string.
2013-01-03 19:49:19 -06:00
12a606501c
Fix the name and description truncation issue in a cleaner way.
2013-01-03 19:21:20 -06:00
3da05af30a
Fix truncated names and descriptions in the game list on linux.
2013-01-03 10:35:07 -06:00
e0c9a1fd09
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/CMakeLists.txt
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
2013-01-01 23:28:46 +13:00
d3f199273b
Fix warning level... someone let me commit this to master ;D
2013-01-01 19:23:45 +13:00
86acde92e0
Merge branch 'master' into wii-usb
2012-12-30 17:09:35 +13:00
539bf405f2
In memory of calc84.
...
http://dolphin-emu.org
2012-12-30 16:31:38 +13:00
13bd235c11
Merge branch 'master' into wii-usb
2012-12-29 17:47:52 +13:00
225d29f3f6
Fix this annoying warning in ChunkFile.h
2012-12-27 23:43:59 -06:00
94116bf89c
Always use the right user dir on windows.
2012-12-26 19:55:45 -05:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
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
4d868705fd
VertexShaderGen: Fix a shader compilation error.
2012-12-24 19:50:16 +01:00
78ff8a769c
Merge branch 'osx-savegame-fix'
2012-12-24 13:30:59 +01:00
f6418bd093
Merge branch 'master' into wii-usb
2012-12-24 12:58:15 +13:00
59ec1fe180
Fix some random warnings.
2012-12-24 07:37:50 +13:00
bd0abb3d2f
revert last commit, add CheckInvalidState to VideoBackend
2012-12-23 13:32:23 +01:00
a8ddc3e069
Function definition was not updated.
2012-12-24 00:00:25 +13:00
2db4549174
Fix a memory leak based on Lioncash's patches.
2012-12-18 23:35:28 -06:00
b78f5debe6
Initial push of GLES and GLUtil file breakup.
2012-12-17 14:54:20 -06:00
351979795c
revert changes to banner background color
2012-12-16 15:29:25 -08:00
3b559d89ec
If the HOME environment variable isn't set, fall back on to PWD. Closes 5584.
2012-12-14 11:47:12 -06:00
532fdada96
Adds the Wii Korean settings file. It was handled in the wii-network branch in rev c42a6f156e. Master handles the settings files differently. Until wii-network merges in to master, this closes issue 5642.
2012-12-14 11:37:26 -06:00
d0c4332d99
don't update vbo, if there are no changes in Renderer::Swap
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:13 -06:00
e85438cba0
Clean up gcc/g++ compiler warnings that have accumulated.
2012-12-10 00:40:28 -06:00
3d9712a99e
Remove more unused code.
2012-11-26 03:48:04 -05:00
97f5b1665f
what is this even...
2012-11-26 02:11:52 -05:00
d8b879a4ee
Movd back to libusb for full support on windows
2012-11-15 01:09:25 +13:00
0caf693d1c
Merge branch 'master' into wii-usb
2012-11-12 19:19:05 +13:00
d032c40a58
- Added a new wilcard for importing savegames, which basically shows all saves (gci, gcs and sav). This is set as default (I really got frustrated of having to change the type every single time when making tests for GCMM, and I think it makes more sense at user level to just show all saves regardless the format)
...
- In icon retrieving I removed the "format check" as it shouldn't really matter to have mixed icon formats. Also removed the "Time splitters hack" as there's no reason for it since we are only checking the last 3 bits and I'm pretty sure having bits 1 and 2 set is the same as having them unset.
- Icon retrieving uses AnimSpeed as stop signal (every icon must have an speed set, the first speed that is 0 means there are no more icons)
- Also, in icon retrieving I added support for "blank frames"(Luigi's Mansion and Pikmin that I know of). With this the base for icon animation is complete.
- Fixed PSOIII savegame patch which was wrong before.
Signed-off-by: LPFaint99 <lpfaint99@gmail.com>
2012-10-29 21:02:59 -07:00
5dd49edaec
Badaboom. Add in Memory include to CDUtils.cpp
2012-10-30 02:45:42 +00:00
Matthew Parlane