Commit Graph

60 Commits

Author SHA1 Message Date
Danila Fedorin 7d548c390a Merge branch 'daniel-server'
# Conflicts:
#	public/scss/main.scss
2018-06-12 22:51:31 -07:00
clairecahill ba4f60c0a8 Add link to the about page 2018-06-12 21:21:51 -07:00
clairecahill 2ed23ee32b Merge branch 'daniel-server' of https://github.com/OSU-CS290-Sp18/final-project-group-4 into daniel-server
Add a link to the about page
2018-06-12 21:18:51 -07:00
Danila Fedorin 55a39fe1c7 Make top-bar take up full width. 2018-06-12 21:11:55 -07:00
clairecahill 23b8471301 add link to the about page 2018-06-12 21:11:10 -07:00
Danila Fedorin d8ae468f39 Add rules.ecr and change background image. 2018-06-12 21:01:28 -07:00
Danila Fedorin b7bdbbdc12 Fix small mistakes, properly center GO. 2018-06-12 20:50:07 -07:00
clairecahill 1af80d185c Merge branch 'daniel-server' of https://github.com/OSU-CS290-Sp18/final-project-group-4 into daniel-server 2018-06-12 19:56:59 -07:00
Danila Fedorin 733c32748e Format code. 2018-06-12 16:32:58 -07:00
Danila Fedorin bc395e5e7e Add alphabetic ordering. 2018-06-12 16:32:14 -07:00
Danila Fedorin b844a83db1 Clean up about page. 2018-06-12 16:28:29 -07:00
clairecahill 7eab8eb71e Claire's changes, add styling, backgrounds, and rules page 2018-06-11 19:56:25 -07:00
fireball1983 7e17bba627
Merge pull request #2 from OSU-CS290-Sp18/aboutpage
Added reference
2018-06-11 01:07:28 -07:00
Michael Huang 913dea2fea last bit 2018-06-11 01:06:02 -07:00
fireball1983 59bc24553d
Merge pull request #1 from OSU-CS290-Sp18/aboutpage
Michael's about page
2018-06-11 01:01:59 -07:00
Michael Huang 3af22f9464 abuotpage 2018-06-11 01:00:50 -07:00
dogcatfee fc42ac7651 Move table creation out of save_game 2018-06-08 14:20:50 -07:00
dogcatfee b41035fac7 Open database once update 2018-06-08 14:08:47 -07:00
dogcatfee 2c8bc7aff9 ignore javascript and css 2018-06-06 23:29:32 -07:00
dogcatfee f04f44e593 ignore javascript and css 2018-06-06 23:28:20 -07:00
dogcatfee fe61d3dc73 ignore javascript and css 2018-06-06 23:19:48 -07:00
dogcatfee dac5a64a45 Game cleaner implemented 2018-06-06 23:02:25 -07:00
dogcatfee c0a1548463 Save on move update 2018-06-06 21:41:07 -07:00
dogcatfee b4a31e709c Merge branch 'matt-server' of https://github.com/OSU-CS290-Sp18/final-project-group-4 into matt-server 2018-06-06 19:26:44 -07:00
dogcatfee 48d5309f63 update gitignore again 2018-06-06 19:26:23 -07:00
dogcatfee 24b262901f update gitignore again 2018-06-06 19:23:05 -07:00
dogcatfee 4b226210e8 remove cache 2018-06-06 19:22:04 -07:00
dogcatfee 6bae399d59 update gitignore 2018-06-06 19:19:51 -07:00
dogcatfee 0a103b7b73 Run save every 10 minutes 2018-06-06 19:18:15 -07:00
dogcatfee 164cf6a73a Merge branch 'matt-server' 2018-06-06 18:57:41 -07:00
dogcatfee 12c137ef4f Game loading completed 2018-06-06 18:33:01 -07:00
sessionm21 9c3665ea5c Add game creation on DB query 2018-06-05 10:27:07 -07:00
sessionm21 2ec51a45ea sqlite additions 2018-06-04 11:28:39 -07:00
Danila Fedorin 7190ea2ded Make cell change color on corner hover. 2018-06-03 13:09:20 -07:00
sessionm21 e1ecf2e0ac
Remove extra commas from README 2018-06-02 21:50:23 -07:00
sessionm21 81ddc8b09f
Fix profile link 2018-06-02 21:29:19 -07:00
sessionm21 788c7ad6c0 update README 2018-06-02 21:28:07 -07:00
sessionm21 8081f3a483 using svg images 2018-06-02 21:07:38 -07:00
Danila Fedorin 228612168c Clean up code. 2018-05-26 13:21:53 -07:00
sessionm21 65be4f3c4c Revert "Revert "Create README.md""
This reverts commit 05974b845c.
2018-05-26 11:10:14 -07:00
sessionm21 5ee0839451 Revert "reinit"
This reverts commit 0939a6590e.
2018-05-26 11:09:42 -07:00
sessionm21 05974b845c Revert "Create README.md"
This reverts commit de0fbfed94.
2018-05-26 11:07:40 -07:00
sessionm21 0939a6590e reinit 2018-05-26 11:06:17 -07:00
Danila Fedorin fcd1e62b5e Remove the debug session. 2018-05-26 00:33:29 -07:00
Danila Fedorin 0145903e70 Add a port variable. 2018-05-26 00:33:12 -07:00
Danila Fedorin a6260deefd Add removing pieces. 2018-05-26 00:19:14 -07:00
Danila Fedorin afb384e96e Render the game on create. 2018-05-25 23:41:10 -07:00
Danila Fedorin ea96fbd680 Add session creation and joining. 2018-05-25 23:36:52 -07:00
Danila Fedorin 3ee9274f49 Add a form for creating / joining sessions. 2018-05-25 23:01:55 -07:00
Danila Fedorin 489fc61e55 Remove debug text. Also, add viewport meta tag for small devices. 2018-05-25 21:23:45 -07:00