You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Simon Tran
7729f5439f
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
Conflicts:
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta
unity_Project/Assets/GUI Assets/UI_credits.png.meta
unity_Project/Assets/GUI Assets/buttons.meta
unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta
|
9 years ago |
.. |
Assets
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
|
9 years ago |
ProjectSettings
|
ADDED:
|
9 years ago |
holy_aura.unitypackage
|
ADDED:
|
9 years ago |