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

Develop #27

Merged
merged 60 commits into from
Dec 9, 2023
Merged

Develop #27

merged 60 commits into from
Dec 9, 2023

Conversation

Ahnjunyoung1110
Copy link
Collaborator

Add the develop to the main

Ahnjunyoung1110 and others added 30 commits November 17, 2023 01:57
…e ability to load it.

2.I have added a warning message before the boss appears, and it will be displayed for 4 seconds.
3.After defeating all the monsters, the boss can now appear.
…e ability to load it.

2.I have added a warning message before the boss appears, and it will be displayed for 4 seconds.
3.After defeating all the monsters, the boss can now appear.
…s health.

2. If the boss's health reaches 0, the stage can now end.

3. I implemented interactions between the boss and player bullets.
…skinwors

# Conflicts:
#	out/production/yuna_code/engine/DrawManager.class
4번째 줄 적 색깔 하늘색으로 변경
2. Created danger zones according to the boss's patterns.

3. Enabled bullet firing in accordance with the boss's patterns.
Draw almost gamble screen (need to fix)
Edit Entity.java
to limit skin select
바뀌는 주기 감소
플레이어 Ship의 색상 변경
myunghong and others added 29 commits December 2, 2023 21:28
Change mouse position when first entering
…mble

# Conflicts:
#	src/engine/DrawManager.java
베팅금이 좌우로 1씩, 상하로 10씩 증감
가위바위보 상금 배율이 {1.2,1.2,1.5,1.5,1.5,2,2,3,5,7}로 상향
피격시 이동 가능 버그 수정
…ySkin

# Conflicts:
#	src/engine/DrawManager.java
#	src/screen/SkinSelectionScreen.java
스킨을 상점에서 해금하는 기능
@Ahnjunyoung1110 Ahnjunyoung1110 merged commit f6ab40e into main Dec 9, 2023
1 of 2 checks passed
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.

5 participants