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

전장의 안개 처리 완료했습니다. #106

Merged
merged 13 commits into from
Jul 31, 2022

Conversation

dongcheolpark
Copy link
Contributor

이후 파동 처리에 집중할 예정입니다

…into develop

� Conflicts:
�	.gitignore
�	Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
�	Project_Blind/UserSettings/EditorUserSettings.asset
�	Project_Blind/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
�	Project_Blind/UserSettings/Layouts/default-2021.dwlt
@dongcheolpark dongcheolpark requested review from kimmoonwoong and ch-0012 and removed request for kimmoonwoong July 30, 2022 08:36
# Conflicts:
#	Project_Blind/Assets/Resources/Prefabs/BasicPrefabs/Global Volume.prefab.meta
#	Project_Blind/Assets/Scenes/TestFogOfWar.unity
#	Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
@kjhcocomi kjhcocomi merged commit 61c478e into GAMPOT-DEV:develop Jul 31, 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.

2 participants