Théo Marchal 97b39bdd98 Merge branch 'master' of github.com:teamMadScientist/celerity ...

Conflicts:
	Content/Blueprints/MyCharacter.uasset

2015-04-29 01:06:35 +09:00

..

BP_starsSky.uasset

Basic new camera trigger

2015-04-16 03:02:44 +09:00

CameraTrigger.uasset

Menu HUD

2015-04-29 01:03:50 +09:00

Demat.uasset

Basic new camera trigger

2015-04-16 03:02:44 +09:00

Dematerializable.uasset

Basic new camera trigger

2015-04-16 03:02:44 +09:00

four.uasset

BIG BIG FIRST COMMIT of all initial content O_O

2015-03-27 03:31:17 +09:00

MainHUD.uasset

Basic new camera trigger

2015-04-16 03:02:44 +09:00

MenuHUD.uasset

Menu HUD

2015-04-29 01:03:50 +09:00

MyCharacter.uasset

Menu HUD

2015-04-29 01:03:50 +09:00

MyGame.uasset

Basic new camera trigger

2015-04-16 03:02:44 +09:00

ShowText.uasset

add displaying buttons and adjust the character

2015-04-09 11:38:40 +09:00

tutorialHud.uasset

Basic new camera trigger

2015-04-16 03:02:44 +09:00