Lioncash 
							
						 
					 
					
						
						
							
						
						91286f5021 
					 
					
						
						
							
							Fix the Windows build in relation to the recent changes.  
						
						 
						
						
						
						
					 
					
						2014-02-20 01:01:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre Bourdon 
							
						 
					 
					
						
						
							
						
						6847a0fc0c 
					 
					
						
						
							
							Fix more header sorting issues in InputCommon/ (now check-includes clean).  
						
						 
						
						
						
						
					 
					
						2014-02-20 01:01:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre Bourdon 
							
						 
					 
					
						
						
							
						
						dc1db82f70 
					 
					
						
						
							
							Fix Linux build  
						
						 
						
						
						
						
					 
					
						2014-02-18 12:09:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						2afe215271 
					 
					
						
						
							
							Convert all includes to relative paths.  
						
						 
						
						
						
						
					 
					
						2014-02-18 02:19:10 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						3fd87a7636 
					 
					
						
						
							
							Second and final pass of clearing out tabs.  
						
						 
						
						
						
						
					 
					
						2014-02-17 02:19:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						6c4ee1753a 
					 
					
						
						
							
							Fix some vertical alignments  
						
						 
						
						... 
						
						
						
						ie. uses spaces for alignment. 
						
						
					 
					
						2014-02-16 20:12:05 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tillmann Karras 
							
						 
					 
					
						
						
							
						
						404624bf0b 
					 
					
						
						
							
							Turn loops into range-based form  
						
						 
						
						... 
						
						
						
						and some things suggested by cppcheck and compiler warnings. 
						
						
					 
					
						2014-02-13 09:05:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew Parlane 
							
						 
					 
					
						
						
							
						
						88526be3b5 
					 
					
						
						
							
							Merge pull request  #50  from Parlane/inifile_tidy  
						
						 
						
						... 
						
						
						
						Fix IniFile to use string& instead of char* 
						
						
					 
					
						2014-02-13 19:04:27 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew Parlane 
							
						 
					 
					
						
						
							
						
						3fe05e0a9f 
					 
					
						
						
							
							Fix IniFile to use string& instead of char*  
						
						 
						
						... 
						
						
						
						Also removes .c_str() usages where found. 
						
						
					 
					
						2014-02-13 17:06:30 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lioncash 
							
						 
					 
					
						
						
							
						
						d2038049f5 
					 
					
						
						
							
							Replace all include guard ifdefs with "#pragma once"  
						
						 
						
						
						
						
					 
					
						2014-02-10 18:07:16 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						ebb48d019e 
					 
					
						
						
							
							Clean up some struct indentations  
						
						 
						
						... 
						
						
						
						Also cleaned up the indentations of some variable declarations. 
						
						
					 
					
						2014-02-09 19:40:11 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jules Blok 
							
						 
					 
					
						
						
							
						
						2063eddfa3 
					 
					
						
						
							
							ForceFeedback: Fixed scoping bug  
						
						 
						
						... 
						
						
						
						Previous code relied on a destroyed variable to still be valid. 
						
						
					 
					
						2014-02-09 17:04:05 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jules Blok 
							
						 
					 
					
						
						
							
						
						992b91c082 
					 
					
						
						
							
							ForceFeedback: Don't depend on the force_type_name index.  
						
						 
						
						... 
						
						
						
						Instead use a for-each loop, compare GUIDs and save the name pointers. 
						
						
					 
					
						2014-02-09 17:01:45 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jules Blok 
							
						 
					 
					
						
						
							
						
						c6d650c058 
					 
					
						
						
							
							ForceFeedback: Add OSX rumble support  
						
						 
						
						
						
						
					 
					
						2014-02-09 17:01:45 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jules Blok 
							
						 
					 
					
						
						
							
						
						02a95c139e 
					 
					
						
						
							
							ControllerInterface: Move DInput ForceFeedback support to a seperate class  
						
						 
						
						
						
						
					 
					
						2014-02-09 17:01:38 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						557015626a 
					 
					
						
						
							
							Introduce the usage of unique_ptr into the InputCommon ControlEmu.h class. Allows for the automatic handling of resource deallocation.  
						
						 
						
						
						
						
					 
					
						2014-02-01 17:20:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						825c5f689b 
					 
					
						
						
							
							Remove some unnecessary comments, as pointed out by Matt_P.  
						
						 
						
						
						
						
					 
					
						2014-01-30 20:21:18 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						d91a5abba1 
					 
					
						
						
							
							Light cleanup to a little bit of InputCommon. Replaces much of the iterators that litter this section of the codebase.  
						
						 
						
						... 
						
						
						
						Also clean up a little bit of the comments that describe the interface classes. 
						
						
					 
					
						2014-01-30 19:51:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Moreau 
							
						 
					 
					
						
						
							
						
						2c8340e1dc 
					 
					
						
						
							
							Move GLInterface.h into GLInterface directory  
						
						 
						
						
						
						
					 
					
						2014-01-20 00:46:21 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Moreau 
							
						 
					 
					
						
						
							
						
						4b3c338930 
					 
					
						
						
							
							Merge Platform.h into GLInterface.h  
						
						 
						
						
						
						
					 
					
						2014-01-20 00:32:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Moreau 
							
						 
					 
					
						
						
							
						
						84aa98a5a4 
					 
					
						
						
							
							wayland: Add bits required to run as a wayland client.  
						
						 
						
						
						
						
					 
					
						2014-01-19 10:36:20 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						34692ab826 
					 
					
						
						
							
							Remove unnecessary Src/ folders  
						
						 
						
						
						
						
					 
					
						2013-12-31 14:03:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						43e618682e 
					 
					
						
						
							
							Convert all vcxproj files to UNIX line endings  
						
						 
						
						
						
						
					 
					
						2013-12-31 14:03:18 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Houdek 
							
						 
					 
					
						
						
							
						
						2e1aa64958 
					 
					
						
						
							
							[Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound.  
						
						 
						
						
						
						
					 
					
						2013-12-12 21:24:39 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Houdek 
							
						 
					 
					
						
						
							
						
						ba18f38e70 
					 
					
						
						
							
							Merge branch 'master' into android-new-control-input-overlay  
						
						 
						
						... 
						
						
						
						Conflicts:
	Source/Android/res/values-ja/strings.xml
	Source/Android/res/values/strings.xml
	Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
	Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
	Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java 
						
						
					 
					
						2013-11-24 16:12:00 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Houdek 
							
						 
					 
					
						
						
							
						
						f6f2b1fc60 
					 
					
						
						
							
							[Android-overlay] Support multiple gamepads with touch screen controls.  
						
						 
						
						
						
						
					 
					
						2013-11-24 15:04:53 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jordan Cristiano 
							
						 
					 
					
						
						
							
						
						39a4d4329d 
					 
					
						
						
							
							more warning fixes  
						
						 
						
						
						
						
					 
					
						2013-11-14 02:19:15 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								comex 
							
						 
					 
					
						
						
							
						
						21610c2e54 
					 
					
						
						
							
							Run code through clang-modernize -add-override to add 'override' decls.  
						
						 
						
						
						
						
					 
					
						2013-11-03 20:54:05 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								comex 
							
						 
					 
					
						
						
							
						
						c579637eaf 
					 
					
						
						
							
							Run code through the advanced tool 'sed' to remove trailing whitespace.  
						
						 
						
						
						
						
					 
					
						2013-11-03 20:54:05 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								comex 
							
						 
					 
					
						
						
							
						
						965b32be9c 
					 
					
						
						
							
							Run code through clang-modernize -loop-convert to create range-based for loops, and manually fix some stuff up.  
						
						 
						
						
						
						
					 
					
						2013-11-03 20:54:01 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shawn Hoffman 
							
						 
					 
					
						
						
							
						
						ccd30024b3 
					 
					
						
						
							
							Update to VS2013 and a slew of build-related updates. Notes:  
						
						 
						
						... 
						
						
						
						* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled 
						
						
					 
					
						2013-10-26 17:55:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						97cd42f5c3 
					 
					
						
						
							
							Remove some unnecessary includes as well as simplifying exisiting ones if possible.  
						
						 
						
						
						
						
					 
					
						2013-10-19 19:58:56 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								comex 
							
						 
					 
					
						
						
							
						
						de1773affb 
					 
					
						
						
							
							Basic precompiled header support for Linux/OS X.  Shaves 20-30% off full rebuild time on my system.  
						
						 
						
						
						
						
					 
					
						2013-10-17 00:07:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						f3af8ee0f0 
					 
					
						
						
							
							Revert "Remove some unnecessary includes."  
						
						 
						
						... 
						
						
						
						Turns out this explodes on Linux.
This reverts commit c4696568cc . 
						
						
					 
					
						2013-10-14 04:05:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						c4696568cc 
					 
					
						
						
							
							Remove some unnecessary includes.  
						
						 
						
						
						
						
					 
					
						2013-10-14 04:01:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						af951f467e 
					 
					
						
						
							
							[InputCommon] Fix a bug in ControllerInterface::UpdateOutput() in ControllerInterface.cpp. The variable ok_count was never incremented, which caused the function to always return false.  
						
						 
						
						
						
						
					 
					
						2013-09-18 10:09:32 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre Bourdon 
							
						 
					 
					
						
						
							
						
						501eafb407 
					 
					
						
						
							
							Overlay local gameinis over global gameinis instead of copying.  
						
						 
						
						... 
						
						
						
						Huge megacommit because a lot of things needed to be modified to make this
possible. 
						
						
					 
					
						2013-09-14 17:46:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jordan Woyak 
							
						 
					 
					
						
						
							
						
						ce49964dfe 
					 
					
						
						
							
							Fix "modifier" button functionality et al.  
						
						 
						
						
						
						
					 
					
						2013-09-11 17:48:04 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								comex 
							
						 
					 
					
						
						
							
						
						fd7cf5bb71 
					 
					
						
						
							
							A bunch of trivial changes to fix clang warnings.  
						
						 
						
						
						
						
					 
					
						2013-09-01 22:58:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre Bourdon 
							
						 
					 
					
						
						
							
						
						c3065ecb66 
					 
					
						
						
							
							Fix compatibility with the SDL2.0 release.  
						
						 
						
						... 
						
						
						
						SDL2.0 removed SDL_HAPTIC_SQUARE because of ABI issues (see comment #7  on issue
6491 by Ryan C. Gordon from the SDL project). It will be reintroduced again in
2.1, so keep the code and #ifdef it away. 
						
						
					 
					
						2013-08-15 22:18:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre Bourdon 
							
						 
					 
					
						
						
							
						
						0aa9308006 
					 
					
						
						
							
							Revert "Fix a memory leak in ExpressionParser.cpp"  
						
						 
						
						... 
						
						
						
						This reverts commit cce809ac90 .
The code was actually correct: "expr" is never allocated when an error is
returned. This means when the expression parser fails, deleting "expr" means
deleting an uninitialized pointer. 
						
						
					 
					
						2013-08-09 10:46:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						cce809ac90 
					 
					
						
						
							
							Fix a memory leak in ExpressionParser.cpp  
						
						 
						
						... 
						
						
						
						Because there's a return here, expr should be deleted since it's not assigned to anything before returning. 
						
						
					 
					
						2013-08-08 17:56:15 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						bc17798ef2 
					 
					
						
						
							
							InputConfigDiag: Add a simple error status label  
						
						 
						
						... 
						
						
						
						This tells you what you did wrong at a high level if you messed up. 
						
						
					 
					
						2013-07-22 03:19:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						bd7ca7625b 
					 
					
						
						
							
							Fix up last commit  
						
						 
						
						... 
						
						
						
						I forgot to git add this change. 
						
						
					 
					
						2013-07-21 00:51:07 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Max Eliaser 
							
						 
					 
					
						
						
							
						
						fe2fe8b6cc 
					 
					
						
						
							
							Clean up all the GetName methods for XInput2 controls.  
						
						 
						
						
						
						
					 
					
						2013-07-20 13:58:02 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Max Eliaser 
							
						 
					 
					
						
						
							
						
						9fbc5ff27c 
					 
					
						
						
							
							Add X11 XInput2 input plugin, including MPX and with support for axis controls.  
						
						 
						
						... 
						
						
						
						Based on the original XLib plugin, and thus shares some of its warts. 
						
						
					 
					
						2013-07-20 13:58:02 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						4c807fa7b4 
					 
					
						
						
							
							Fix Device.h placement in VC++  
						
						 
						
						
						
						
					 
					
						2013-07-15 16:24:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						b64e882ba5 
					 
					
						
						
							
							ExpressionParser: Parse fully qualified control names correctly  
						
						 
						
						... 
						
						
						
						Without clearing out the "accumulator" for the backtick parsing,
our control name was full of junk (the previous device name) causing
us to not correctly find the control.
Ensure that always we clear the "accumulator" string during backtick
parsing. 
						
						
					 
					
						2013-07-12 13:26:09 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lioncash 
							
						 
					 
					
						
						
							
						
						03a47d3c6b 
					 
					
						
						
							
							Fix a case where a boolean check (vector.empty()) was used when a clear (vector.clear()) was intended in ExpressionParser.cpp.  
						
						 
						
						
						
						
					 
					
						2013-07-02 21:42:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasper St. Pierre 
							
						 
					 
					
						
						
							
						
						d5983b587e 
					 
					
						
						
							
							InputConfigDialog: Don't show "..." for complicated expressions  
						
						 
						
						... 
						
						
						
						Just show the actual expression. We need to do a bit of mangling
here as wx has no way to turn off mnemonics parsing, so do that
as well. 
						
						
					 
					
						2013-06-29 18:28:14 -04:00