| 
						
					 | 
					
						
						
							
						
						68f556c806
					 | 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity
						
						
						
						
						
						
						
						Conflicts:
	Content/FirstLevel/FirstLevel.umap 
						
						
					 | 
					
						2015-06-06 20:39:35 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06b5c25c63
					 | 
					
						
						
							
							New button!
						
						
						
						
						
						
					 | 
					
						2015-06-06 20:38:36 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						c7c55616e9
					 | 
					
						
						
							
							new materials
						
						
						
						
						
						
					 | 
					
						2015-06-06 18:48:57 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						565f493d90
					 | 
					
						
						
							
							materials changes
						
						
						
						
						
						
					 | 
					
						2015-06-06 18:48:04 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						acf4826196
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/teamMadScientist/celerity
						
						
						
						
						
						
					 | 
					
						2015-06-05 15:15:41 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ababaa9a11
					 | 
					
						
						
							
							import soundfx in project
						
						
						
						
						
						
					 | 
					
						2015-06-05 14:53:38 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e05b02793
					 | 
					
						
						
							
							flight direction
						
						
						
						
						
						
					 | 
					
						2015-06-05 14:51:23 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						b579758b5a
					 | 
					
						
						
							
							updated jump anim
						
						
						
						
						
						
					 | 
					
						2015-06-05 02:21:36 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						f7bcd59057
					 | 
					
						
						
							
							wtf ?
						
						
						
						
						
						
					 | 
					
						2015-06-05 02:03:55 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						6724280b21
					 | 
					
						
						
							
							add -some- content
						
						
						
						
						
						
					 | 
					
						2015-06-05 02:02:30 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						92f91fc75c
					 | 
					
						
						
							
							adding the (bad) jump animation...
						
						
						
						
						
						
					 | 
					
						2015-06-05 01:57:36 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01b9f71d25
					 | 
					
						
						
							
							Text, checkpoints, restart
						
						
						
						
						
						
					 | 
					
						2015-06-04 20:07:38 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						080efa1ca8
					 | 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity
						
						
						
						
						
						
					 | 
					
						2015-06-04 02:27:45 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83142c4749
					 | 
					
						
						
							
							Various fixes after playtest
						
						
						
						
						
						
					 | 
					
						2015-06-04 02:27:20 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						d33f5effd8
					 | 
					
						
						
							
							little graphic improvement
						
						
						
						
						
						
					 | 
					
						2015-06-02 02:30:41 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f1d7a8b33
					 | 
					
						
						
							
							HUD parameters, looping music, dash
						
						
						
						
						
						
					 | 
					
						2015-06-02 01:47:00 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						861fb2532a
					 | 
					
						
						
							
							save
						
						
						
						
						
						
					 | 
					
						2015-05-28 18:21:04 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c0adbfc6ac
					 | 
					
						
						
							
							map
						
						
						
						
						
						
					 | 
					
						2015-05-20 02:35:25 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29e5d4166e
					 | 
					
						
						
							
							credits movable hud
						
						
						
						
						
						
					 | 
					
						2015-05-20 02:34:54 +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
							
						 
					 | 
					
						
						
							
						
						bf04535bb9
					 | 
					
						
						
							
							some fix on character assets
						
						
						
						
						
						
					 | 
					
						2015-05-16 04:31:14 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1beed954ad
					 | 
					
						
						
							
							Merge branch 'master' of github.com:teamMadScientist/celerity
						
						
						
						
						
						
					 | 
					
						2015-05-13 00:12:05 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						26ba18921a
					 | 
					
						
						
							
							Better flight platform
						
						
						
						
						
						
					 | 
					
						2015-05-13 00:11:28 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						8a7f7e486f
					 | 
					
						
						
							
							new dash
						
						
						
						
						
						
					 | 
					
						2015-05-13 00:09:10 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce22d22e3f
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2015-05-12 22:51:01 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						1cd3b23524
					 | 
					
						
						
							
							new dash camera interpolation feedback
						
						
						
						
						
						
					 | 
					
						2015-05-12 22:48:47 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								newincpp
							
						 
					 | 
					
						
						
							
						
						b9d48db0b3
					 | 
					
						
						
							
							new tuned full energy feedback
						
						
						
						
						
						
					 | 
					
						2015-05-12 22:14:09 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sauviat Christophe
							
						 
					 | 
					
						
						
							
						
						697ee549c9
					 | 
					
						
						
							
							New Buildings : Dubai tower + Pagode
						
						
						
						
						
						
					 | 
					
						2015-05-12 20:41:30 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |