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

Dev #17

Merged
merged 73 commits into from
Mar 21, 2022
Merged

Dev #17

Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
dc67068
collision ok
leoPinchon Mar 17, 2022
03f40e2
merge dev
leoPinchon Mar 17, 2022
ec00f55
add obstacle animation and more
YanLanteri Mar 17, 2022
9ea0b04
avant merge
leoPinchon Mar 17, 2022
ac8ba42
merge
leoPinchon Mar 17, 2022
a0b29c5
Merge pull request #5 from MunschThomas/auth
Pimpuss Mar 17, 2022
c225089
collision ok + relance de la partie
leoPinchon Mar 17, 2022
aa06a71
Merge branch 'dev' of https://github.com/MunschThomas/Hackathon_3_Fle…
leoPinchon Mar 17, 2022
898e784
Merge pull request #6 from MunschThomas/collision
leoPinchon Mar 17, 2022
d1d5cd5
work on questions
Liax Mar 17, 2022
2b61652
merge dev
Liax Mar 17, 2022
e328b9c
Merge pull request #7 from MunschThomas/questions
Liax Mar 17, 2022
ef58bc2
just pull dev
leoPinchon Mar 17, 2022
fd70079
merge dev
leoPinchon Mar 17, 2022
2fae14d
merge dev
Liax Mar 17, 2022
5882d37
Merge pull request #8 from MunschThomas/questions
Liax Mar 17, 2022
8499cf5
save
Pimpuss Mar 17, 2022
847547d
merge
Pimpuss Mar 17, 2022
bac7bb6
ajout du second jeu selon la state
Pimpuss Mar 17, 2022
bf863d6
modif game3
Pimpuss Mar 17, 2022
d7f6e12
modify css Profil page
YanLanteri Mar 17, 2022
8a0fcc0
create route profil to game
YanLanteri Mar 17, 2022
f6945ad
fin de partie ok
leoPinchon Mar 17, 2022
7d7bd96
merge
leoPinchon Mar 17, 2022
f05210a
Merge pull request #9 from MunschThomas/collision
leoPinchon Mar 17, 2022
e39d1c6
repear localstorage and create revision
YanLanteri Mar 17, 2022
d945803
revision update
YanLanteri Mar 17, 2022
6b2944b
Rename src/Components/ModalQ.js to src/components/ModalQ.js
MunschThomas Mar 18, 2022
1a41489
Rename src/Components/ModalQ.css to src/components/ModalQ.css
MunschThomas Mar 18, 2022
d03326e
Rename src/Screens/Game2.css to src/screens/Game2.css
MunschThomas Mar 18, 2022
13c1f08
Rename src/Screens/Game2.js to src/screens/Game2.js
MunschThomas Mar 18, 2022
d1c6e78
Rename src/Screens/Game3.js to src/screens/Game3.js
MunschThomas Mar 18, 2022
48feffd
Delete Revision.css
MunschThomas Mar 18, 2022
fc24c11
Delete Revision.js
MunschThomas Mar 18, 2022
0c268cb
Delete Revisions.js
MunschThomas Mar 18, 2022
c400199
pauffinage
Liax Mar 18, 2022
a977791
fixed random
Liax Mar 18, 2022
4df8792
relou
Liax Mar 18, 2022
eff7ccd
merge
Liax Mar 18, 2022
ac85392
Rename src/Components/ModalQ.js to src/components/ModalQ.js
MunschThomas Mar 18, 2022
8b03461
Rename src/Components/ModalQ.css to src/components/ModalQ.css
MunschThomas Mar 18, 2022
216f460
Rename src/Screens/Game2.css to src/screens/Game2.css
MunschThomas Mar 18, 2022
e409395
Rename src/Screens/Game2.js to src/screens/Game2.js
MunschThomas Mar 18, 2022
67c8c06
Rename src/Screens/Revision.js to src/screens/Revision.js
Liax Mar 18, 2022
9065588
Rename src/Screens/Revision.css to src/screens/Revision.css
Liax Mar 18, 2022
2637f35
Rename src/Screens/Game3.js to src/screens/Game3.js
MunschThomas Mar 18, 2022
fe9c2d6
Merge branch 'dev' into pauffine
MunschThomas Mar 18, 2022
d37b21e
Merge pull request #11 from MunschThomas/pauffine
MunschThomas Mar 18, 2022
32c0452
page revision et contenue
YanLanteri Mar 18, 2022
7a91df6
merge done
YanLanteri Mar 18, 2022
d6b210b
Merge pull request #12 from MunschThomas/revision
MunschThomas Mar 18, 2022
6c7356f
add revision files
Liax Mar 18, 2022
965f060
merge dev
Liax Mar 18, 2022
bedbf39
ajout du bouton retour vers le profil
Pimpuss Mar 18, 2022
37a2369
merge dev
Pimpuss Mar 18, 2022
241495d
animation boom
leoPinchon Mar 18, 2022
f4748da
merge
leoPinchon Mar 18, 2022
abfe141
Merge pull request #13 from MunschThomas/collision
leoPinchon Mar 18, 2022
793afef
finished page revision
Liax Mar 18, 2022
66db95a
merge dev
Liax Mar 18, 2022
c9c5421
Rename src/Screens/Game.css to src/screens/Game.css
MunschThomas Mar 18, 2022
29b93a4
Rename src/Screens/Game.js to src/screens/Game.js
MunschThomas Mar 18, 2022
3b3178a
Rename src/Screens/Revisions.js to src/screens/Revisions.js
MunschThomas Mar 18, 2022
6533b08
Rename src/Screens/styles/Revisions.css to src/screens/styles/Revisio…
MunschThomas Mar 18, 2022
56cee12
pop up
leoPinchon Mar 18, 2022
5bc40e1
Merge pull request #14 from MunschThomas/pauffine
MunschThomas Mar 18, 2022
83a32d2
Merge branch 'dev' of https://github.com/MunschThomas/Hackathon_3_Fle…
leoPinchon Mar 18, 2022
eea23d0
Merge pull request #15 from MunschThomas/collision
leoPinchon Mar 18, 2022
59a68ec
maj dev
MunschThomas Mar 18, 2022
4bfaf35
solved last popup on ending game issue, and added pictures to profile…
MunschThomas Mar 18, 2022
f474409
added animation to trophy on victory, styled popups buttons
MunschThomas Mar 18, 2022
87c2123
final push
MunschThomas Mar 18, 2022
acd42d9
Merge pull request #16 from MunschThomas/styling
MunschThomas Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename src/Screens/Game2.js to src/screens/Game2.js
  • Loading branch information
@MunschThomas
MunschThomas authored Mar 18, 2022
commit 13c1f08a211b551ae71be1ec177ed487ec0924ec
0 src/Screens/Game2.js → src/screens/Game2.js
View file
Open in desktop
File renamed without changes.