RMIT
/
Project_Junker
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
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.
102 Commits
1 Branch
277 MiB
Tree: 89a4d07077
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '89a4d07077'
${ noResults }
Project_Junker/unity_Project/Assets/GUI Assets/buttons.meta

15 lines
342 B
Raw Normal View History

ADDED: + Highlighted sprites for buttons + Close button sprites + Font File : "Motion Control" (for settings text) CHANGED: > Adjusted scale for some UI elements > Replaced the placeholder minecart with the actual car object
9 years ago
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
ADDED: + Highlighted sprites for buttons + Close button sprites + Font File : "Motion Control" (for settings text) CHANGED: > Adjusted scale for some UI elements > Replaced the placeholder minecart with the actual car object
9 years ago
​
​
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
updated credits
9 years ago
ADDED: + 10 x Credit sign textures *NO toon-materials for these signs have been assigned yet.
9 years ago
updated credits
9 years ago
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
ADDED: + Highlighted sprites for buttons + Close button sprites + Font File : "Motion Control" (for settings text) CHANGED: > Adjusted scale for some UI elements > Replaced the placeholder minecart with the actual car object
9 years ago
​
​
​
​
 
  1. fileFormatVersion: 2
  2. <<<<<<< HEAD
  3. guid: e05209d25db06c14e89ac6899807685a
  4. folderAsset: yes
  5. timeCreated: 1444970301
  6. =======
  7. guid: 246270fcdb8756147a17ddeacc523eaf
  8. folderAsset: yes
  9. timeCreated: 1444963981
  10. >>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
  11. licenseType: Free
  12. DefaultImporter:
  13.   userData: 
  14.   assetBundleName: 
  15.   assetBundleVariant: