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.
27 Commits
1 Branch
277 MiB
Tree: 106dc717c8
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '106dc717c8'
${ noResults }
Project_Junker/unity_Project/ProjectSettings/ProjectVersion.txt

6 lines
147 B
Raw Normal View History

Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker Conflicts: unity_Project/Assets/_Scenes/MainLevel.unity unity_Project/ProjectSettings/ProjectSettings.asset unity_Project/ProjectSettings/ProjectVersion.txt
9 years ago
ADDED: + Textures: Pull & Push Brothers including default face texture. + Texture: Cargo Container + Texture: Scaffolds (Default, Wall-A and Wall-B) + Unity Package: Sky5x (Skybox collection) CHANGED: > Temporarily using a skybox from the sky5x package
9 years ago
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker Conflicts: unity_Project/Assets/_Scenes/MainLevel.unity unity_Project/ProjectSettings/ProjectSettings.asset unity_Project/ProjectSettings/ProjectVersion.txt
9 years ago
animations
9 years ago
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker Conflicts: unity_Project/Assets/_Scenes/MainLevel.unity unity_Project/ProjectSettings/ProjectSettings.asset unity_Project/ProjectSettings/ProjectVersion.txt
9 years ago
Added Unity project.
9 years ago
 
  1. <<<<<<< HEAD
  2. m_EditorVersion: 5.1.3f1
  3. =======
  4. m_EditorVersion: 5.2.0f3
  5. >>>>>>> c85d23b96e9c647da9374d868cbb9e8fe3c15aed
  6. m_StandardAssetsVersion: 0