| 
						
					 | 
					
						
						
							
						
						942cd9f102
					 | 
					
						
						
							
							fbo functioning
						
						
						
						
						
						
					 | 
					
						2017-07-19 16:04:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f1958e62d
					 | 
					
						
						
							
							different glow shader test?
						
						
						
						
						
						
					 | 
					
						2017-07-18 00:14:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97faafa327
					 | 
					
						
						
							
							changed vert to the glsl tutorial one
						
						
						
						
						
						
					 | 
					
						2017-07-17 23:52:58 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						686d6c3e9b
					 | 
					
						
						
							
							added background shader and began on implementing bloom shader
						
						
						
						
						
						
					 | 
					
						2017-07-17 01:46:35 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17b65ed5d6
					 | 
					
						
						
							
							retored previous shader functions
						
						
						
						
						
						
					 | 
					
						2017-07-17 01:25:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f37c2693ae
					 | 
					
						
						
							
							minor tuning
						
						
						
						
						
						
					 | 
					
						2017-07-16 23:39:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7803d14fa0
					 | 
					
						
						
							
							adding explosion asset
						
						
						
						
						
						
					 | 
					
						2017-07-16 22:10:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a90fea5a46
					 | 
					
						
						
							
							background changed, pellet resized, other minor cleanups and adjustments
						
						
						
						
						
						
					 | 
					
						2017-07-16 21:33:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a02e5565ff
					 | 
					
						
						
							
							tuning
						
						
						
						
						
						
					 | 
					
						2017-07-16 14:25:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8bcea5cfff
					 | 
					
						
						
							
							tuning and minor map gen changes
						
						
						
						
						
						
					 | 
					
						2017-07-16 13:34:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8db65566c9
					 | 
					
						
						
							
							bar data set and fixed index mistake
						
						
						
						
						
						
					 | 
					
						2017-07-16 02:15:00 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cecec88df0
					 | 
					
						
						
							
							tuning and void safety prediction better functioning
						
						
						
						
						
						
					 | 
					
						2017-07-16 01:50:48 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						052dcd2789
					 | 
					
						
						
							
							Merge branch 'NewMapStructure' into AnalysisMapGenWork
						
						
						
						
						
						
					 | 
					
						2017-07-16 00:16:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fd63e9579
					 | 
					
						
						
							
							implemented new map structure
						
						
						
						
						
						
					 | 
					
						2017-07-15 23:51:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0299c6ca14
					 | 
					
						
						
							
							Revert "tuning and adjustments"
						
						
						
						
						
						
						
						This reverts commit e4359f41b2fc35283fe732911bb68166a8588a2a. 
						
						
					 | 
					
						2017-07-15 15:03:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						587643a089
					 | 
					
						
						
							
							done goofed
						
						
						
						
						
						
					 | 
					
						2017-07-15 14:58:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34fd88cae0
					 | 
					
						
						
							
							Revert "tuning and adjustments"
						
						
						
						
						
						
						
						This reverts commit e4359f41b2fc35283fe732911bb68166a8588a2a. 
						
						
					 | 
					
						2017-07-15 14:57:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1af7457b00
					 | 
					
						
						
							
							change way of entity spawning
						
						
						
						
						
						
					 | 
					
						2017-07-15 14:56:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fce870503
					 | 
					
						
						
							
							tuning and adjustments
						
						
						
						
						
						
					 | 
					
						2017-07-15 00:48:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da494d22a3
					 | 
					
						
						
							
							improved debugging and more adjustments
						
						
						
						
						
						
					 | 
					
						2017-07-14 23:41:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d65b94cd49
					 | 
					
						
						
							
							tuning with other songs
						
						
						
						
						
						
					 | 
					
						2017-07-14 14:37:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afd2d1aa41
					 | 
					
						
						
							
							minor tuning
						
						
						
						
						
						
					 | 
					
						2017-07-14 00:26:02 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dbaaf3edb4
					 | 
					
						
						
							
							again, more tuning
						
						
						
						
						
						
					 | 
					
						2017-07-13 23:35:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4646032e60
					 | 
					
						
						
							
							audio analyzer tuned
						
						
						
						
						
						
					 | 
					
						2017-07-13 16:32:06 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c3e72ef86b
					 | 
					
						
						
							
							changed way void circle spawns
						
						
						
						
						
						
					 | 
					
						2017-07-13 01:00:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						05cf360e71
					 | 
					
						
						
							
							slight revisions on analysis and map gen
						
						
						
						
						
						
					 | 
					
						2017-07-13 00:55:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8cb2f4ac1b
					 | 
					
						
						
							
							analyzer slightly better tuned
						
						
						
						
						
						
					 | 
					
						2017-07-13 00:40:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d8d34662d
					 | 
					
						
						
							
							entity spawning added
						
						
						
						
						
						
					 | 
					
						2017-07-12 23:53:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						44551bdea3
					 | 
					
						
						
							
							fixed minor resize bug on pre game screen and made small design changes to entities
						
						
						
						
						
						
					 | 
					
						2017-07-12 16:01:13 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2cd752f25c
					 | 
					
						
						
							
							progress on debug screen and minor error resolved with map gen
						
						
						
						
						
						
					 | 
					
						2017-07-11 23:33:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27757f0024
					 | 
					
						
						
							
							fixed void circle entity and debug screen stuff
						
						
						
						
						
						
					 | 
					
						2017-07-11 19:19:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f1b0a2b20e
					 | 
					
						
						
							
							minor cleanup
						
						
						
						
						
						
					 | 
					
						2017-07-11 18:04:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						897f802885
					 | 
					
						
						
							
							added pellet gen
						
						
						
						
						
						
					 | 
					
						2017-07-11 16:17:27 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0cf0609442
					 | 
					
						
						
							
							map algorithm and analysis page progress
						
						
						
						
						
						
					 | 
					
						2017-07-10 23:54:49 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1573884e99
					 | 
					
						
						
							
							prep for next panel of analysis page
						
						
						
						
						
						
					 | 
					
						2017-07-10 16:35:50 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1f84a68ae5
					 | 
					
						
						
							
							progress on analysis page
						
						
						
						
						
						
					 | 
					
						2017-07-10 16:01:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf0114bac3
					 | 
					
						
						
							
							made progress on analysis screen and fixing average beats per second
						
						
						
						
						
						
					 | 
					
						2017-07-10 00:29:50 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d815a3c053
					 | 
					
						
						
							
							worked on entity gen as well as began adding average bps calc
						
						
						
						
						
						
					 | 
					
						2017-06-23 22:24:42 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						329ff21c75
					 | 
					
						
						
							
							progress working on rhythm map
						
						
						
						
						
						
					 | 
					
						2017-06-23 15:31:36 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb10f2081e
					 | 
					
						
						
							
							began map implementing
						
						
						
						
						
						
					 | 
					
						2017-06-19 14:44:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						627a631f41
					 | 
					
						
						
							
							background shader now functioning
						
						
						
						
						
						
					 | 
					
						2017-06-18 01:25:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe6bd86632
					 | 
					
						
						
							
							minor progress on background shader
						
						
						
						
						
						
					 | 
					
						2017-06-14 00:16:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a0a7c9b14
					 | 
					
						
						
							
							added new textures and made progress on shaders
						
						
						
						
						
						
					 | 
					
						2017-06-11 18:28:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f353337395
					 | 
					
						
						
							
							fixed forgotten to remove code
						
						
						
						
						
						
					 | 
					
						2017-06-10 12:35:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf07c14f86
					 | 
					
						
						
							
							background shader render progress, replacing shape renderers with texture (haven't created said textures yet)
						
						
						
						
						
						
					 | 
					
						2017-06-10 12:34:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d036900399
					 | 
					
						
						
							
							shader progress
						
						
						
						
						
						
					 | 
					
						2017-06-09 13:58:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d0cf02e19a
					 | 
					
						
						
							
							began working on inverted gameplay
						
						
						
						
						
						
					 | 
					
						2017-06-07 23:19:41 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						571c93b77f
					 | 
					
						
						
							
							invert shader added
						
						
						
						
						
						
					 | 
					
						2017-06-07 21:53:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0222ea00a7
					 | 
					
						
						
							
							shader test changes
						
						
						
						
						
						
					 | 
					
						2017-06-07 00:21:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						79431a7fca
					 | 
					
						
						
							
							setup shader files
						
						
						
						
						
						
					 | 
					
						2017-06-06 19:06:57 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |