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

2.0 #89

Merged
merged 237 commits into from
Nov 2, 2023
Merged

2.0 #89

merged 237 commits into from
Nov 2, 2023

Conversation

GlassAlo
Copy link
Contributor

@GlassAlo GlassAlo commented Nov 2, 2023

Describe your changes

Issue ticket number and link

Checklist before requesting a review

  • I have performed a self-review of my code
  • I have documented my code
  • Do we need to implement unit tests?

Valegox and others added 30 commits October 2, 2023 08:53
@Valegox
Add falling and jumping bird
59db486
@Valegox
Merge branch 'dev' of https://github.com/UwUClub/R-Type into RT-41-Fl…
e58dccc 
…appy-Bird
@Valegox
Merge branch 'dev' of https://github.com/UwUClub/R-Type into RT-41-Fl…
1b4ef3a 
…appy-Bird
@Valegox
Merge from dev
2b89784
@Valegox
Merge branch 'dev' of https://github.com/UwUClub/R-Type into RT-41-Fl…
f488f01 
…appy-Bird
@Valegox
Update with new dev version
ce85628
@Valegox
Arrange gravity values
aeab416
@BaptisteLaran
Add switch to SFML
be7e4ee
🎨 Committing clang-format changes
2b683e8
@Valegox
Add config files for player and physics adjustments
230dc51
@Valegox
Remove _ char in flappy bird
952214b
@Valegox
Add moving background
e479228
@Beafowl-Pull
Upload the MAJ of all the cmake
8ce4c4d
@Valegox
Add base entity and simplify TypeEntity
ba1ca72
@Beafowl-Pull
Remove raylib in dependencies
8a24ffa
@Beafowl-Pull
Remove useless things
3db9d09
@BaptisteLaran
Add scaling for sfml sprite
320aa92
🎨 Committing clang-format changes
82ecda7
@GlassAlo
Merge pull request #61 from UwUClub/RT-83-Fix-cmake
1a6ff26 
RT-83 -> dev
@BaptisteLaran
Merge dev
9cf7f4f
@BaptisteLaran
Merge dev
e9f9e1b
@BaptisteLaran
Merge branch 'RT-70-Switch-to-SFML' of github.com:UwUClub/R-Type into…
5a0b398 
… RT-70-Switch-to-SFML
🎨 Committing clang-format changes
74dbd9b
@BaptisteLaran
Fix .h in LoadedSprite and rm wall
ad70d03
@BaptisteLaran
Fix .h in LoadedSprite and rm wall
a1a93e4
@BaptisteLaran
Fix cicd
3b2c958
@BaptisteLaran
Fix cicd
120b707
@Valegox
Range entities in config
8c6f183
@Valegox
Merge branch 'dev' of https://github.com/UwUClub/R-Type into RT-41-Fl…
c4743b0 
…appy-Bird
@Valegox
Replace std::thread by boost::thread for io service run
101e86e
Beafowl-Pull and others added 23 commits October 31, 2023 15:55
@Beafowl-Pull
Merge branch 'RT-74-sound-library-plugin' of github.com:UwUClub/R-Typ…
09539d1 
…e into RT-74-sound-library-plugin
@Beafowl-Pull
Merge branch 'main' of github.com:UwUClub/R-Type into RT-74-sound-lib…
deea4f9 
…rary-plugin
🎨 Committing clang-format changes
9eaaeb1
@Beafowl-Pull
Fix compilation
8834984
@Beafowl-Pull
Merge branch 'dev' of github.com:UwUClub/R-Type into RT-74-sound-libr…
b9a5bcf 
…ary-plugin
@Beafowl-Pull
Fix compilation and launch
6100d2a
@Beafowl-Pull
Merge branch 'RT-74-sound-library-plugin' of github.com:UwUClub/R-Typ…
cc25e3a 
…e into RT-74-sound-library-plugin
🎨 Committing clang-format changes
98fda04
@Beafowl-Pull
Merge pull request #83 from UwUClub/RT-74-sound-library-plugin
b287705 
Rt 74 sound library plugin
@GlassAlo
update ECS and make new release
9eb04c2
@GlassAlo
added branch in ci for easy release
da1d097
@Valegox
Merge branch 'dev' of https://github.com/UwUClub/R-Type into RT-41-Fl…
2f5081d 
…appy-Bird
@Valegox
Add sounds and music
8c6ecf7
@Valegox
Remove useless files
0b86acd
@Valegox
Remove json lib from flappy bird cmake + header
421f986
@Valegox
Remove useless type entity
70b0c99
@GlassAlo
Added flappybird to cpack
d5cf44c
@GlassAlo
Merge pull request #85 from UwUClub/RT-41-Flappy-Bird
d3f38f7 
RT-41 FlAwAwAwAwAwAppy Bird
@Beafowl-Pull
Update EwECS
f70d247
@Beafowl-Pull
Merge branch 'release' of github.com:UwUClub/R-Type into release
3059545
@Beafowl-Pull
Merge pull request #87 from UwUClub/release
2a95db3
@GlassAlo
Updated readme
562e3aa
@GlassAlo
Merge pull request #88 from UwUClub/Readme
cf678d2 
Updated readme
@GlassAlo GlassAlo self-assigned this Nov 2, 2023
@GlassAlo GlassAlo added the enhancement New feature or request label Nov 2, 2023
@Valegox Valegox merged commit f154252 into main Nov 2, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Valegox Valegox Valegox approved these changes

@Beafowl-Pull Beafowl-Pull Awaiting requested review from Beafowl-Pull

@BaptisteLaran BaptisteLaran Awaiting requested review from BaptisteLaran

Assignees

@GlassAlo GlassAlo

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GlassAlo @Valegox @BaptisteLaran @Beafowl-Pull