| 
						
					 | 
					
						
						
							
						
						79431a7fca
					 | 
					
						
						
							
							setup shader files
						
						
						
						
						
						
					 | 
					
						2017-06-06 19:06:57 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9951a6c730
					 | 
					
						
						
							
							created file setup for shaders
						
						
						
						
						
						
					 | 
					
						2017-06-06 01:17:54 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4dbc3e606
					 | 
					
						
						
							
							still trying to get Jlayer to work
						
						
						
						
						
						
					 | 
					
						2017-06-06 00:05:48 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7afb7be021
					 | 
					
						
						
							
							minor value changes
						
						
						
						
						
						
					 | 
					
						2017-06-04 18:44:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16d45757e5
					 | 
					
						
						
							
							updated flake texture fixed collision issue, and minor value changes
						
						
						
						
						
						
					 | 
					
						2017-06-04 17:44:02 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c416d9f1ea
					 | 
					
						
						
							
							changed flake texture. minor fixing of entity controller
						
						
						
						
						
						
					 | 
					
						2017-06-04 14:08:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a9443b1acc
					 | 
					
						
						
							
							fixed flake entity issue with shard entity lagging behind
						
						
						
						
						
						
					 | 
					
						2017-06-04 13:49:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c33947ef5f
					 | 
					
						
						
							
							progress on flake entity
						
						
						
						
						
						
					 | 
					
						2017-06-04 03:02:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4ada07bcd4
					 | 
					
						
						
							
							continued work on flake entityy
						
						
						
						
						
						
					 | 
					
						2017-06-04 02:44:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b80aca0e29
					 | 
					
						
						
							
							began work on flake entity
						
						
						
						
						
						
					 | 
					
						2017-06-03 23:26:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53ff7109b2
					 | 
					
						
						
							
							added bar entity
						
						
						
						
						
						
					 | 
					
						2017-06-03 00:24:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a51156759
					 | 
					
						
						
							
							shard entity functionality has been added
						
						
						
						
						
						
					 | 
					
						2017-06-02 23:03:00 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a12ec18ebb
					 | 
					
						
						
							
							more progress on shard entity
						
						
						
						
						
						
					 | 
					
						2017-06-02 17:12:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf9612cb3b
					 | 
					
						
						
							
							began working on shard entity
						
						
						
						
						
						
					 | 
					
						2017-06-02 09:50:00 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1832f32b6a
					 | 
					
						
						
							
							minor work on entities and added speed control to polyjet entity
						
						
						
						
						
						
					 | 
					
						2017-06-02 09:28:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f5352b8e22
					 | 
					
						
						
							
							shard entity texture
						
						
						
						
						
						
					 | 
					
						2017-06-01 23:41:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						615789fe81
					 | 
					
						
						
							
							added pellet entity as well as minor changes to collision functions
						
						
						
						
						
						
					 | 
					
						2017-06-01 23:41:04 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6be886888
					 | 
					
						
						
							
							Merge branch 'master' of /home/ydeng/git/Polyjet
						
						
						
						
						
						
					 | 
					
						2017-06-01 18:26:39 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46161f60a4
					 | 
					
						
						
							
							minor change in .gitignore
						
						
						
						
						
						
					 | 
					
						2017-06-01 18:26:13 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						529031fd07
					 | 
					
						
						
							
							began work adding pellet entity
						
						
						
						
						
						
					 | 
					
						2017-06-01 17:59:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e818e2752
					 | 
					
						
						
							
							new asset for particle (forgot to git add)
						
						
						
						
						
						
					 | 
					
						2017-06-01 11:27:46 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0adee4b058
					 | 
					
						
						
							
							reworked a few textures
						
						
						
						
						
						
					 | 
					
						2017-06-01 00:41:38 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b17cc61839
					 | 
					
						
						
							
							successfully added debug spawning system and finished void circle enemy
						
						
						
						
						
						
					 | 
					
						2017-05-31 23:55:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						70bf120a5f
					 | 
					
						
						
							
							new texture added and everything resized; worked on spawning and collision checking
						
						
						
						
						
						
					 | 
					
						2017-05-31 13:49:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5776586458
					 | 
					
						
						
							
							began work on debug spawning system
						
						
						
						
						
						
					 | 
					
						2017-05-30 23:17:45 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4894d6eea8
					 | 
					
						
						
							
							new entity management and hit detection concepts, began implementing in game play area
						
						
						
						
						
						
					 | 
					
						2017-05-30 16:23:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						562dbb8117
					 | 
					
						
						
							
							began working on allies
						
						
						
						
						
						
					 | 
					
						2017-05-29 21:29:42 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1bc44e0b87
					 | 
					
						
						
							
							began work on collision detection and added first enemy
						
						
						
						
						
						
					 | 
					
						2017-05-29 20:04:02 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						279658daa0
					 | 
					
						
						
							
							began working on hit detection system
						
						
						
						
						
						
					 | 
					
						2017-05-29 14:46:48 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d6b6829023
					 | 
					
						
						
							
							cleaning for beginning of physics implementation
						
						
						
						
						
						
					 | 
					
						2017-05-29 12:50:27 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2821db605e
					 | 
					
						
						
							
							began work on making mp3spi work with libgdx
						
						
						
						
						
						
					 | 
					
						2017-05-29 00:42:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68422f0453
					 | 
					
						
						
							
							cleaned code and tuned audio analyzer
						
						
						
						
						
						
					 | 
					
						2017-05-28 23:09:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						473adee281
					 | 
					
						
						
							
							Revert "mp3 reading progress"
						
						
						
						
						
						
						
						This reverts commit 39baa6a0e2422c8c9620962e96c69ea142ab178f. 
						
						
					 | 
					
						2017-05-28 20:58:04 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c566f6b459
					 | 
					
						
						
							
							mp3 reading progress
						
						
						
						
						
						
					 | 
					
						2017-05-28 19:46:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a52e5fc0ed
					 | 
					
						
						
							
							fixed and cleaned code up
						
						
						
						
						
						
					 | 
					
						2017-05-28 17:30:35 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4a6bbbea3
					 | 
					
						
						
							
							finished basic seed generator
						
						
						
						
						
						
					 | 
					
						2017-05-28 00:34:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dfd5aaaf8e
					 | 
					
						
						
							
							edited Polyjet thrust particles
						
						
						
						
						
						
					 | 
					
						2017-05-27 22:46:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f59585ad4c
					 | 
					
						
						
							
							minor change to .gitignore
						
						
						
						
						
						
					 | 
					
						2017-05-27 19:54:09 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						92c80b5b32
					 | 
					
						
						
							
							changed how assets are organized and made minor code clean ups
						
						
						
						
						
						
					 | 
					
						2017-05-27 19:49:35 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7e5e5e35e
					 | 
					
						
						
							
							began re-tuning analyzer
						
						
						
						
						
						
					 | 
					
						2017-05-26 12:43:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad0138c489
					 | 
					
						
						
							
							fixed issue where Wav Decoder only returned 0's
						
						
						
						
						
						
					 | 
					
						2017-05-26 12:25:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17049220c2
					 | 
					
						
						
							
							continued revisions on creative stage and analysis
						
						
						
						
						
						
					 | 
					
						2017-05-26 11:45:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59647b97f1
					 | 
					
						
						
							
							fixed creative stage update issue
						
						
						
						
						
						
					 | 
					
						2017-05-25 12:33:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f8c326d8e4
					 | 
					
						
						
							
							pade progress on analysis for creative and main stages
						
						
						
						
						
						
					 | 
					
						2017-05-25 11:59:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e2839eb55
					 | 
					
						
						
							
							fixed resolution handler selecting wrong resolution, changed Polyjet entity to proper size
						
						
						
						
						
						
					 | 
					
						2017-05-25 11:36:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						98f08fb060
					 | 
					
						
						
							
							minor load order changes
						
						
						
						
						
						
					 | 
					
						2017-05-24 23:01:17 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						830b533cee
					 | 
					
						
						
							
							changed gource setup
						
						
						
						
						
						
					 | 
					
						2017-05-24 15:20:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e949deffe7
					 | 
					
						
						
							
							progressed on pre game screen
						
						
						
						
						
						
					 | 
					
						2017-05-24 14:45:00 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb40cd230d
					 | 
					
						
						
							
							cleaning and minor progress on recreation of pre game screen
						
						
						
						
						
						
					 | 
					
						2017-05-24 00:03:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						52cd737c3a
					 | 
					
						
						
							
							began clean version of pre-game screen
						
						
						
						
						
						
					 | 
					
						2017-05-23 15:47:17 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |