Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔔 0.1.0 버전 🔔 #105

Merged
merged 296 commits into from
Sep 1, 2022
Merged

🔔 0.1.0 버전 🔔 #105

merged 296 commits into from
Sep 1, 2022

Conversation

dongcheolpark
Copy link
Contributor

#98

합의 전까지 머지 하지 말아주세요~

@dongcheolpark dongcheolpark changed the title 🔔 0.0.2 버전 🔔 🔔 0.1.0 버전 🔔 Jul 30, 2022
hhtboy and others added 29 commits July 31, 2022 22:31
Player 프리팹 크기조정 및 시야범위 수정
… into develop

# Conflicts:
#	Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
#	Project_Blind/UserSettings/Layouts/default-2021.dwlt
…into bug-fix

� Conflicts:
�	Project_Blind/Assets/Scenes/황현택.unity
�	Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
�	Project_Blind/UserSettings/EditorUserSettings.asset
�	Project_Blind/UserSettings/Layouts/default-2021.dwlt
bug-fix : gizmo 메소드에서 발생하는 에러 수정
dongcheolpark and others added 26 commits August 30, 2022 23:52
…into develop

# Conflicts:
#	Project_Blind/Assets/Scripts/Utils/Define.cs
숲 맵에서 동굴 맵으로 이동시 메인화면으로 넘어가는 버그 수정
… into develop

# Conflicts:
#	Project_Blind/Assets/Scenes/Boss.unity
#	Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
feature : 물기 패턴 추가
@dongcheolpark dongcheolpark merged commit 0f8f34f into main Sep 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants