Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								50af655fe9 
								
							 
						 
						
							
							
								
								Check for GCC 4.7 or above  
							
							... 
							
							
							
							To prevent compilation errors beforehand. 
							
						 
						
							2013-05-22 19:15:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								c989aae1c3 
								
							 
						 
						
							
							
								
								Remove whitespaces from system config lines  
							
							... 
							
							
							
							to fix errors with files that have different line endings than the
system. Output a line number when something is wrong. This should be
done wherever reading from text files probably. 
							
						 
						
							2013-05-22 19:13:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								edc26aa4e1 
								
							 
						 
						
							
							
								
								Add Volume control in Windows and Linux  
							
							... 
							
							
							
							Add volume control int Windows through the mixer API (until XP) and the
EndpointVolume API (Vista and above). Add volume control in Linux
through ALSA.
Convert AudioManager to use shared_ptrs. 
							
						 
						
							2013-05-22 19:11:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								12b4b12103 
								
							 
						 
						
							
							
								
								Added comment to src/ImageIO.h  
							
							
							
						 
						
							2013-05-22 11:30:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								a1cb5bdda1 
								
							 
						 
						
							
							
								
								Fix sounds not playing after launching a game  
							
							... 
							
							
							
							Correctly re-initialize SDL_Audio after launching a game. 
							
						 
						
							2013-05-21 10:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								eaf157a330 
								
							 
						 
						
							
							
								
								Merge branch 'master' into unstable  
							
							
							
						 
						
							2013-05-20 11:51:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								f3229f111c 
								
							 
						 
						
							
							
								
								Fix for audio not reinitializing on restart.  
							
							
							
						 
						
							2013-05-20 10:57:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								79b7ab10b1 
								
							 
						 
						
							
							
								
								Merge  https://github.com/HorstBaerbel/EmulationStation  into unstable  
							
							... 
							
							
							
							Conflicts:
	src/platform.cpp 
							
						 
						
							2013-05-17 10:05:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								fa57968c04 
								
							 
						 
						
							
							
								
								Improve CMake script for Windows builds - Only CMakeLists.txt  
							
							... 
							
							
							
							Enable multi-processor compilation in Visual Studio / NMake. Disable
console in release builds (broken in CMake atm, you have to set linker
/SUBSYSTEM:WINDOWS manually).
Did I already say that the automatic "select all" of GitHub for Windows
sucks?! 
							
						 
						
							2013-05-17 11:58:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								86f68f29f9 
								
							 
						 
						
							
							
								
								Revert "Improve CMake script for Windows builds"  
							
							... 
							
							
							
							This reverts commit e92a68fb46 
							
						 
						
							2013-05-17 11:55:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								e92a68fb46 
								
							 
						 
						
							
							
								
								Improve CMake script for Windows builds  
							
							... 
							
							
							
							Enable multi-processor compilation in Visual Studio / NMake. Disable
console in release builds (broken in CMake atm, you have to set linker
/SUBSYSTEM:WINDOWS manually). 
							
						 
						
							2013-05-17 11:43:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								d89a1020a2 
								
							 
						 
						
							
							
								
								Probably fix the Makefile.x86 for Linux desktop.  
							
							
							
						 
						
							2013-05-16 19:17:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								c5e91da629 
								
							 
						 
						
							
							
								
								Fixed Raspberry Pi Makefile.  
							
							... 
							
							
							
							Fixed a reorder warning in InputManager.cpp. 
							
						 
						
							2013-05-16 19:13:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								802aa50ad9 
								
							 
						 
						
							
							
								
								Fix compile errors on Ubuntu  
							
							
							
						 
						
							2013-05-16 23:25:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								75d0226aa5 
								
							 
						 
						
							
							
								
								The old Makefiles contain the proper Renderer_init_X.cpp now.  
							
							
							
						 
						
							2013-05-16 14:45:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								cd76e2a654 
								
							 
						 
						
							
							
								
								Added ability to skip all inputs beyond menu by pressing Accept.  
							
							
							
						 
						
							2013-05-16 14:39:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								4b4c891b30 
								
							 
						 
						
							
							
								
								Find proper home path  
							
							... 
							
							
							
							Should work on more systems now. 
							
						 
						
							2013-05-16 21:29:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								42829b3b6d 
								
							 
						 
						
							
							
								
								Add version information, add window and file icon  
							
							... 
							
							
							
							Version information nowe resides in EmulationStation.h and is compiled
