Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,913 Commits 1 Branch 0 Tags
3f46f26c495102acd4601c3cc63e3c03f987b09d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Parlane 3f46f26c49 Merge branch 'master' into wii-network 2013-04-25 02:35:39 +12:00
Matthew Parlane 00316e182b Cleanup session data on deconstruct. 2013-04-25 01:59:20 +12:00
Matthew Parlane c3dbbe011d Merge branch 'master' into wii-network 2013-04-25 01:41:45 +12:00
Matthew Parlane 62ebfa0a78 Probably breaks a "fixed" issue.. 2013-04-25 01:39:33 +12:00
Matthew Parlane e98069b647 Merge branch 'master' into wii-network 2013-04-25 01:13:14 +12:00
Matthew Parlane c118c71eac ES needs to handle it's own reply. 
pDevice was being used after free otherwise.
 2013-04-25 01:11:36 +12:00
Matthew Parlane 5df545926b Tidy up and support for setting rootca. 2013-04-24 21:35:36 +12:00
Matthew Parlane 934e150596 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/ConfigManager.cpp
	Source/Core/Core/Src/HLE/HLE_OS.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
 2013-04-24 00:48:00 +12:00
Matthew Parlane b652f1974f Completed port to gnutls for linux. 2013-04-24 00:32:44 +12:00
Matthew Parlane d5ef9f3e85 Merge branch 'master' into wii-network 2013-04-12 17:11:32 +12:00
parlane 2c722bb04f GOOGLE CODE, STOP BEING CRAP please :( 2013-04-12 02:46:30 +00:00
parlane 71a1ae3a16 Make debug builds use unicode, not multibyte. 2013-04-12 02:44:48 +00:00
Matthew Parlane 2c51b34f3c Revert "How did this ever work?" 
This reverts commit 04d299a418.
 2013-04-12 00:45:06 +12:00
Matthew Parlane 04d299a418 How did this ever work? 2013-04-12 00:43:06 +12:00
Matthew Parlane 5eeed7aa9f This should never have been committed. Sorry. 2013-04-12 00:14:38 +12:00
Matthew Parlane 0c9d8d34e1 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/CMakeLists.txt
 2013-04-11 19:55:36 +12:00
Matthew Parlane 99cf57eb39 Fixes two memory leaks, one is pretty bad for OSX. 
Yell at pauldachz if this doesn't work.
Or... say thanks.
 2013-03-01 19:21:34 +13:00
Matthew Parlane ebf79a8865 Merge branch 'master' into wii-network 2013-02-23 17:41:43 +13:00
Matthew Parlane c30b8c9eae Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
 2013-02-23 17:02:58 +13:00
Matthew Parlane 3d480c088f Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
 2013-02-09 20:13:11 +13:00
Matthew Parlane e62c9b0619 Silly windows. Billiard laughed at me :( 2013-02-03 00:35:49 +13:00
Matthew Parlane d05b029b0e Poll gets it's own socket. 
Moved send function back to non async handler.
This was needed to fix one part of GH5.
 2013-02-02 22:42:27 +13:00
Matthew Parlane 6b8bb1b692 lock_gaurds in spaaaaaaaaaccccce. 2013-02-01 20:27:22 +13:00
Matthew Parlane f43567e2b3 Lambda. Billiard. Tree. Forest. Spaaaaaaccccceeeee. 2013-02-01 18:55:27 +13:00
Matthew Parlane 33b0a11747 Merge branch 'master' into wii-network 2013-02-01 01:32:54 +13:00
Matthew Parlane a0a09ed07a Started threading of network. Good results so far. 2013-02-01 01:32:14 +13:00
parlane 65dea7da36 I blame Billiard. 2013-01-29 19:54:10 +00:00
parlane 4efbe1725f Fix for the fix that didn't fix. 2013-01-29 19:52:44 +00:00
parlane 570997e6a1 4000 warnings about not supporting a warning... 2013-01-29 19:47:58 +00:00
Matthew Parlane bca2cac640 keys.bin support added. 
Remove hollywood id from config.
Tidy HLE_Device_es.h (maybe)
Added const params to crypto stuff.
 2013-01-29 01:18:53 +13:00
Matthew Parlane 2dd077028f Merge branch 'master' into wii-network 2013-01-28 22:00:47 +13:00
Matthew Parlane ed9ef874e5 Double hash was not needed. 
Use current keys.
 2013-01-28 21:59:37 +13:00
Matthew Parlane ca4ea817e0 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.h
	Source/Core/Core/Src/HLE/HLE.cpp
	Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
 2013-01-26 21:46:12 +13:00
Matthew Parlane 1083884b8b Windows couldn't convert. 2013-01-26 18:48:02 +13:00
Matthew Parlane a354f47f98 Fixes for POLL on Linux and Mac. 2013-01-26 18:22:58 +13:00
Matthew Parlane 86ee5600dc Fix bug: reuse after free. 
static should not have been used here.
 2013-01-15 22:27:49 +13:00
Matthew Parlane 1deeff47c1 Merge branch 'master' into wii-network 2013-01-14 00:21:09 +13:00
Matthew Parlane 20b43ac1c5 Fix a bug introduced by me when I thought I was fixing something. 
Thanks skidau.
Fixes Mario Kart Wii not being able to write.
This was caused by reuse of a buffer containing an error code.
 2013-01-14 00:16:10 +13:00
Matthew Parlane 6e58c50065 Merge branch 'master' into wii-network 2013-01-13 15:13:56 +13:00
Matthew Parlane 764e155a76 Fix read/write registers. 
Fix read/write register support for r0 - rF.
Reshuffle to have reads/writes together in code.
 2013-01-12 00:53:17 +13:00
Matthew Parlane 465df943a5 Merge branch 'master' into wii-network 2013-01-12 00:01:27 +13:00
Matthew Parlane 65072ad6fb The real fix. Not sure why my build ever worked. 2013-01-11 23:58:47 +13:00
Matthew Parlane 8700d85517 Test fix for ubuntu build. 2013-01-11 23:51:29 +13:00
Matthew Parlane 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
Matthew Parlane 2844708c2d Fix reference to deleted object bug. This should fix channels not loading from sysmenu anymore. 2013-01-09 09:38:36 +13:00
Matthew Parlane 9af785532e Fix reference to deleted object bug. This should fix channels not loading from sysmenu anymore. 2013-01-09 09:22:36 +13:00
Matthew Parlane e8624cc0f2 Merge branch 'gdbstub' into wii-network 
Conflicts:
	Source/Core/Core/Src/ConfigManager.cpp
 2013-01-08 21:21:05 +13:00
Matthew Parlane 5b96fb766f Merge branch 'master' into wii-network 2013-01-08 21:18:48 +13:00
Matthew Parlane 936b047b12 Fixed bug on entry that caused first step to trigger two stops at start. 2013-01-08 20:56:26 +13:00
Matthew Parlane 1211a67191 Missed an ifdef. 2013-01-08 20:32:10 +13:00
Matthew Parlane 0ec7ef4b99 Merge branch 'master' into gdbstub 2013-01-08 20:27:34 +13:00
Matthew Parlane 9f13e69be4 GDB Stub now works with ida and gdb. 
Implemented stepping correctly.
TODO:
Peek incoming data to socket for an interrupt.
Memory breakpoints.
Fix bug with initial step from entry point.
Tidy up code.
Wishlist:
Implement some common query packets.
Jit support.
 2013-01-08 20:26:07 +13:00
Matthew Parlane b7fd1225ba Started gdb stub support. 2013-01-06 23:28:27 +13:00
Matthew Parlane 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
Matthew Parlane 5e4e2ef852 It should be signed. 2013-01-04 22:36:44 +13:00
Matthew Parlane cbab60e8b4 Get rid of comparison between signed/unsigned warnings and others. 2013-01-02 00:42:33 +13:00
Matthew Parlane 47681ea08d Possibly fix build for mac. 2013-01-02 00:19:00 +13:00
Matthew Parlane 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
Matthew Parlane 08cc460e96 This was not obvious from API docs :( Fixed Win32 builds. 2013-01-01 19:49:45 +13:00
Matthew Parlane b5ec660905 Async USB HID :D 2013-01-01 19:24:53 +13:00
Matthew Parlane 8fdc8af1cb Thread safe enq_reply. 2013-01-01 19:24:00 +13:00
Matthew Parlane d3f199273b Fix warning level... someone let me commit this to master ;D 2013-01-01 19:23:45 +13:00
Matthew Parlane f695f088a7 Add usb thread to check for usb updates. 2013-01-01 16:53:59 +13:00
Matthew Parlane 9411c0ac27 Merge branch 'master' into wii-usb 2013-01-01 15:41:09 +13:00
Matthew Parlane c728ef2cd3 Last warning for me on Linux. 2013-01-01 14:42:30 +13:00
Matthew Parlane 40a6649dfe Fix unique_id creation, damn sign extension! 
Cleanup removed devices.
 2012-12-31 20:51:10 +13:00
Matthew Parlane cda82eb1fc Left in a ret value. 2012-12-31 18:20:16 +13:00
Matthew Parlane 90ce6ad371 Better warning for windows. 2012-12-31 18:15:52 +13:00
Matthew Parlane c1b8aa75f2 Tidy up and fix for my Windows crash :D 2012-12-31 18:05:38 +13:00
Matthew Parlane 4f280d1ad8 Merge branch 'master' into wii-usb 2012-12-31 15:53:12 +13:00
Matthew Parlane 4c374cd58a Improve file search speeds by deleting an unused file. 2012-12-31 15:27:36 +13:00
Matthew Parlane 21fa664c2d Hopefully fix win32 build issues. 2012-12-31 03:51:34 +13:00
Matthew Parlane 5240d28776 Small fixes. 2012-12-31 01:50:16 +13:00
Matthew Parlane 200cabc4a5 Merge branch 'master' into wii-usb 2012-12-31 01:09:27 +13:00
Matthew Parlane 510e08370e Now supports hotplugging. 
Much more stable but slow.
Still missing proper cleanup of old handles.
 2012-12-31 01:08:41 +13:00
Matthew Parlane 29f91eef97 Merge branch 'master' into wii-usb 2012-12-30 21:37:45 +13:00
Matthew Parlane 35466fb54f Remove saving of debug file. 2012-12-30 17:48:33 +13:00
Matthew Parlane cc4d491d6c Add ability to enable GPROF in cmake. 2012-12-30 17:48:22 +13:00
Matthew Parlane 86acde92e0 Merge branch 'master' into wii-usb 2012-12-30 17:09:35 +13:00
Matthew Parlane 3b459fb500 Add better FindLibUsb support for MacOSX. 
Make LibUSB optional, don't compile HID support if it doesn't exist.
A lot less hacky. Works quite well on Ubuntu now.
 2012-12-30 16:57:37 +13:00
Matthew Parlane 539bf405f2 In memory of calc84. 
http://dolphin-emu.org
 2012-12-30 16:31:38 +13:00
Matthew Parlane cd54d6efdd Mismatched new/delete. 2012-12-29 22:26:09 +13:00
Matthew Parlane 13bd235c11 Merge branch 'master' into wii-usb 2012-12-29 17:47:52 +13:00
Matthew Parlane de0798f4f7 More stable hackyness. :) 2012-12-29 17:46:44 +13:00
Matthew Parlane bc385cbdd8 libusb 1.0 hacky working on linux. 2012-12-28 01:26:20 +13:00
Matthew Parlane f6418bd093 Merge branch 'master' into wii-usb 2012-12-24 12:58:15 +13:00
Matthew Parlane d9dd94ac8b Add Libusb to cmake and HID files. 2012-12-24 12:58:11 +13:00
Matthew Parlane c626d5aae3 Move to 1.0 libusb. 2012-12-24 08:31:50 +13:00
Matthew Parlane eedca57270 Revert "support retina display" 
This reverts commit 3aa9901618.
 2012-12-24 08:01:44 +13:00
Matthew Parlane 59ec1fe180 Fix some random warnings. 2012-12-24 07:37:50 +13:00
Matthew Parlane f865450b5a Changed to non conflicting overload. 2012-12-24 00:00:45 +13:00
Matthew Parlane a8ddc3e069 Function definition was not updated. 2012-12-24 00:00:25 +13:00
Matthew Parlane 7839676c87 Uninitialized usage.. or so it thought. 2012-12-24 00:00:04 +13:00
Matthew Parlane 4dbd2ed7fb Unused variable. 2012-12-23 23:59:44 +13:00
Matthew Parlane 589222857f Someone changed this to a u32... it's definitely a s32 :) 2012-12-23 23:59:10 +13:00
Matthew Parlane e3eebdf591 Fixes swprintf_s issues hopefully. 
Also fixed an include not using correct caps.

According to:
http://connect.microsoft.com/VisualStudio/feedback/details/646532
 2012-12-23 20:25:11 +13:00
Matthew Parlane 089434b719 Apply same force to float fix as has already been done for DX11. 2012-12-23 20:01:58 +13:00
Matthew Parlane 3a2c0b778a Fixed stupid bool to int conversion warnings. 2012-12-23 19:53:15 +13:00
Matthew Parlane a76059377d Warning free SOIL lib. 2012-12-23 19:24:57 +13:00
Matthew Parlane 1c01fd9c9d Remove warning about ambigious if/else. 2012-12-23 19:24:30 +13:00