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.

Sign up for GitHub

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

Jump to bottom

πŸ”” 0.4.0 버전 πŸ”” #248

Merged
merged 343 commits into from
Oct 8, 2022
Merged

πŸ”” 0.4.0 버전 πŸ”” #248

merged 343 commits into from
Oct 8, 2022

Conversation

dongcheolpark
Copy link
Contributor

ν•©μ˜ 전에 λ¨Έμ§€ν•˜μ§€ λ§μ•„μ£Όμ„Έμš”

@dongcheolpark dongcheolpark linked an issue Sep 25, 2022 that may be closed by this pull request
πŸ”” 0.4.0 버전 πŸ”” #244
Closed
kjhcocomi and others added 29 commits September 29, 2022 02:32
@kjhcocomi
이것저것 많이
19afa86
@kjhcocomi
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind …
2f6edd2 
…into develop

# Conflicts:
#	Project_Blind/Assets/Resources/Data/ConversationData.json
#	Project_Blind/Assets/Scripts/Utils/Define.cs
@kjhcocomi
컷씬 μΆ”κ°€, νŒŒλ™ λΆ€λ“œλŸ½κ²Œ, 상점 μΆ”κ°€ λ“±λ“±
49a1c49
@Yeogiwon
Merge pull request #273 from kjhcocomi/develop
e6f5394 
μ—¬λŸ¬κ°€μ§€
@ch-0012
resource : λͺ¬μŠ€ν„° μ‚¬μš΄λ“œ
786b66f
@ch-0012
Merge branch 'develop' of https://github.com/ch-0012/Project_Blind in…
02f41f4 
…to develop
@Yeogiwon
λ§ˆμ„ 맡 μΆ”κ°€
25ca1d9
@Yeogiwon
Merge branch 'develop' of https://github.com/Yeogiwon/Project_Blind i…
333983a 
…nto develop
@Yeogiwon
Merge branch 'GAMPOT-DEV:develop' into develop
5270cc9
@ch-0012
Merge pull request #274 from Yeogiwon/develop
5402f29 
λ§ˆμ„ 맡 μΆ”κ°€
@ch-0012
Merge branch 'GAMPOT-DEV:develop' into develop
a8c828f
@ch-0012
fix : μŠ€ν„΄ ν›„ μ•ˆ λ•Œλ¦¬λŠ” 문제 ν•΄κ²°
eeac4f1
@ch-0012
fix : 패링 ν›„ νˆ¬μ‚¬μ²΄ μœ„μΉ˜ μˆ˜μ •
a7704e0
@ch-0012
Merge branch 'develop' of https://github.com/ch-0012/Project_Blind in…
680f6cf 
…to develop
@Yeogiwon
Merge pull request #275 from ch-0012/develop
1d5118b 
μžμž˜ν•œ 버그 μˆ˜μ •
@kimmoonwoong
feature: μ—¬λŸ¬ 버그 μˆ˜μ •
148c7d9
@kimmoonwoong
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind…
07d879a 
… into develop
@dongcheolpark
Merge pull request #276 from kimmoonwoong/develop
bf02e11
@ch-0012
fix : Stun ν›„ μ•ˆ μΌμ–΄λ‚˜λŠ” 버그 μˆ˜μ • (μ•„λ§ˆ)
ec713f6
@ch-0012
feature : λͺ¬μŠ€ν„° 별 HP Bar 높이 λ³€κ²½ κ°€λŠ₯
50c7675
@ch-0012
fix : 무녀 곡격 쀑 ν”Œλ ˆμ΄μ–΄ 따라 돌기
76b20ce
@ch-0012
작λͺΉ HP Bar μœ„μΉ˜ μˆ˜μ •
3d32b78
@ch-0012
fix : 패트둀 μ‹œκ°„ Dataν™”
9f56563
@ch-0012
fix : 무녀 νˆ¬μ‚¬μ²΄ 속도 Data
59d319e
@kimmoonwoong
Merge pull request #277 from ch-0012/develop
9b60b81 
fix : Stun ν›„ μ•ˆ μΌμ–΄λ‚˜λŠ” 버그 μˆ˜μ • (μ•„λ§ˆ)
@kimmoonwoong
feature: μ—¬λŸ¬ 버그 μˆ˜μ • 및 μ—¬λŸ¬ κΈ°λŠ₯ κ΅¬ν˜„
2d73150
@kimmoonwoong
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind…
a4bc4b4 
… into develop
@dongcheolpark
feature : μ΄νŽ™νŠΈ μˆ˜μ •
02835ce
@dongcheolpark
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind …
0006b12 
…into develop
ch-0012 and others added 27 commits October 8, 2022 02:55
@ch-0012
resource : λͺ¬μŠ€ν„° SE μΆ”κ°€
7d8b167
@Yeogiwon
light 씬 μΆ”κ°€
d829028 
light 씬 μΆ”κ°€
@Yeogiwon
μ–‘μͺ½ 맡 끝 μΆ”κ°€
6246d07 
μ–‘μͺ½ 맡 끝 μΆ”κ°€
@Yeogiwon
Merge branch 'GAMPOT-DEV:develop' into develop
f9a3c60
@Yeogiwon
Merge pull request #329 from Yeogiwon/develop
023fe77 
맡 였브젝트 μΆ”κ°€
@Yeogiwon
맡 밝기 쑰절
33f361e 
맡 밝기 쑰절
@Yeogiwon
Merge pull request #330 from Yeogiwon/develop
cd9cd4e 
맡 밝기 쑰절
@Yeogiwon
μž₯μ‚°λ²” 맡 곡쀑 였브젝트 μœ„μΉ˜ μˆ˜μ •
b2b60bf 
μž₯μ‚°λ²” 맡 곡쀑 였브젝트 μœ„μΉ˜ μˆ˜μ •
@Yeogiwon
Merge branch 'GAMPOT-DEV:develop' into develop
bb935fd
@Yeogiwon
Merge pull request #331 from Yeogiwon/develop
708d48e 
맡 였브젝트 재배치(μž₯μ‚°λ²” 맡)
@ch-0012
fix : λͺ½λ‘₯이 μ‚¬μš΄λ“œ 및 이것저것 κ³ μΉ¨
9ab76b9
@Yeogiwon
Merge pull request #332 from ch-0012/develop
8c155bf 
λͺ½λ‘₯이 이것저것 κ³ μΉ¨
@kjhcocomi
상점 글씨크기 μˆ˜μ •
d902f93
@kjhcocomi
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind …
83b1e87 
…into develop
@kimmoonwoong
feature: λ‘œλ”©μ”¬ κ΅¬ν˜„ 및 씬 λ„˜μ–΄κ°€λ©΄ 패링 μ•ˆλ˜λŠ” 버그 μˆ˜μ •
8e0d63c
@kimmoonwoong
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind …
b2f4cf9 
…into develop