into the EXE on Windows. An icon file is also included and on
non-Windows systems the window icon is loaded from PNG data compiled
into the EXE and set via SDL_WM_SetIcon(). 
							
						 
						
							2013-05-16 21:26:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								ec48c5d3a4 
								
							 
						 
						
							
							
								
								Fixed a crash with empty path names in theme box definitions.  
							
							
							
						 
						
							2013-05-16 13:27:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								0f6338045a 
								
							 
						 
						
							
							
								
								Added Windows compiled files to .gitignore.  
							
							... 
							
							
							
							Added "WIN32" preprocessor definition to the default VS2010 project.
Replaced getHomePath() with the one mentioned in the pull request comments. 
							
						 
						
							2013-05-16 12:43:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								8803266660 
								
							 
						 
						
							
							
								
								Add preliminary ES logo  
							
							... 
							
							
							
							Better than nothing... ;) 
							
						 
						
							2013-05-16 16:02:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								1d9cee83a5 
								
							 
						 
						
							
							
								
								Improve CMake file and FindOpenGLES script  
							
							... 
							
							
							
							CMake should now add proper library files and paths to the build files.
FindOpenGLES.cmake should now hopefully find GLES on Raspberry Pi. 
							
						 
						
							2013-05-16 12:04:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								fb1e2d8595 
								
							 
						 
						
							
							
								
								Remove paths from property file  
							
							... 
							
							
							
							You need to set them manually there anyway... 
							
						 
						
							2013-05-15 10:36:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								517ccbefb5 
								
							 
						 
						
							
							
								
								Fix that Sounds can't restart  
							
							... 
							
							
							
							Sounds now restart when e.g. scrolling up/down repeatedly. 
							
						 
						
							2013-05-15 10:12:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								a2c990bd26 
								
							 
						 
						
							
							
								
								Fix compile errors on Rasbian  
							
							... 
							
							
							
							Add proper EGL/GLES libraries. Change glVertexPointer() call, because
GLES only can use GL_BYTE, GL_SHORT, GL_FIXED and GL_FLOAT... 
							
						 
						
							2013-05-15 09:50:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								1f91fe6cdf 
								
							 
						 
						
							
							
								
								Fix compile errors on Ubuntu  
							
							... 
							
							
							
							Set the GCC compiler flags properly. Add missing include. 
							
						 
						
							2013-05-15 09:40:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								288eb3c1b2 
								
							 
						 
						
							
							
								
								Update platform file to fit to CMakeLists  
							
							... 
							
							
							
							The #defines "USE_OPENGL_ES" and "USE_OPENGL_DESKTOP" to control GLES
vs. Desktop OpenGL usage. The #define _RPI_ is used solely on Raspberry
Pi now. 
							
						 
						
							2013-05-14 22:07:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								6d2e25aacc 
								
							 
						 
						
							
							
								
								Update CMakeLists according to last commit  
							
							... 
							
							
							
							GLES renderer file had a different name. 
							
						 
						
							2013-05-14 22:01:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								2e09563544 
								
							 
						 
						
							
							
								
								Make GLES renderer work on other systems than RPI  
							
							... 
							
							
							
							The #define _RPI_ now does special stuff when setting up a GLES context
on the Raspberry Pi. This should hopefully make the code work on other
systems too. 
							
						 
						
							2013-05-14 21:58:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								acba3bd258 
								
							 
						 
						
							
							
								
								Remove .cpp #includes  
							
							... 
							
							
							
							It is cleaner to not do that and just include the proper file in the
build files if needed. 
							
						 
						
							2013-05-14 21:54:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								e8472581fa 
								
							 
						 
						
							
							
								
								Minor cleanup  
							
							... 
							
							
							
							Move member initialization to initializer list. Add iostream to logger
for convenience. 
							
						 
						
							2013-05-14 21:45:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								eb4bafcb2f 
								
							 
						 
						
							
							
								
								Use CMake to generate EmulationStation build files  
							
							... 
							
							
							
							CMake is much more versatile, providing build support on multiple
