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

Group 13: Aidan MacNevin, Jack LaFond, Edison Zhang, Bryon Tom #37

Open
wants to merge 105 commits into
base: main
Choose a base branch
from
Open

Group 13: Aidan MacNevin, Jack LaFond, Edison Zhang, Bryon Tom #37

wants to merge 105 commits into from

Conversation

BryTom
Copy link

@BryTom BryTom commented Apr 29, 2024

No description provided.

BryTom and others added 30 commits April 17, 2024 17:43
@BryTom
Initial commit for proposal
4ec792c
@AidanMac13
Vite project setup
add26e9
@AidanMac13
Add server and app.svelte from ice
dfb35a2
@AidanMac13
Added multi page navigation
9bff74f
@AidanMac13
Added multi page navigation pt 2
c3caead
@JackLafond
skeleton
f18b970
@BryTom
Setup for Oauth on server
40b78ac
@JackLafond
attempt at ws with node
f6f8c97
@JackLafond
Merge branch 'novite-jack' of https://github.com/BryTom/cs4241-final-…
e05a713 
…project into novite-jack
@AidanMac13
added db to novite
e059953
@AidanMac13
Merge remote-tracking branch 'origin/novite-jack' into novite-db
1e3c8a2
@BryTom
Set up .env gitignore I think
020b8b9
@AidanMac13
added db to novite with hopeful example
1b4b937
@AidanMac13
added db to novite with hopeful example
60b412a
@BryTom
Github oauth
647bcd6 
Barebones login page
@BryTom
Good to push
5b71775
@BryTom
Merge pull request #1 from BryTom/novite-jack-oauth
d7dbb85 
Novite jack oauth
@JackLafond
create game html
798c635
@AidanMac13
moved db stuff to server.js
f1fbc0b
@BryTom
Formatted home page
e351a96
@FlaggedID
added nav bar
97806f9
@BryTom
Merge branch 'novite-jack' of https://github.com/BryTom/cs4241-final-…
6af140f 
…project into novite-jack-oauth
@FlaggedID
Merge branch 'novite-jack' of https://github.com/BryTom/cs4241-final-…
5fabe5a 
…project into novite-jack

Added Nav bar
@FlaggedID
added nav bar
c95d949
@BryTom
Merge pull request #2 from BryTom/novite-jack-oauth
d7481ae 
Novite jack oauth
@FlaggedID
added nav bar
473f496
@AidanMac13
Merge remote-tracking branch 'origin/novite-jack' into novite-db
4ca92ae 
# Conflicts:
#	public/index.html
#	server.js
@AidanMac13
Merge remote-tracking branch 'origin/novite-jack' into novite-jack
b9ff6a3
@FlaggedID
Merge branch 'novite-jack' of https://github.com/BryTom/cs4241-final-…
9e6082e 
…project into novite-jack
@AidanMac13
Fix garbage
c6bb7a2
JackLafond and others added 30 commits April 28, 2024 17:00
@JackLafond
update to stats
6ce1749
@FlaggedID
Conclude game works
466d6f2
@FlaggedID
End Game Display Works
46c6d34
@AidanMac13
Fixed setWinnerOrder
7a38504
@AidanMac13
Merge remote-tracking branch 'origin/noviteWebSocket'
674efff
@FlaggedID
added css
f487d88
@FlaggedID
Merge branch 'noviteWebSocket'
019f7d6
@AidanMac13
Styling change and auto username entry
62ef00e
@FlaggedID
Loading Screen for Players to join
d437a2c
@AidanMac13
grey out on death and class for buttons
6e3cadc
@AidanMac13
Merge remote-tracking branch 'origin/noviteWebSocket' into gameCSS
44f2763
@AidanMac13
Merge remote-tracking branch 'origin/gameCSS'
c3dccfa 
# Conflicts:
#	public/game.html
#	public/js/game.js
@AidanMac13
Button div changes
a1106d3
@AidanMac13
Merge remote-tracking branch 'origin/gameCSS'
e629fb9
@AidanMac13
Remove test and add CSS changes
4df6501
@AidanMac13
Titles and also no console.logs
96c6cc9
@AidanMac13
Fixed game css
a001a35
@BryTom
Readme
fe57bd0
@AidanMac13
Update README.md
81beb2f
@JackLafond
Update README.md
0548b91
@FlaggedID
Edison division of labor
a31ed75
@FlaggedID
Merge branch 'main' of https://github.com/BryTom/cs4241-final-project
1ec43b0
@FlaggedID
websocket tech
ac367b9
@AidanMac13
Readme: technology
3f323ec
@BryTom
Updated readme
3e8ec81
@BryTom
Merge branch 'main' of https://github.com/BryTom/cs4241-final-project
d53642c
@FlaggedID
Synch Death
d87477c
@FlaggedID
Merge branch 'main' of https://github.com/BryTom/cs4241-final-project
9b8f86d
@BryTom
Final commit
13bae41
@BryTom
Merge branch 'main' of https://github.com/BryTom/cs4241-final-project
3ab1774
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.
4 participants
@BryTom @AidanMac13 @JackLafond @FlaggedID