Ryan Houdek 37b67971e7 Merge remote-tracking branch 'origin/master' into Android-trash ...

Conflicts:
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

2013-04-14 20:43:42 -05:00

..

Android

Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp

2013-04-14 20:39:56 -05:00

Core

Merge remote-tracking branch 'origin/master' into Android-trash

2013-04-14 20:43:42 -05:00

DSPSpy

…

DSPTool

Fixed DSPTool build.

2013-03-26 21:50:49 +11:00

Plugins

Merge remote-tracking branch 'origin/master' into Android-trash

2013-04-14 20:43:42 -05:00

TestSuite

clear cg from project files

2013-02-27 10:55:25 +01:00

UnitTests

…

VSProps

clear cg from project files

2013-02-27 10:55:25 +01:00

CMakeLists.txt

…

Dolphin_2010.sln

Added audio time stretching by using the SoundTouch library.

2013-01-09 22:57:32 +11:00