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

Dev #329

Merged
merged 55 commits into from
Apr 28, 2024
Merged

Dev #329

merged 55 commits into from
Apr 28, 2024

Conversation

Lacusch
Copy link
Collaborator

@Lacusch Lacusch commented Apr 28, 2024

No description provided.

AzerSD and others added 30 commits March 14, 2024 13:11
@AzerSD
now backend auto reloads when changes made
69ccf68
@AzerSD
starting game
7009a1d
@AzerSD
starting game
4a3be1c
@AzerSD
asdf
22334a2
@AzerSD
asdfasdfasdf
7dc7737
@AzerSD
merged changes after force push
33d4e41
@zstenger93
is there a single thing here which actually works?
e07936d
@AzerSD
asdfasdfasdf
b44ae67
@AzerSD
websocket working
e68736e
@AzerSD
sending info to view
34787aa
@AzerSD
sending info to view
37cefdd
@AzerSD
fixed websocket not passing cookies
f616940
@AzerSD
websocket working perfectly
7e031e8
@AzerSD
asdfasdf
4f754aa
@AzerSD
asdfasasdf
edc6ec5
@AzerSD
asdf
8236705
@AzerSD
made some progress
fc1900d
@AzerSD
made some progress
93b4176
@AzerSD
working paddle, setting endgame
99f3d8b
@AzerSD
working on ending
edff6a6
@AzerSD
Got a working game till endgame, now figureing out waiting for second…
03976f4 
… user
@AzerSD
switching to local
b174e70
@AzerSD
moving puddles
f5bc775
@AzerSD
game kinda working
82ce6cc
@AzerSD
whatever
67a271e
@AzerSD
fixed user score, now working on GameEnding, Start only when button p…
13646d4 
…ressed, prevent a user from playing against himself
@AzerSD
Stopped and cleaned up GameStats and match history, no time :D
1a58f2f
@AzerSD
switching game ending to frontend
ea4d5bb
@AzerSD
prevented a user from playing again himself
b6bac69
@AzerSD
First user is not receiving data from backend
2eb173f
AzerSD and others added 25 commits April 21, 2024 17:57
@AzerSD
game synced between two users
6a338da
@AzerSD
next: try to start playing only when start is pressed
a992c38
@AzerSD
fixed game for both ends
0fb0cad
@AzerSD
Update: fixed game for both ends
c9e5d76
@AzerSD
Fixed game ending backend
7029876
@AzerSD
now ending score can reach frontend
1a56abd
@AzerSD
change score display
8d417ae
@AzerSD
remote game in progress
03ce641
@zstenger93
Merge branch 'dev' into game_home
efdf9b7
@zstenger93
Merge pull request #325 from zstenger93/game_home
b86c9cb 
Game home
@AzerSD
fixed second game after refresh
35d095a
@AzerSD
Merge branch 'game_home' of https://github.com/zstenger93/Transcendence…
dd5b314 
… into game_home
@AzerSD
fixed second after refresh
461cb2a
@AzerSD
changed score
fa4a284
@zstenger93
Merge pull request #326 from zstenger93/game_home
5247d39 
Game home
@zstenger93
added invite to game option for chat
89d4150
@AzerSD
last minute touches
6392867
@AzerSD
updated docker-compose yml
d9b7ef7
@AzerSD
Merge branch 'test' into game_home
ce43cce
@zstenger93
Merge pull request #327 from zstenger93/game_home
026bb28 
Game home
@AzerSD
fixed 2fa
6e55d27
@zstenger93
fixed game score
640c105
@zstenger93
Merge branch 'test' of https://github.com/zstenger93/Transcendence in…
fdf4117 
…to test
@zstenger93
qr fix
72c0d8a
@zstenger93
Merge pull request #328 from zstenger93/test
c7f91a5 
Test
@Lacusch Lacusch requested a review from zstenger93 April 28, 2024 05:40
zstenger93
zstenger93 approved these changes Apr 28, 2024
View reviewed changes
Copy link
Owner

@zstenger93 zstenger93 left a comment

Choose a reason for hiding this comment

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

leggo

@zstenger93 zstenger93 merged commit 546fdd0 into master Apr 28, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zstenger93 zstenger93 zstenger93 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.
3 participants
@Lacusch @zstenger93 @AzerSD