# Conflicts:
#	Project_Blind/Assets/Scenes/μ΅œμ’…λ§΅/μž₯μ‚°λ²”λ°© ν…ŒμŠ€νŠΈμš©.unity
@dongcheolpark
Merge pull request #333 from kjhcocomi/develop
6487c13 
상점 글씨크기 μˆ˜μ •, 적 HP UI 적용
@kimmoonwoong
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind …
640eec1 
…into develop

# Conflicts:
#	Project_Blind/Assets/Scripts/Core/Entity/Character/Enemy/Boss/FirstBoss/FirstBossEnemy.cs
@dongcheolpark
Merge pull request #334 from kimmoonwoong/develop
b26bda2 
λ‘œλ”©μ”¬ κ΅¬ν˜„ 및 씬 λ„˜μ–΄κ°€λ©΄ 패링 μ•ˆλ˜λŠ” 버그 μˆ˜μ •
@dongcheolpark
feature : μ΄νŽ™νŠΈ μˆ˜μ •
9d13b06
@kimmoonwoong
commit
e007e86
@kimmoonwoong
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind…
29a567b 
… into develop
@kimmoonwoong
Merge pull request #335 from dongcheolpark/develop
34c2975 
feature : μ΄νŽ™νŠΈ μˆ˜μ •
@dongcheolpark
Merge pull request #336 from kimmoonwoong/develop
e87fbbf 
Develop
@kimmoonwoong
commit
2ad3600
@kimmoonwoong
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind…
8c5b93a 
… into develop
@dongcheolpark
Merge pull request #337 from kimmoonwoong/develop
409863f 
Develop
@dongcheolpark dongcheolpark merged commit 5f19d9b into main Oct 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kimmoonwoong kimmoonwoong kimmoonwoong approved these changes

@ch-0012 ch-0012 ch-0012 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

πŸ”” 0.4.0 버전 πŸ””
6 participants
@dongcheolpark @ch-0012 @kimmoonwoong @kjhcocomi @Yeogiwon @hhtboy