Daniel Lim Wee Soong 
								
							 
						 
						
							
							
							
							
								
							
							
								b5532babab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'citra/master' into fmtlib-macros  
							
							
							
						 
						
							2018-03-16 20:50:52 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Starlet 
								
							 
						 
						
							
							
							
							
								
							
							
								935bcdbd20 
								
							 
						 
						
							
							
								
								Convert ACT to the new service framework ( #3521 )  
							
							... 
							
							
							
							* Convert ACT to the new service framework
* Fix clang-format
* le updates to fix stuff
* Fixed one last thing.
* Well, I fucked up.
* Quick hotfix 
							
						 
						
							2018-03-16 11:36:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Lim Wee Soong 
								
							 
						 
						
							
							
							
							
								
							
							
								327901e145 
								
							 
						 
						
							
							
								
								citra_qt: Remove reference to debugger/console  
							
							
							
						 
						
							2018-03-16 12:24:16 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Lim Wee Soong 
								
							 
						 
						
							
							
							
							
								
							
							
								98e669cf00 
								
							 
						 
						
							
							
								
								Remove all edits not in the scope of this PR  
							
							
							
						 
						
							2018-03-16 12:17:14 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Lim Wee Soong 
								
							 
						 
						
							
							
							
							
								
							
							
								373efd3158 
								
							 
						 
						
							
							
								
								Logging: Remove customizable logging backends  
							
							... 
							
							
							
							Separate code for customizing logging backends from this branch 
							
						 
						
							2018-03-16 11:56:40 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Lim Wee Soong 
								
							 
						 
						
							
							
							
							
								
							
							
								eee388588e 
								
							 
						 
						
							
							
								
								Logging: Fix fmt errors after rebasing with master  
							
							... 
							
							
							
							fmt was updated during the clang-format update, which breaks the previous implementation of FmtLogMessage
Changes were:
* Move definition of FmtLogMessage into log.h to use variadic templates as FMT_VARIADIC was removed
To supplement the change above:
* Move Entry and CreateEntry into log.h
* Add LogEntry in backend.cpp 
							
						 
						
							2018-03-16 11:48:33 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4ba71f3e 
								
							 
						 
						
							
							
								
								fixup! Prevent crashes on closing by waiting for the impl thread  
							
							
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								87bc5266ef 
								
							 
						 
						
							
							
								
								Logging: Various logging improvements  
							
							... 
							
							
							
							* Uses PopWait to reduce the amount of busy waiting if there aren't many
new logs
* Opens the log file as shared on windows, letting other programs read
the logs, but not write to them while citra is running
* Flushes the logs to disk if a log >= error arrives 
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								9fdc89a456 
								
							 
						 
						
							
							
								
								SPSCQueue: Add PopWait  
							
							... 
							
							
							
							Adds a condition var to SPSCQueue so when a new log is pushed it will
wake the consumer thread that is calling PopWait. This only applies to
to queues with NeedSize=true 
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								47f0185bcd 
								
							 
						 
						
							
							
								
								fixup! move message  
							
							
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								7b78425d6b 
								
							 
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								f6762f05cd 
								
							 
						 
						
							
							
								
								Use the correct linker flag for mingw  
							
							
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								0daac3020e 
								
							 
						 
						
							
							
								
								Logging: Add customizable logging backends and fmtlib based macros  
							
							... 
							
							
							
							* Change the logging backend to support multiple sinks through the
Backend Interface
* Add a new set of logging macros to use fmtlib instead.
* Qt: Compile as GUI application on windows to make the console hidden by
default. Add filter configuration and a button to open log location.
* SDL: Migrate to the new logging macros 
							
						 
						
							2018-03-16 11:18:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									BreadFish64 
								
							 
						 
						
							
							
							
							
								
							
							
								55d5720962 
								
							 
						 
						
							
							
								
								use nvidia graphics automatically on laptops with optimus  
							
							
							
						 
						
							2018-03-15 20:36:53 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Weiyi Wang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0f70912e1 
								
							 
						 
						
							
							
								
								Merge pull request  #3513  from valentinvanelslande/layouts-fix,gitignore  
							
							... 
							
							
							
							.gitignore: Add CMakeLists.txt.user to Project/editor files, citra_qt: Sync menu UI settings after changing the layout with F10 
							
						 
						
							2018-03-15 15:54:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									B3n30 
								
							 
						 
						
							
							
							
							
								
							
							
								fd20c8c321 
								
							 
						 
						
							
							
								
								remove MacAddressToString  
							
							
							
						 
						
							2018-03-13 11:00:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									B3n30 
								
							 
						 
						
							
							
							
							
								
							
							
								b6d52f0299 
								
							 
						 
						
							
							
								
								Fix formatting of mac address in error log  
							
							
							
						 
						
							2018-03-13 10:52:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Valentin Vanelslande 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f165a1ca6 
								
							 
						 
						
							
							
								
								citra_qt: Sync menu UI settings after changing the layout with F10  
							
							
							
						 
						
							2018-03-12 18:40:54 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Weiyi Wang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c63bb11d9 
								
							 
						 
						
							
							
								
								Merge pull request  #3503  from j-selby/fix-leaky-enet  
							
							... 
							
							
							
							Handle ENet packet destruction if the packet is not sent anywhere 
							
						 
						
							2018-03-11 18:40:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Merry 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								141c007037 
								
							 
						 
						
							
							
								
								Merge pull request  #3505  from kemenaran/fix-qt-viewport-resize  
							
							... 
							
							
							
							Fix QGLWidget viewport resize on macOS 
							
						 
						
							2018-03-11 15:25:26 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James 
								
							 
						 
						
							
							
							
							
								
							
							
								a2b65f0669 
								
							 
						 
						
							
							
								
								Correctly cleanup ENet packets if not used  
							
							... 
							
							
							
							This additionally adds logging when bad MAC addresses are found when transferring packets between clients 
							
						 
						
							2018-03-12 01:38:54 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Weiyi Wang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9900d8035 
								
							 
						 
						
							
							
								
								Merge pull request  #3071  from B3n30/dedicated_room  
							
							... 
							
							
							
							Network: Added an executable to host an dedicated room for local wifi 
							
						 
						
							2018-03-11 16:04:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Pierre de La Morinerie 
								
							 
						 
						
							
							
							
							
								
							
							
								c4dbdeba0a 
								
							 
						 
						
							
							
								
								Fix QGLWidget viewport resize on macOS  
							
							... 
							
							
							
							This fixes  #2092 , a long-standing bug where on macOS resizing the window
results in a garbled display.
It seems the seemingly optional child()->makeCurrent call is actually
required on macOS. Enabling it in all cases fixes the resize issue. 
							
						 
						
							2018-03-11 19:22:30 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									B3n30 
								
							 
						 
						
							
							
							
							
								
							
							
								2d464e79dc 
								
							 
						 
						
							
							
								
								fixe typos  
							
							
							
						 
						
							2018-03-11 12:58:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea82203780 
								
							 
						 
						
							
							
								
								ipc_helper: remove interface for operating on command buffer directly  
							
							... 
							
							
							
							Now IPC helpers are only supposed to use on top of ServiceFramework 
							
						 
						
							2018-03-10 13:37:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b179b86f14 
								
							 
						 
						
							
							
								
								Service/CFG: convert to ServiceFramework  
							
							
							
						 
						
							2018-03-10 13:37:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
							
							
								
							
							
								672fbcf37d 
								
							 
						 
						
							
							
								
								Memory: remove RasterizerCachedSpecial page type  
							
							
							
						 
						
							2018-03-10 01:14:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
							
							
								
							
							
								92c7bb9d20 
								
							 
						 
						
							
							
								
								pica/gl_shader: optimize ternary operator  
							
							
							
						 
						
							2018-03-10 01:14:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
							
							
								
							
							
								0d6db4a0b3 
								
							 
						 
						
							
							
								
								lighting: compute highlight clamp after one-/two-sided diffuse pass  
							
							
							
						 
						
							2018-03-10 01:14:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									B3n30 
								
							 
						 
						
							
							
							
							
								
							
							
								d4cc0d8148 
								
							 
						 
						
							
							
								
								Fix path for travis upload  
							
							
							
						 
						
							2018-03-09 19:11:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									B3n30 
								
							 
						 
						
							
							
							
							
								
							
							
								b3cdf30c65 
								
							 
						 
						
							
							
								
								fixup! Network: Added an executable to host an dedicated room for local wifi  
							
							
							
						 
						
							2018-03-09 19:11:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									B3n30 
								
							 
						 
						
							
							
							
							
								
							
							
								a40ef602a3 
								
							 
						 
						
							
							
								
								Network: Added an executable to host an dedicated room for local wifi  
							
							
							
						 
						
							2018-03-09 19:11:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								f61141e86a 
								
							 
						 
						
							
							
								
								Update the entire application to use the new clang format style  
							
							
							
						 
						
							2018-03-09 10:54:43 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
							
							
								
							
							
								e40d693057 
								
							 
						 
						
							
							
								
								Service/NFC: convert to ServiceFramework  
							
							
							
						 
						
							2018-03-09 18:59:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								42d68d6ea4 
								
							 
						 
						
							
							
								
								Merge pull request  #3470  from wwylele/news-framework  
							
							... 
							
							
							
							Service/NEWS: convert to ServiceFramework 
							
						 
						
							2018-03-09 17:52:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bunnei 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3cda637cb1 
								
							 
						 
						
							
							
								
								Merge pull request  #3478  from j-selby/libpng-switch  
							
							... 
							
							
							
							Remove PICA image dumping, burn libpng 
							
						 
						
							2018-03-07 18:03:38 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vamsi Krishna 
								
							 
						 
						
							
							
							
							
								
							
							
								04cc8fb537 
								
							 
						 
						
							
							
								
								Discard Gas mode renders ( #3486 )  
							
							... 
							
							
							
							* Discard gas_mode renders
This discards the gas_mode / fog effect from games that use it and allows the games to display without it.  Note that gas mode is still unimplemented and will LOG<CRITICAL>.
This bypasses #3287 . (Doesn't fix it)
* fix clang 
							
						 
						
							2018-03-07 18:02:36 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Weiyi Wang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5dc8ac80dd 
								
							 
						 
						
							
							
								
								Merge pull request  #3469  from wwylele/frd-new-framework  
							
							... 
							
							
							
							Service/FRD: convert to ServiceFramework 
							
						 
						
							2018-03-07 15:33:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James 
								
							 
						 
						
							
							
							
							
								
							
							
								077a519338 
								
							 
						 
						
							
							
								
								Remove unused DUMP_TEXTURES definition  
							
							
							
						 
						
							2018-03-07 09:13:24 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James 
								
							 
						 
						
							
							
							
							
								
							
							
								9829a84fc6 
								
							 
						 
						
							
							
								
								Remove PICA image dumping/libpng  
							
							
							
						 
						
							2018-03-07 09:10:54 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bunnei 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a2f29aad0 
								
							 
						 
						
							
							
								
								Merge pull request  #3474  from wwylele/fuck-you-unimplemented  
							
							... 
							
							
							
							assert: do not crash on unimplemented code in debug build 
							
						 
						
							2018-03-06 11:46:30 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tgsm 
								
							 
						 
						
							
							
							
							
								
							
							
								7054b63d4d 
								
							 
						 
						
							
							
								
								Service/CFG: add system model value for New 2DS XL  
							
							
							
						 
						
							2018-03-06 02:11:01 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
							
							
								
							
							
								e004e9505e 
								
							 
						 
						
							
							
								
								assert: do not crash on unimplemented code in debug build  
							
							
							
						 
						
							2018-03-05 14:53:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Weiyi Wang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4befbddc34 
								
							 
						 
						
							
							
								
								Merge pull request  #3281  from jroweboy/texcache-pt2  
							
							... 
							
							
							
							Texture Cache Rework 
							
						 
						
							2018-03-05 11:57:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wwylele 
								
							 
						 
						
							
							
							
							
								
							
							
								c2515ff39d 
								
							 
						 
						
							
							
								
								clang-format fix  
							
							
							
						 
						
							2018-03-05 11:09:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								1d419bac1b 
								
							 
						 
						
							
							
								
								Disable accelerated texture copy for Texture surfaces  
							
							
							
						 
						
							2018-03-04 22:06:09 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3234db5e2 
								
							 
						 
						
							
							
								
								Merge pull request  #3440  from B3n30/file_read_delay  
							
							... 
							
							
							
							File_Sys: Add a size dependent delay for each file read 
							
						 
						
							2018-03-04 21:32:50 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								739f8e5367 
								
							 
						 
						
							
							
								
								Fix clang format  
							
							
							
						 
						
							2018-03-04 20:59:42 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce725f24ca 
								
							 
						 
						
							
							
								
								Merge pull request  #3444  from jroweboy/fix-multiplayer  
							
							... 
							
							
							
							UDS: Add non zero mac address to the shared page 
							
						 
						
							2018-03-04 20:40:37 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								d26cf11399 
								
							 
						 
						
							
							
								
								Fix clang format  
							
							
							
						 
						
							2018-03-04 20:27:22 -07:00