platforms to generate Makefiles. This should serve as a starting point
for CMake builds.
Please note the /CMake/* scripts are actually ripped from the ORGE3D
repositories, but they seem to be in the Public Domain. Thanks! 
							
						 
						
							2013-05-14 21:40:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								af9b9f732f 
								
							 
						 
						
							
							
								
								Remove the need for SDL_mixer  
							
							... 
							
							
							
							SDL_mixer is not in the standard SDL distribution. The mixing is now
done using regular SDL_Audio functions. AudioManager is converted to a
singleton and std::shared_ptrs are used for all Sound objects. Note that
for GCC "-std=c++11" might need to be added to the CMAKE_CXX_FLAGS. 
							
						 
						
							2013-05-14 21:31:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Bim Overbohm 
							
						 
						
							
							
							
							
								
							
							
								a1353def89 
								
							 
						 
						
							
							
								
								Find proper font path in Windows  
							
							... 
							
							
							
							Build a font path boost can find. The font should be adjusted to
something that actually resembles DejaVuSerif... 
							
						 
						
							2013-05-14 21:01:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								54dfe2f24a 
								
							 
						 
						
							
							
								
								Quick fix for Linux  
							
							
							
						 
						
							2013-05-13 15:06:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								ffe573d1d6 
								
							 
						 
						
							
							
								
								Ported to Windows.  
							
							... 
							
							
							
							Added --windowed for desktop builds. 
							
						 
						
							2013-05-13 14:53:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								149c1bcbdd 
								
							 
						 
						
							
							
								
								More descriptive names for inputs  
							
							
							
						 
						
							2013-04-18 16:44:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								a119997ec7 
								
							 
						 
						
							
							
								
								Added page up/page down to the Input Config screen.  
							
							... 
							
							
							
							Updated the README. 
							
						 
						
							2013-04-13 18:10:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								608545118a 
								
							 
						 
						
							
							
								
								Hopefully fixed infinite recursion.  
							
							
							
						 
						
							2013-04-13 17:30:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								4a05288e71 
								
							 
						 
						
							
							
								
								Started fix for infinite recursion in directory trees.  
							
							
							
						 
						
							2013-04-13 16:33:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								1e2cc1eb0a 
								
							 
						 
						
							
							
								
								Moved an Error to a Warning.  
							
							
							
						 
						
							2013-04-13 13:52:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								c6a7f8abf9 
								
							 
						 
						
							
							
								
								Fixed InputManager's handling of controllers with duplicate names.  
							
							... 
							
							
							
							Added emergency keyboard config if no players can be loaded.
Switched some console output to log output. 
							
						 
						
							2013-04-13 13:19:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								1007821ca3 
								
							 
						 
						
							
							
								
								Add device name to input config files.  
							
							... 
							
							
							
							Properly init/deinit renderer stuff in Renderer_init_rpi.cpp. Probably. 
							
						 
						
							2013-04-11 21:59:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								a5f4749d5d 
								
							 
						 
						
							
							
								
								Added InputConfig saving/loading.  
							
							
							
						 
						
							2013-04-11 17:27:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								14a05d4943 
								
							 
						 
						
							
							
								
								Init/deinit theme-declared fonts.  
							
							
							
						 
						
							2013-04-11 16:33:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								b01f2705de 
								
							 
						 
						
							
							
								
								More work on reinitialization. Fonts still not working.  
							
							
							
						 
						
							2013-04-10 12:29:07 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								05c258f515 
								
							 
						 
						
							
							
								
								Functionality seems to have been restored at last.  
							
							
							
						 
						
							2013-04-09 13:13:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								4747d70e1f 
								
							 
						 
						
							
							
								
								More work.  
							
							
							
						 
						
							2013-04-08 12:40:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								04841ca436 
								
							 
						 
						
							
							
								
								More work.  
							
							... 
							
							
							
							I really am nuts. 
							
						 
						
							2013-04-08 11:52:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
							
								Aloshi 
							
						 
						
							
							
							
							
								
							
							
								4a35c34dc0 
								
							 
						 
						
							
							
								
								Began refactoring away the GuiComponent system in favor of ES-config's Gui system.  
							
							... 
							
							
							
							Man, I'm nuts. 
							
						 
						
							2013-04-08 09:41:25 -05:00