Ok, the clash is due to the LOWER LEVEL.unity that David has is a much older version than what's in the master branch currently.
David's level looks really good and has a ton of detail,
BUT, the hierarchy for the assets is a complete mess, and contains no monster, or player. in the scene.
Now, due to what is and isn't in this scene, what I'm personally going to suggest is we manually add the files from this scene and push them directly into the scene in Master branch.
@davidnewham91 ,don't delete this pull request or your branch, as we can try to manually add them ourselves into master. At the same time, for now avoid adding anything extra to the scene. We'll get it sorted ASAP
Ok, the clash is due to the LOWER LEVEL.unity that David has is a much older version than what's in the master branch currently.
David's level looks really good and has a ton of detail,
BUT, the hierarchy for the assets is a complete mess, and contains no monster, or player. in the scene.
Now, due to what is and isn't in this scene, what I'm personally going to suggest is we manually add the files from this scene and push them directly into the scene in Master branch.
@davidnewham91 ,don't delete this pull request or your branch, as we can try to manually add them ourselves into master. At the same time, for now avoid adding anything extra to the scene. We'll get it sorted ASAP