511c73df43 
					 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity  
						
						 
						
						
						
						
					 
					
						2015-06-06 16:24:59 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2e1b662675 
					 
					
						
						
							
							Useless tutorial input deactivation + fix HUD  
						
						 
						
						
						
						
					 
					
						2015-06-06 16:24:07 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						c056f9200d 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/teamMadScientist/celerity  
						
						 
						
						
						
						
					 
					
						2015-06-06 06:07:38 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						00eef0e5d7 
					 
					
						
						
							
							update character ...  
						
						 
						
						
						
						
					 
					
						2015-06-06 06:05:51 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0c1115f4af 
					 
					
						
						
							
							sfx integration  
						
						 
						
						
						
						
					 
					
						2015-06-05 15:30:34 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6e05b02793 
					 
					
						
						
							
							flight direction  
						
						 
						
						
						
						
					 
					
						2015-06-05 14:51:23 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						01b9f71d25 
					 
					
						
						
							
							Text, checkpoints, restart  
						
						 
						
						
						
						
					 
					
						2015-06-04 20:07:38 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						83142c4749 
					 
					
						
						
							
							Various fixes after playtest  
						
						 
						
						
						
						
					 
					
						2015-06-04 02:27:20 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7f1d7a8b33 
					 
					
						
						
							
							HUD parameters, looping music, dash  
						
						 
						
						
						
						
					 
					
						2015-06-02 01:47:00 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cc6eeb3db4 
					 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity  
						
						 
						
						... 
						
						
						
						Conflicts:
	Content/Maps/Level_1.umap 
						
						
					 
					
						2015-05-28 18:20:39 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1fcb574782 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2015-05-19 17:36:01 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						cb7592ea9d 
					 
					
						
						
							
							fix character pink line  
						
						 
						
						
						
						
					 
					
						2015-05-18 17:22:54 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						f8dcc8d5b1 
					 
					
						
						
							
							fix merging  
						
						 
						
						
						
						
					 
					
						2015-05-18 16:59:52 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						35c3ea2c8d 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/teamMadScientist/celerity  
						
						 
						
						
						
						
					 
					
						2015-05-18 16:59:07 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						e7e300ee98 
					 
					
						
						
							
							yay city  
						
						 
						
						
						
						
					 
					
						2015-05-18 16:57:56 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						81611044fb 
					 
					
						
						
							
							new level 1  
						
						 
						
						
						
						
					 
					
						2015-05-18 16:45:23 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b6f9137410 
					 
					
						
						
							
							Assets, credits, HUD...  
						
						 
						
						
						
						
					 
					
						2015-05-16 22:59:03 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						7b80ae33f1 
					 
					
						
						
							
							tuned foliage tool, ready to use  
						
						 
						
						
						
						
					 
					
						2015-05-16 21:12:32 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						7cb3a3e0b9 
					 
					
						
						
							
							ajustement  
						
						 
						
						
						
						
					 
					
						2015-05-15 18:15:29 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9a8f3be106 
					 
					
						
						
							
							Playtest + blocker working for linux  
						
						 
						
						
						
						
					 
					
						2015-05-15 15:49:57 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						63040e181a 
					 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity  
						
						 
						
						
						
						
					 
					
						2015-05-14 04:47:19 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6d7aefbcbd 
					 
					
						
						
							
							Everything for playtest...  
						
						 
						
						
						
						
					 
					
						2015-05-14 04:46:17 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								albinor 
							
						 
					 
					
						
						
							
						
						9cec971480 
					 
					
						
						
							
							Level 1 first draft  
						
						 
						
						... 
						
						
						
						Base for the first level of the game (it is a different map from the one
romain created so I wouldn't erase his work) 
						
						
					 
					
						2015-05-13 21:40:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fb7f2f9355 
					 
					
						
						
							
							new checkpoint actor blueprint system  
						
						 
						
						
						
						
					 
					
						2015-05-13 03:03:25 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0020807020 
					 
					
						
						
							
							dash corrected  
						
						 
						
						
						
						
					 
					
						2015-05-13 00:19:31 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						26ba18921a 
					 
					
						
						
							
							Better flight platform  
						
						 
						
						
						
						
					 
					
						2015-05-13 00:11:28 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ce22d22e3f 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2015-05-12 22:51:01 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						859ad492a4 
					 
					
						
						
							
							Tweaks de tutorial  
						
						 
						
						
						
						
					 
					
						2015-05-12 18:06:07 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						628ec17895 
					 
					
						
						
							
							Playtest tweaking  
						
						 
						
						
						
						
					 
					
						2015-05-12 17:06:29 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d2f0ec8c5d 
					 
					
						
						
							
							Some new triggers  
						
						 
						
						
						
						
					 
					
						2015-05-12 15:56:09 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4657d2b35a 
					 
					
						
						
							
							New tutorial level  
						
						 
						
						
						
						
					 
					
						2015-05-12 01:00:26 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						af4cc234ad 
					 
					
						
						
							
							Lot of tweaks on levels and polishing...  
						
						 
						
						
						
						
					 
					
						2015-05-11 02:10:32 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8b74bc3150 
					 
					
						
						
							
							camera clean, tutorial lights enhanced  
						
						 
						
						
						
						
					 
					
						2015-05-11 00:12:39 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						14470e2173 
					 
					
						
						
							
							Polishing, camera, intro movies  
						
						 
						
						
						
						
					 
					
						2015-05-10 21:58:10 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						391d4a53b0 
					 
					
						
						
							
							Ads  
						
						 
						
						
						
						
					 
					
						2015-05-09 21:56:24 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						96032ee5de 
					 
					
						
						
							
							camera trigger  
						
						 
						
						
						
						
					 
					
						2015-05-09 19:45:47 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						313e491b7e 
					 
					
						
						
							
							tunes and add decor to tutorial  
						
						 
						
						
						
						
					 
					
						2015-05-08 20:30:06 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						ddb3458ba0 
					 
					
						
						
							
							trick lighting  
						
						 
						
						
						
						
					 
					
						2015-05-08 16:56:15 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						7f9c6f5569 
					 
					
						
						
							
							add new decoration to tutorial  
						
						 
						
						
						
						
					 
					
						2015-05-08 04:11:50 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								albinor 
							
						 
					 
					
						
						
							
						
						b223201538 
					 
					
						
						
							
							Create checkpoints  
						
						 
						
						... 
						
						
						
						create and add some checkpoints to the tutorial 
						
						
					 
					
						2015-05-06 16:45:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						804ec2a542 
					 
					
						
						
							
							new beautifull textures  
						
						 
						
						
						
						
					 
					
						2015-04-30 04:20:34 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								albinor 
							
						 
					 
					
						
						
							
						
						e26f3b0ca5 
					 
					
						
						
							
							add dash mat+arrows and text acceleration  
						
						 
						
						... 
						
						
						
						Add the material for the walls during the dash as well as the arrows to
show the path.
Add of two text triggers to explain the interaction between the
acceleration and the jump/flight 
						
						
					 
					
						2015-04-29 14:09:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						0028d36171 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/teamMadScientist/celerity  
						
						 
						
						
						
						
					 
					
						2015-04-29 04:08:54 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						ef9c113b21 
					 
					
						
						
							
							add texture without transparancy  
						
						 
						
						
						
						
					 
					
						2015-04-29 03:51:18 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4f8445f48f 
					 
					
						
						
							
							Merge of HUD  
						
						 
						
						
						
						
					 
					
						2015-04-29 02:29:57 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						97b39bdd98 
					 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity  
						
						 
						
						... 
						
						
						
						Conflicts:
	Content/Blueprints/MyCharacter.uasset 
						
						
					 
					
						2015-04-29 01:06:35 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						360946747e 
					 
					
						
						
							
							Menu HUD  
						
						 
						
						
						
						
					 
					
						2015-04-29 01:03:50 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								albinor 
							
						 
					 
					
						
						
							
						
						9782714b04 
					 
					
						
						
							
							New Tutorial and update of the character speed  
						
						 
						
						... 
						
						
						
						Changing the run speed of the character to 8000 and creation of the new
tutorial acording to this new speed. 
						
						
					 
					
						2015-04-27 23:53:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						110633e822 
					 
					
						
						
							
							Basic new camera trigger  
						
						 
						
						
						
						
					 
					
						2015-04-16 03:02:44 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newincpp 
							
						 
					 
					
						
						
							
						
						c0793db82c 
					 
					
						
						
							
							finished particle effect  
						
						 
						
						
						
						
					 
					
						2015-04-15 13:50:39 +09:00