Open
Conversation
…oject/ProgrammerTeam-20181024 into base/survival_shooter
変更点が不明のため中身は空
# Conflicts: # ProgrammerTeam20181024/Assets/_Complete-Game/Animation/EnemyAC.controller
# Conflicts: # ProgrammerTeam20181024/Assets/Scenes/Level 01.unity # ProgrammerTeam20181024/ProjectSettings/ProjectVersion.txt
Shimizu/10 game over
…oject/ProgrammerTeam into base/survival_shooter
This reverts commit 66da478.
…eaGameProject/ProgrammerTeam into base/survival_shooter" This reverts commit 4c4ceac, reversing changes made to 9ee8328.
# Conflicts: # ProgrammerTeam20181024/Assets/Prefabs/Zombunny.prefab # ProgrammerTeam20181024/Assets/Prefabs/Zombunny.prefab.meta # ProgrammerTeam20181024/Assets/Scenes/Level 01.unity # ProgrammerTeam20181024/ProjectSettings/ProjectVersion.txt
Asada/8 scoring points
…oject/ProgrammerTeam into base/survival_shooter
This reverts commit 812529a.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.