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

Jun young test #110

Closed
wants to merge 58 commits into from
Closed

Jun young test #110

wants to merge 58 commits into from

Conversation

Ahnjunyoung1110
Copy link
Contributor

No description provided.

Ahnjunyoung1110 and others added 30 commits November 17, 2023 01:57
@Ahnjunyoung1110
1.I have implemented a simplified graphic for the boss and enabled th…
26edb38 
…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.
@Ahnjunyoung1110
1.I have implemented a simplified graphic for the boss and enabled th…
5ae71d8 
…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.
@Ahnjunyoung1110
Merge remote-tracking branch 'origin/Boss_monster' into Boss_monster
4de8a9c
@Ahnjunyoung1110
1. I have created a boss health gauge that changes based on the boss'…
3bf1424 
…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.
@yuna0833
commit to pull
76a2d6e
@yuna0833
Merge branch 'main' of https://github.com/khj0998/Invaders into yuna_…
66708d2 
…skinwors

# Conflicts:
#	out/production/yuna_code/engine/DrawManager.class
@khj0998
약간의 겜블 스크린 제작
6a57ae9
@jangseowon03
4번째 줄 적 색깔 하늘색으로 변경
e7a210d
@Ahnjunyoung1110
Merge pull request #15 from khj0998/enemy_color
a425010 
4번째 줄 적 색깔 하늘색으로 변경
@Ahnjunyoung1110
1. Implemented the boss's patterns.
e5a32f9 
2. Created danger zones according to the boss's patterns.

3. Enabled bullet firing in accordance with the boss's patterns.
@Ahnjunyoung1110
Add the boss pattern
b7a27a3
@khj0998
Add gamble button on titlescreen
d2ef551 
Draw almost gamble screen (need to fix)
Edit Entity.java
@yuna0833
Merge branch 'Develop' of https://github.com/khj0998/Invaders into yu…
46632d8 
…na_skinwors
@khj0998
파칭코 거의 다 만듬. 스프라이트 변경 속도 조정 필요, Currency 제대로 저장되는지 확인 필요, 몇 배인지 표기 필요
ce98bf4
@myunghong
made skinlockcode
1609ae4 
to limit skin select
@yuna0833
스킨 색상 변경
ee5c508
@Ahnjunyoung1110
Eliminate the scheduler
d37bc1e
@yuna0833
Merge pull request #14 from khj0998/Boss_monster
e36c16b 
Boss monster
@Ahnjunyoung1110
Add the boss pattern
50b6d70
@khj0998
파칭코 제작
f7f56db
@khj0998
가위바위보 제작
649e023
@khj0998
함수 변수 설명 추가
363641c
@khj0998
겜블 배율 설명 추가,
e794e66 
바뀌는 주기 감소
@yuna0833
피드백 반영
2844203
@yuna0833
Merge branch 'Develop' of https://github.com/khj0998/Invaders into yu…
0dee60e 
…na_skinwors
@Ahnjunyoung1110
I fixed the bug that prevented the skin change from being applied.
adaabc7
@Ahnjunyoung1110
I fixed the bug that prevented the skin change from being applied.
bcdeed6
@khj0998
Merge pull request #16 from khj0998/yuna_skinwors
3e5f991 
플레이어 Ship의 색상 변경
@Ahnjunyoung1110
Merge branch 'Develop' into BossMonster_Pattern
5666c69
@Ahnjunyoung1110
Merge remote-tracking branch 'origin/BossMonster_Pattern' into BossMo…
753b7d0 
…nster_Pattern
Ahnjunyoung1110 and others added 28 commits December 2, 2023 15:41
@Ahnjunyoung1110
총알이 이상한 방향으로 튕겨져 나가던 버그를 고쳤습니다.
eb2a553
@myunghong
hide locked skin on screen
70b7391
@khj0998
피격해도 움직일 수 있었던 버그 수정
090e1b4
@myunghong
set color gray locked skin on screen
93c1d86
@myunghong
resolve error skin code 5~6
df27cfb
@myunghong
Add ReturnCode 73 on ShopScreen
786f672
@myunghong
Made BuySkin Button
474d397
@myunghong
Change shop font color
a403124
@myunghong
Made Skin purchase function
86173c7
@myunghong
Edit ShopScreen
fbd82bf 
Change mouse position when first entering
@yuna0833
Merge pull request #17 from khj0998/BossMonster_Pattern
a1b4c9c 
Boss monster pattern
@khj0998
Merge branch 'Develop' of https://github.com/khj0998/Invaders into Ga…
ad4cfd3 
…mble

# Conflicts:
#	src/engine/DrawManager.java
@myunghong
Merge pull request #18 from khj0998/Gamble
765f96f 
Merge Gamble Feature
@myunghong
Changed the skin code to be saved in the player information when the …
691b802 
…game ends.
@khj0998
리뷰 내용 수정
b96d1a6 
베팅금이 좌우로 1씩, 상하로 10씩 증감
가위바위보 상금 배율이 {1.2,1.2,1.5,1.5,1.5,2,2,3,5,7}로 상향
@khj0998
Merge branch 'Develop' of https://github.com/khj0998/Invaders into Ga…
6aade46 
…mble
@myunghong
Merge pull request #20 from khj0998/Gamble
97210a6 
리뷰 내용 수정
@khj0998
Merge branch 'Develop' of https://github.com/khj0998/Invaders into Fi…
a429fdf 
…xBug_WhenAttacked
@khj0998
맞았을 때 공격이 나가는 버그 수정
eebdd66
@myunghong
Merge pull request #21 from khj0998/FixBug_WhenAttacked
9b6c3f4 
피격시 이동 가능 버그 수정
@myunghong
brief code (delete one for code)
fc2c29e
@myunghong
locked skin's color set gray
4a29524
@myunghong
set String, Rect Ratio
d0077d2
@myunghong
Merge branch 'Develop' of https://github.com/khj0998/Invaders into Bu…
b572308 
…ySkin

# Conflicts:
#	src/engine/DrawManager.java
#	src/screen/SkinSelectionScreen.java
@myunghong
set Color button raise up
4c1b8b6
@myunghong
add comment, Added condition for not being able to purchase skins if …
9e8c76c 
…you don't have enough money
@jangseowon03
Merge pull request #22 from khj0998/BuySkin
49262ad 
스킨을 상점에서 해금하는 기능
@Ahnjunyoung1110
Eliminate the scheduler
4c02221
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Ahnjunyoung1110 @yuna0833 @khj0998 @jangseowon03 @myunghong