T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						cd02263e25
					 | 
					
						
						
							
							Merge branch 'master' into add_effect_engine
						
						
						
						
						
						
						
						Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp
Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48 
						
						
					 | 
					
						2013-12-05 22:11:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						515ae3e8c0
					 | 
					
						
						
							
							Added the possibility to set effect arguments over json
						
						
						
						
						
						
						
						Former-commit-id: 4bc2920c04853e549c712ec70492371b14d20877 
						
						
					 | 
					
						2013-12-01 14:09:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						5454ddb375
					 | 
					
						
						
							
							Added skeleton for effect engine development
						
						
						
						
						
						
						
						Former-commit-id: e1fb69fd4de4b8968075660e3ba7f7add021c152 
						
						
					 | 
					
						2013-11-24 16:10:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						826b964bf6
					 | 
					
						
						
							
							Implemented the multi-color transform including in hyperion-remote
						
						
						
						
						
						
						
						Former-commit-id: ebdb0688b47d51bd6dccf6dafd580d3ce9ed80a7 
						
						
					 | 
					
						2013-11-22 10:48:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						ee7a596d53
					 | 
					
						
						
							
							- HSV transform added
						
						
						
						
						
						
						
						- Moved transform of led values to before the device write so transform changes are taken into account 
						
						
					 | 
					
						2013-08-21 21:50:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						46076998a0
					 | 
					
						
						
							
							Schema checking for all commands added
						
						
						
						
						
						
					 | 
					
						2013-08-18 12:02:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |