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

hotfix/feat/CCR-20 #23

Merged
merged 59 commits into from
Jan 4, 2024
Merged

hotfix/feat/CCR-20 #23

merged 59 commits into from
Jan 4, 2024

Conversation

lamlethanh777
Copy link
Collaborator

No description provided.

slo248 and others added 30 commits December 18, 2023 10:54
@slo248 @roni2406
add test for anime in main.cpp
923ad5d
@lamlethanh777 @roni2406
temporary restructuring
4286681
@zHuskyz @roni2406
Menu-Ranking-Pause-Saved-Level
9b0b4f4
@zHuskyz @roni2406
convert to 14x10 + redesign
c6a3f15
@roni2406
add label for level button
83a1e3a
@roni2406 @lamlethanh777
initialize Skin State
afd945c
@roni2406
initialize Skin State
ea64d14
@lamlethanh777
change passing context to reference
4485c39
@lamlethanh777
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
3aadd8f 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@lamlethanh777
fix: encapsulate Mode for each state
b51337e
@roni2406
fix Skin assets
f50efeb
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
1648dd7 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@lamlethanh777
fix: encapsulate Mode for each state
3c1e231
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
df23866 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@lamlethanh777
fix: encapsulate Mode for each state
2463c21
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
2142ce5 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@lamlethanh777
fix: encapsulate Mode for each state
f9f4e93
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
043eeb4 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@lamlethanh777
fix: encapsulate Mode for each state
c77f5b2
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
45a9eca 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@roni2406
merge GUI and Game State
5912e27
@roni2406
add continue feature
3aea88a
@roni2406
Make Application class
37a3f2e
@lamlethanh777
half-fixed: player jump into lantern
802521e
@zHuskyz
add Sound Music
8689cb8
@roni2406
add countdown for continue game
3b13b3c
@roni2406
add skin for lose state
39bee1c
@lamlethanh777
reduce Animation constructor's parameters
4d85bef
@lamlethanh777
minor refactoring (style + include)
1e733bd
@slo248 @lamlethanh777
change dir path to one texture
a8e7aa8
lamlethanh777 and others added 26 commits December 23, 2023 11:32
@lamlethanh777
add win-lose sound
3d537b2
@zHuskyz
UI of sound n music setting
5cabee4
@zHuskyz
add weather
3b3d9db
@slo248
load textures for weather
2a506b3
@slo248
add weather in create new game
235f4ab
@slo248
save weather and load back
13f98b5
@slo248
fix weather transition
2ba1eb8
@slo248
load and save weather as first number in file
23a8234
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
bbe7c84 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@roni2406
save player's key
89ad31d
@roni2406
Merge branch 'feat/CCR-19-Sound-Music' into feat/CCR-20-Level-Countdo…
2ae1459 
…wn-SkinState
@lamlethanh777
player's speed adapts weather
1f81577
@roni2406
Merge branch 'feat/CCR-20-Level-Countdown-SkinState' of https://githu…
18926bc 
…b.com/slo248/CS202-Crossy-Road into feat/CCR-20-Level-Countdown-SkinState
@roni2406
add volume bar
57b7f5f
@lamlethanh777
player's speed adapts weather
b443822
@roni2406
modify music and sfx
620da60
@roni2406
fix music and sfx
cbd2a65
@roni2406
finish GUI sound and music
322c53d
@zHuskyz @roni2406
add Sound Music
2626657
@zHuskyz @roni2406
UI of sound n music setting
e44f2d2
@roni2406
add volume bar
6d2eccf
@roni2406
modify music and sfx
5652219
@roni2406
fix music and sfx
32673a8
@roni2406
finish GUI sound and music
f2b9312
@roni2406
Delete unused music and texture files, remove unused code
25a0ea4
@roni2406 @lamlethanh777
Merge branch 'hotfix/feat/CCR-20' of https://github.com/slo248/CS202-…
796716f 
…Crossy-Road into hotfix/feat/CCR-20
slo248
slo248 approved these changes Jan 4, 2024
View reviewed changes
Copy link
Owner

@slo248 slo248 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally ;-;

@roni2406 roni2406 merged commit b3ec8c9 into main Jan 4, 2024
3 checks passed
@slo248 slo248 deleted the hotfix/feat/CCR-20 branch January 4, 2024 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slo248 slo248 slo248 approved these changes

@roni2406 roni2406 roni2406 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.
4 participants
@lamlethanh777 @roni2406 @slo248 @zHuskyz