diff options
-rw-r--r-- | WebInterface/dist/404.html (renamed from WebInterface/NodeJSServer/dist/404.html) | 0 | ||||
-rw-r--r-- | WebInterface/dist/Web.config (renamed from WebInterface/NodeJSServer/dist/Web.config) | 0 | ||||
-rw-r--r-- | WebInterface/dist/about/index.html (renamed from WebInterface/NodeJSServer/dist/about/index.html) | 0 | ||||
-rw-r--r-- | WebInterface/dist/index.html (renamed from WebInterface/NodeJSServer/dist/index.html) | 0 | ||||
-rw-r--r-- | WebInterface/dist/play/index.html (renamed from WebInterface/NodeJSServer/dist/play/index.html) | 0 | ||||
-rw-r--r-- | WebInterface/dist/ressources/DSALogo.png (renamed from WebInterface/NodeJSServer/dist/ressources/DSALogo.png) | bin | 35184 -> 35184 bytes | |||
-rw-r--r-- | WebInterface/dist/ressources/menu.png (renamed from WebInterface/NodeJSServer/dist/ressources/menu.png) | bin | 99 -> 99 bytes | |||
-rw-r--r-- | WebInterface/dist/ressources/menu_close.png (renamed from WebInterface/NodeJSServer/dist/ressources/menu_close.png) | bin | 218 -> 218 bytes | |||
-rw-r--r-- | WebInterface/dist/script/about.js (renamed from WebInterface/NodeJSServer/dist/script/about.js) | 0 | ||||
-rw-r--r-- | WebInterface/dist/script/index.js (renamed from WebInterface/NodeJSServer/dist/script/index.js) | 0 | ||||
-rw-r--r-- | WebInterface/dist/script/play.js (renamed from WebInterface/NodeJSServer/dist/script/play.js) | 0 | ||||
-rw-r--r-- | WebInterface/dist/script/playModule.js (renamed from WebInterface/NodeJSServer/dist/script/playModule.js) | 0 | ||||
-rw-r--r-- | WebInterface/dist/style/about.css (renamed from WebInterface/NodeJSServer/dist/style/about.css) | 0 | ||||
-rw-r--r-- | WebInterface/dist/style/index.css (renamed from WebInterface/NodeJSServer/dist/style/index.css) | 0 | ||||
-rw-r--r-- | WebInterface/dist/style/play.css (renamed from WebInterface/NodeJSServer/dist/style/play.css) | 0 | ||||
-rw-r--r-- | WebInterface/package-lock.json (renamed from WebInterface/NodeJSServer/package-lock.json) | 0 | ||||
-rw-r--r-- | WebInterface/package.json (renamed from WebInterface/NodeJSServer/package.json) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/about.js (renamed from WebInterface/NodeJSServer/src/js/about.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/index.js (renamed from WebInterface/NodeJSServer/src/js/index.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/interface.js (renamed from WebInterface/NodeJSServer/src/js/modules/interface.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/commands/_command.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/commands/login/createServer.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/commands/login/listServers.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/commands/login/login.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/commands/loginCmds.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/commands/playCmds.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/hash.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/hash.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/networking/networker.js (renamed from WebInterface/NodeJSServer/src/js/modules/networking/networker.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/collections/about.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/collections/login.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/collections/play.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/components/backdrop.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/components/modal/login-modal.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/components/modal/modal.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/components/notification-banner.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/components/router.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/components/router.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/components/server-listing.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/components/server-listing.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/modules/ui/uiManager.js (renamed from WebInterface/NodeJSServer/src/js/modules/ui/uiManager.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/play.js (renamed from WebInterface/NodeJSServer/src/js/play.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/src_old/modules/playModule.js (renamed from WebInterface/NodeJSServer/src/js/src_old/modules/playModule.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/src_old/modules/server-client.js (renamed from WebInterface/NodeJSServer/src/js/src_old/modules/server-client.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/src_old/modules/ui/login-modal.js (renamed from WebInterface/NodeJSServer/src/js/src_old/modules/ui/login-modal.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/src_old/modules/ui/modal.js (renamed from WebInterface/NodeJSServer/src/js/src_old/modules/ui/modal.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/js/src_old/modules/ui/server-listing.js (renamed from WebInterface/NodeJSServer/src/js/src_old/modules/ui/server-listing.js) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/about.scss (renamed from WebInterface/NodeJSServer/src/style/about.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/index.scss (renamed from WebInterface/NodeJSServer/src/style/index.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/_base.scss (renamed from WebInterface/NodeJSServer/src/style/partials/_base.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/_btn.scss (renamed from WebInterface/NodeJSServer/src/style/partials/_btn.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/_colors.scss (renamed from WebInterface/NodeJSServer/src/style/partials/_colors.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/_game.scss (renamed from WebInterface/NodeJSServer/src/style/partials/_game.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/backdrop/_base.scss (renamed from WebInterface/NodeJSServer/src/style/partials/backdrop/_base.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/backdrop/_menu.scss (renamed from WebInterface/NodeJSServer/src/style/partials/backdrop/_menu.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/front-layer/_base.scss (renamed from WebInterface/NodeJSServer/src/style/partials/front-layer/_base.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/front-layer/_copyright.scss (renamed from WebInterface/NodeJSServer/src/style/partials/front-layer/_copyright.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/front-layer/_notifications.scss (renamed from WebInterface/NodeJSServer/src/style/partials/front-layer/_notifications.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/front-layer/_server-listing.scss (renamed from WebInterface/NodeJSServer/src/style/partials/front-layer/_server-listing.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/game/_chat.scss (renamed from WebInterface/NodeJSServer/src/style/partials/game/_chat.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/modal/_base.scss (renamed from WebInterface/NodeJSServer/src/style/partials/modal/_base.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/partials/modal/_login.scss (renamed from WebInterface/NodeJSServer/src/style/partials/modal/_login.scss) | 0 | ||||
-rw-r--r-- | WebInterface/src/style/play.scss (renamed from WebInterface/NodeJSServer/src/style/play.scss) | 0 | ||||
-rw-r--r-- | WebInterface/webpack.config.js (renamed from WebInterface/NodeJSServer/webpack.config.js) | 0 | ||||
-rw-r--r-- | scribble/index.html | 15 | ||||
-rw-r--r-- | scribble/mainstyle.css | 53 | ||||
-rw-r--r-- | scribble/script.js | 215 | ||||
-rw-r--r-- | webhogg/game_server/Cargo.toml (renamed from game_server/Cargo.toml) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/backend_connection.rs (renamed from game_server/src/backend_connection.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/collide.rs (renamed from game_server/src/collide.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/game_logger.rs (renamed from game_server/src/game_logger.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/group.rs (renamed from game_server/src/group.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/lobby.rs (renamed from game_server/src/lobby.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/main.rs (renamed from game_server/src/main.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/maths.rs (renamed from game_server/src/maths.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/scribble_group.rs (renamed from game_server/src/scribble_group.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/server.rs (renamed from game_server/src/server.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/webhogg_game.rs (renamed from game_server/src/webhogg_game.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/webhogg_group.rs (renamed from game_server/src/webhogg_group.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/webhogg_player.rs (renamed from game_server/src/webhogg_player.rs) | 0 | ||||
-rw-r--r-- | webhogg/game_server/src/ws_test.html (renamed from game_server/src/ws_test.html) | 0 |
78 files changed, 0 insertions, 283 deletions
diff --git a/WebInterface/NodeJSServer/dist/404.html b/WebInterface/dist/404.html index 829eda8..829eda8 100644 --- a/WebInterface/NodeJSServer/dist/404.html +++ b/WebInterface/dist/404.html diff --git a/WebInterface/NodeJSServer/dist/Web.config b/WebInterface/dist/Web.config index 741b7d8..741b7d8 100644 --- a/WebInterface/NodeJSServer/dist/Web.config +++ b/WebInterface/dist/Web.config diff --git a/WebInterface/NodeJSServer/dist/about/index.html b/WebInterface/dist/about/index.html index d7294b7..d7294b7 100644 --- a/WebInterface/NodeJSServer/dist/about/index.html +++ b/WebInterface/dist/about/index.html diff --git a/WebInterface/NodeJSServer/dist/index.html b/WebInterface/dist/index.html index 7ea33b7..7ea33b7 100644 --- a/WebInterface/NodeJSServer/dist/index.html +++ b/WebInterface/dist/index.html diff --git a/WebInterface/NodeJSServer/dist/play/index.html b/WebInterface/dist/play/index.html index e03401a..e03401a 100644 --- a/WebInterface/NodeJSServer/dist/play/index.html +++ b/WebInterface/dist/play/index.html diff --git a/WebInterface/NodeJSServer/dist/ressources/DSALogo.png b/WebInterface/dist/ressources/DSALogo.png Binary files differindex 98f9982..98f9982 100644 --- a/WebInterface/NodeJSServer/dist/ressources/DSALogo.png +++ b/WebInterface/dist/ressources/DSALogo.png diff --git a/WebInterface/NodeJSServer/dist/ressources/menu.png b/WebInterface/dist/ressources/menu.png Binary files differindex 7f40f4b..7f40f4b 100644 --- a/WebInterface/NodeJSServer/dist/ressources/menu.png +++ b/WebInterface/dist/ressources/menu.png diff --git a/WebInterface/NodeJSServer/dist/ressources/menu_close.png b/WebInterface/dist/ressources/menu_close.png Binary files differindex b045f43..b045f43 100644 --- a/WebInterface/NodeJSServer/dist/ressources/menu_close.png +++ b/WebInterface/dist/ressources/menu_close.png diff --git a/WebInterface/NodeJSServer/dist/script/about.js b/WebInterface/dist/script/about.js index dea88f8..dea88f8 100644 --- a/WebInterface/NodeJSServer/dist/script/about.js +++ b/WebInterface/dist/script/about.js diff --git a/WebInterface/NodeJSServer/dist/script/index.js b/WebInterface/dist/script/index.js index 70c1d0a..70c1d0a 100644 --- a/WebInterface/NodeJSServer/dist/script/index.js +++ b/WebInterface/dist/script/index.js diff --git a/WebInterface/NodeJSServer/dist/script/play.js b/WebInterface/dist/script/play.js index 7e78fb6..7e78fb6 100644 --- a/WebInterface/NodeJSServer/dist/script/play.js +++ b/WebInterface/dist/script/play.js diff --git a/WebInterface/NodeJSServer/dist/script/playModule.js b/WebInterface/dist/script/playModule.js index e807783..e807783 100644 --- a/WebInterface/NodeJSServer/dist/script/playModule.js +++ b/WebInterface/dist/script/playModule.js diff --git a/WebInterface/NodeJSServer/dist/style/about.css b/WebInterface/dist/style/about.css index 5820f64..5820f64 100644 --- a/WebInterface/NodeJSServer/dist/style/about.css +++ b/WebInterface/dist/style/about.css diff --git a/WebInterface/NodeJSServer/dist/style/index.css b/WebInterface/dist/style/index.css index 1004808..1004808 100644 --- a/WebInterface/NodeJSServer/dist/style/index.css +++ b/WebInterface/dist/style/index.css diff --git a/WebInterface/NodeJSServer/dist/style/play.css b/WebInterface/dist/style/play.css index 502af5e..502af5e 100644 --- a/WebInterface/NodeJSServer/dist/style/play.css +++ b/WebInterface/dist/style/play.css diff --git a/WebInterface/NodeJSServer/package-lock.json b/WebInterface/package-lock.json index 54736a6..54736a6 100644 --- a/WebInterface/NodeJSServer/package-lock.json +++ b/WebInterface/package-lock.json diff --git a/WebInterface/NodeJSServer/package.json b/WebInterface/package.json index 241ac80..241ac80 100644 --- a/WebInterface/NodeJSServer/package.json +++ b/WebInterface/package.json diff --git a/WebInterface/NodeJSServer/src/js/about.js b/WebInterface/src/js/about.js index 23351cf..23351cf 100644 --- a/WebInterface/NodeJSServer/src/js/about.js +++ b/WebInterface/src/js/about.js diff --git a/WebInterface/NodeJSServer/src/js/index.js b/WebInterface/src/js/index.js index c8b5ca8..c8b5ca8 100644 --- a/WebInterface/NodeJSServer/src/js/index.js +++ b/WebInterface/src/js/index.js diff --git a/WebInterface/NodeJSServer/src/js/modules/interface.js b/WebInterface/src/js/modules/interface.js index ac5ea93..ac5ea93 100644 --- a/WebInterface/NodeJSServer/src/js/modules/interface.js +++ b/WebInterface/src/js/modules/interface.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js b/WebInterface/src/js/modules/networking/commands/_command.js index 46a1a14..46a1a14 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js +++ b/WebInterface/src/js/modules/networking/commands/_command.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js b/WebInterface/src/js/modules/networking/commands/login/createServer.js index 78b2a1b..78b2a1b 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js +++ b/WebInterface/src/js/modules/networking/commands/login/createServer.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js b/WebInterface/src/js/modules/networking/commands/login/listServers.js index 2c2bc11..2c2bc11 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js +++ b/WebInterface/src/js/modules/networking/commands/login/listServers.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js b/WebInterface/src/js/modules/networking/commands/login/login.js index 44a6c94..44a6c94 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js +++ b/WebInterface/src/js/modules/networking/commands/login/login.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js b/WebInterface/src/js/modules/networking/commands/loginCmds.js index bc5d8a7..bc5d8a7 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js +++ b/WebInterface/src/js/modules/networking/commands/loginCmds.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js b/WebInterface/src/js/modules/networking/commands/playCmds.js index 94cd6ba..94cd6ba 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js +++ b/WebInterface/src/js/modules/networking/commands/playCmds.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/hash.js b/WebInterface/src/js/modules/networking/hash.js index 3abcc21..3abcc21 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/hash.js +++ b/WebInterface/src/js/modules/networking/hash.js diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/networker.js b/WebInterface/src/js/modules/networking/networker.js index 199adc7..199adc7 100644 --- a/WebInterface/NodeJSServer/src/js/modules/networking/networker.js +++ b/WebInterface/src/js/modules/networking/networker.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js b/WebInterface/src/js/modules/ui/collections/about.js index dac8f01..dac8f01 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js +++ b/WebInterface/src/js/modules/ui/collections/about.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js b/WebInterface/src/js/modules/ui/collections/login.js index 98a6b30..98a6b30 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js +++ b/WebInterface/src/js/modules/ui/collections/login.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js b/WebInterface/src/js/modules/ui/collections/play.js index cdea777..cdea777 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js +++ b/WebInterface/src/js/modules/ui/collections/play.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js b/WebInterface/src/js/modules/ui/components/backdrop.js index 82ca64f..82ca64f 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js +++ b/WebInterface/src/js/modules/ui/components/backdrop.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js b/WebInterface/src/js/modules/ui/components/modal/login-modal.js index 941fd84..941fd84 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js +++ b/WebInterface/src/js/modules/ui/components/modal/login-modal.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js b/WebInterface/src/js/modules/ui/components/modal/modal.js index c4c5119..c4c5119 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js +++ b/WebInterface/src/js/modules/ui/components/modal/modal.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js b/WebInterface/src/js/modules/ui/components/notification-banner.js index a527725..a527725 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js +++ b/WebInterface/src/js/modules/ui/components/notification-banner.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/router.js b/WebInterface/src/js/modules/ui/components/router.js index c01c21b..c01c21b 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/router.js +++ b/WebInterface/src/js/modules/ui/components/router.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/server-listing.js b/WebInterface/src/js/modules/ui/components/server-listing.js index 2af56ac..2af56ac 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/server-listing.js +++ b/WebInterface/src/js/modules/ui/components/server-listing.js diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/uiManager.js b/WebInterface/src/js/modules/ui/uiManager.js index ddbb152..ddbb152 100644 --- a/WebInterface/NodeJSServer/src/js/modules/ui/uiManager.js +++ b/WebInterface/src/js/modules/ui/uiManager.js diff --git a/WebInterface/NodeJSServer/src/js/play.js b/WebInterface/src/js/play.js index 93508b3..93508b3 100644 --- a/WebInterface/NodeJSServer/src/js/play.js +++ b/WebInterface/src/js/play.js diff --git a/WebInterface/NodeJSServer/src/js/src_old/modules/playModule.js b/WebInterface/src/js/src_old/modules/playModule.js index 931f598..931f598 100644 --- a/WebInterface/NodeJSServer/src/js/src_old/modules/playModule.js +++ b/WebInterface/src/js/src_old/modules/playModule.js diff --git a/WebInterface/NodeJSServer/src/js/src_old/modules/server-client.js b/WebInterface/src/js/src_old/modules/server-client.js index 2f712b5..2f712b5 100644 --- a/WebInterface/NodeJSServer/src/js/src_old/modules/server-client.js +++ b/WebInterface/src/js/src_old/modules/server-client.js diff --git a/WebInterface/NodeJSServer/src/js/src_old/modules/ui/login-modal.js b/WebInterface/src/js/src_old/modules/ui/login-modal.js index 13de78e..13de78e 100644 --- a/WebInterface/NodeJSServer/src/js/src_old/modules/ui/login-modal.js +++ b/WebInterface/src/js/src_old/modules/ui/login-modal.js diff --git a/WebInterface/NodeJSServer/src/js/src_old/modules/ui/modal.js b/WebInterface/src/js/src_old/modules/ui/modal.js index 10a1be5..10a1be5 100644 --- a/WebInterface/NodeJSServer/src/js/src_old/modules/ui/modal.js +++ b/WebInterface/src/js/src_old/modules/ui/modal.js diff --git a/WebInterface/NodeJSServer/src/js/src_old/modules/ui/server-listing.js b/WebInterface/src/js/src_old/modules/ui/server-listing.js index 78ca323..78ca323 100644 --- a/WebInterface/NodeJSServer/src/js/src_old/modules/ui/server-listing.js +++ b/WebInterface/src/js/src_old/modules/ui/server-listing.js diff --git a/WebInterface/NodeJSServer/src/style/about.scss b/WebInterface/src/style/about.scss index 3b45674..3b45674 100644 --- a/WebInterface/NodeJSServer/src/style/about.scss +++ b/WebInterface/src/style/about.scss diff --git a/WebInterface/NodeJSServer/src/style/index.scss b/WebInterface/src/style/index.scss index 04c896a..04c896a 100644 --- a/WebInterface/NodeJSServer/src/style/index.scss +++ b/WebInterface/src/style/index.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/_base.scss b/WebInterface/src/style/partials/_base.scss index 5f300fd..5f300fd 100644 --- a/WebInterface/NodeJSServer/src/style/partials/_base.scss +++ b/WebInterface/src/style/partials/_base.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/_btn.scss b/WebInterface/src/style/partials/_btn.scss index cf5ee33..cf5ee33 100644 --- a/WebInterface/NodeJSServer/src/style/partials/_btn.scss +++ b/WebInterface/src/style/partials/_btn.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/_colors.scss b/WebInterface/src/style/partials/_colors.scss index 4683325..4683325 100644 --- a/WebInterface/NodeJSServer/src/style/partials/_colors.scss +++ b/WebInterface/src/style/partials/_colors.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/_game.scss b/WebInterface/src/style/partials/_game.scss index 74b566b..74b566b 100644 --- a/WebInterface/NodeJSServer/src/style/partials/_game.scss +++ b/WebInterface/src/style/partials/_game.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/backdrop/_base.scss b/WebInterface/src/style/partials/backdrop/_base.scss index 1b7a924..1b7a924 100644 --- a/WebInterface/NodeJSServer/src/style/partials/backdrop/_base.scss +++ b/WebInterface/src/style/partials/backdrop/_base.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/backdrop/_menu.scss b/WebInterface/src/style/partials/backdrop/_menu.scss index 26833d5..26833d5 100644 --- a/WebInterface/NodeJSServer/src/style/partials/backdrop/_menu.scss +++ b/WebInterface/src/style/partials/backdrop/_menu.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/front-layer/_base.scss b/WebInterface/src/style/partials/front-layer/_base.scss index 6a2aa9a..6a2aa9a 100644 --- a/WebInterface/NodeJSServer/src/style/partials/front-layer/_base.scss +++ b/WebInterface/src/style/partials/front-layer/_base.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/front-layer/_copyright.scss b/WebInterface/src/style/partials/front-layer/_copyright.scss index 31ac614..31ac614 100644 --- a/WebInterface/NodeJSServer/src/style/partials/front-layer/_copyright.scss +++ b/WebInterface/src/style/partials/front-layer/_copyright.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/front-layer/_notifications.scss b/WebInterface/src/style/partials/front-layer/_notifications.scss index d8e8159..d8e8159 100644 --- a/WebInterface/NodeJSServer/src/style/partials/front-layer/_notifications.scss +++ b/WebInterface/src/style/partials/front-layer/_notifications.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/front-layer/_server-listing.scss b/WebInterface/src/style/partials/front-layer/_server-listing.scss index 7e67178..7e67178 100644 --- a/WebInterface/NodeJSServer/src/style/partials/front-layer/_server-listing.scss +++ b/WebInterface/src/style/partials/front-layer/_server-listing.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/game/_chat.scss b/WebInterface/src/style/partials/game/_chat.scss index 89b63b3..89b63b3 100644 --- a/WebInterface/NodeJSServer/src/style/partials/game/_chat.scss +++ b/WebInterface/src/style/partials/game/_chat.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/modal/_base.scss b/WebInterface/src/style/partials/modal/_base.scss index 006c241..006c241 100644 --- a/WebInterface/NodeJSServer/src/style/partials/modal/_base.scss +++ b/WebInterface/src/style/partials/modal/_base.scss diff --git a/WebInterface/NodeJSServer/src/style/partials/modal/_login.scss b/WebInterface/src/style/partials/modal/_login.scss index 71adf61..71adf61 100644 --- a/WebInterface/NodeJSServer/src/style/partials/modal/_login.scss +++ b/WebInterface/src/style/partials/modal/_login.scss diff --git a/WebInterface/NodeJSServer/src/style/play.scss b/WebInterface/src/style/play.scss index 7286f74..7286f74 100644 --- a/WebInterface/NodeJSServer/src/style/play.scss +++ b/WebInterface/src/style/play.scss diff --git a/WebInterface/NodeJSServer/webpack.config.js b/WebInterface/webpack.config.js index 4b408a2..4b408a2 100644 --- a/WebInterface/NodeJSServer/webpack.config.js +++ b/WebInterface/webpack.config.js diff --git a/scribble/index.html b/scribble/index.html deleted file mode 100644 index ee7d052..0000000 --- a/scribble/index.html +++ /dev/null @@ -1,15 +0,0 @@ -<!doctype html> -<html> - <header> - <title> Scribblio </title> - <script src="./script.js"></script> - <link rel="stylesheet" type="text/css" href="mainstyle.css"> - </header> - <body> - <div class="wrapper"> - <div class="toolbar"> - </div><br> - <canvas id="my-canvas" width="1000" height="1000"></canvas> - </div> - </body> -</html> diff --git a/scribble/mainstyle.css b/scribble/mainstyle.css deleted file mode 100644 index 82045d1..0000000 --- a/scribble/mainstyle.css +++ /dev/null @@ -1,53 +0,0 @@ -body { - padding: 0,2; - margin: 0; - background: #222222; -} -.wrapper { - max-width: 900px; - margin: auto; - font-family: "Arial"; -} - -.toolbar{ - width: 100%; - background-color: #440044; - overflow: auto; -} - -.toolbar a { - float: left; - width: 11%; - text-align: center; - padding: 6px 5px; - transition: all 0.5s ease; - color: white; -} - -/* Change color on hover */ -.toolbar a:hover { - background-color: #000; - } - -/* Change color on selected icon */ -.selected { - background-color: #000; -} - -#my-canvas{ - width: 100%; - background: white; - border: 3px solid #000000; -} - -#img-data-div{ - width: 100%; - max-width: 900px; - height: 200px; -} - -/* Resize image to container */ -.toolbar a img{ - max-width:100%; - height:auto; -} diff --git a/scribble/script.js b/scribble/script.js deleted file mode 100644 index 75173ae..0000000 --- a/scribble/script.js +++ /dev/null @@ -1,215 +0,0 @@ -const socket = new WebSocket("ws://localhost:5001", "tuesday"); - -//var exampleSocket = new WebSocket("ws://192.168.3.42:5001", "tuesday"); -socket.onopen = function (event) { - console.log("Connection established"); - // Display user friendly messages for the successful establishment of connection - socket.send("42"); -}; -socket.onmessage = function (event) { - console.log(event.data); - AddBrushPoint(JSON.parse(event.data)); - DrawBrush(); - SaveCanvasImage(); - RedrawCanvasImage(); -}; -window.onbeforeunload = function () { - socket.onclose = function () { }; // disable onclose handler first - console.log("Connection terminated"); - socket.close(); -}; - -let canvas; -let context; -let savedImageData; -let dragging = false; -let strokeColor = 'black'; -let fillColor = 'black'; -let color = 'black'; -let lineWidth = 2; -let currentTool = "brush"; -let canvasHeight = 1000; -let canvasWidth = 1000; - -let usingBrush = false; -let brushPoints = new Array(); - -class ShapeBoundingBox { - constructor(left, top, width, height) { - this.left = left; - this.top = top; - this.width = width; - this.height = height; - } -} - -class DrawPoint { - constructor(x, y, mouseDown) { - this.x = x; - this.y = y; - this.mouseDown = mouseDown; - } -} - -class MouseDownPos { - constructor(x, y) { - this.x = x; - this.y = y; - } -} - -class Location { - constructor(x, y) { - this.x = x; - this.y = y; - } -} - - -let shapeBoundingBox = new ShapeBoundingBox(0, 0, 0, 0); -let mousedown = new MouseDownPos(0, 0); -let loc = new Location(0, 0); - -document.addEventListener('DOMContentLoaded', setupCanvas); - -function setupCanvas() { - canvas = document.getElementById('my-canvas'); - context = canvas.getContext('2d'); - context.strokeStyles = strokeColor; - context.lineWidth = lineWidth; - canvas.addEventListener("mousedown", ReactToMouseDown); - canvas.addEventListener("mousemove", ReactToMouseMove); - canvas.addEventListener("mouseup", ReactToMouseUp); -} - - -function GetMousePosition(x, y) { - let canvasSizeData = canvas.getBoundingClientRect(); - return { - x: (x - canvasSizeData.left) * (canvas.width / canvasSizeData.width), - y: (y - canvasSizeData.top) * (canvas.height / canvasSizeData.height) - }; -} - -function SaveCanvasImage() { - savedImageData = context.getImageData(0, 0, canvas.width, canvas.height); -} - -function RedrawCanvasImage() { - context.putImageData(savedImageData, 0, 0); -} - -function UpdateRubberbandSizeData(location) { - shapeBoundingBox.width = Math.abs(location.x - mousedown.x); - shapeBoundingBox.height = Math.abs(location.y - mousedown.y); - - if (location.x > mousedown.x) { - shapeBoundingBox.left = mousedown.x; - } else { - shapeBoundingBox.left = location.x; - } - if (location.y > mousedown.y) { - shapeBoundingBox.top = mousedown.y; - } else { - shapeBoundingBox.top = location.y; - } -} - -function AddNetBrushPoint(x, y, mouseDown) { - let point = new DrawPoint(x, y, mouseDown); - socket.send(JSON.stringify(point)); - - AddBrushPoint(point); -} - -function AddBrushPoint(point) { - brushPoints.push(point); -} - -function DrawBrush() { - for (let i = 1; i < brushPoints.length; i++) { - context.beginPath(); - if (brushPoints[i].mouseDown) { - context.moveTo(brushPoints[i - 1].x, brushPoints[i - 1].y); - } else { - context.moveTo(brushPoints[i].x - 1, brushPoints[i].y); - } - context.lineTo(brushPoints[i].x, brushPoints[i].y) - context.closePath(); - context.stroke(); - } -} - -function UpdateRubberbandOnMove(location) { - UpdateRubberbandSizeData(location); - drawRubberbandShape(location); -} - -function drawRubberbandShape(location) { - context.strokeStyle = strokeColor; - context.fillStyle = fillColor; - - if (currentTool === "brush") { - DrawBrush(); - } else if (currentTool === "line") { - context.beginPath(); - context.moveTo(mousedown.x, mousedown.y); - context.lineTo(location.x, location.y); - context.closePath(); - context.stroke(); - } else if (currentTool === "rectangle") { - context.strokeRect(shapeBoundingBox.left, shapeBoundingBox.top, - shapeBoundingBox.width, shapeBoundingBox.height); - } -} - -function ReactToMouseDown(e) { - // Change the mouse pointer to a crosshair - canvas.style.cursor = "crosshair"; - // Store location - loc = GetMousePosition(e.clientX, e.clientY); - // Save the current canvas image - SaveCanvasImage(); - // Store mouse position when clicked - mousedown.x = loc.x; - mousedown.y = loc.y; - // Store that yes the mouse is being held down - dragging = true; - - if (currentTool === "brush") { - usingBrush = true; - AddNetBrushPoint(mousedown.x, mousedown.y); - } -}; - -function ReactToMouseMove(e) { - canvas.style.cursor = "crosshair"; - loc = GetMousePosition(e.clientX, e.clientY); - - if (currentTool === "brush" && dragging && usingBrush) { - if (loc.x > 0 && loc.x < canvasWidth && loc.y > 0 && loc.y < canvasHeight) { - AddNetBrushPoint(loc.x, loc.y, true); - } - RedrawCanvasImage(); - DrawBrush(); - } else if (dragging) { - RedrawCanvasImage(); - UpdateRubberbandOnMove(loc); - } -}; - -function ReactToMouseUp(e) { - canvas.style.cursor = "default"; - loc = GetMousePosition(e.clientX, e.clientY); - RedrawCanvasImage(); - UpdateRubberbandOnMove(loc); - dragging = false; - usingBrush = false; - - brushXPoints = new Array(); - brushYPoints = new Array(); - brushDownPos = new Array(); - if (currentTool === "brush") { - AddBrushPoint(loc.x, loc.y); - } -} diff --git a/game_server/Cargo.toml b/webhogg/game_server/Cargo.toml index bc14942..bc14942 100644 --- a/game_server/Cargo.toml +++ b/webhogg/game_server/Cargo.toml diff --git a/game_server/src/backend_connection.rs b/webhogg/game_server/src/backend_connection.rs index a751b30..a751b30 100644 --- a/game_server/src/backend_connection.rs +++ b/webhogg/game_server/src/backend_connection.rs diff --git a/game_server/src/collide.rs b/webhogg/game_server/src/collide.rs index 16b5357..16b5357 100644 --- a/game_server/src/collide.rs +++ b/webhogg/game_server/src/collide.rs diff --git a/game_server/src/game_logger.rs b/webhogg/game_server/src/game_logger.rs index c51bfc5..c51bfc5 100644 --- a/game_server/src/game_logger.rs +++ b/webhogg/game_server/src/game_logger.rs diff --git a/game_server/src/group.rs b/webhogg/game_server/src/group.rs index 74a04f7..74a04f7 100644 --- a/game_server/src/group.rs +++ b/webhogg/game_server/src/group.rs diff --git a/game_server/src/lobby.rs b/webhogg/game_server/src/lobby.rs index 6d11a5f..6d11a5f 100644 --- a/game_server/src/lobby.rs +++ b/webhogg/game_server/src/lobby.rs diff --git a/game_server/src/main.rs b/webhogg/game_server/src/main.rs index cfd9787..cfd9787 100644 --- a/game_server/src/main.rs +++ b/webhogg/game_server/src/main.rs diff --git a/game_server/src/maths.rs b/webhogg/game_server/src/maths.rs index b9303af..b9303af 100644 --- a/game_server/src/maths.rs +++ b/webhogg/game_server/src/maths.rs diff --git a/game_server/src/scribble_group.rs b/webhogg/game_server/src/scribble_group.rs index 8980e7b..8980e7b 100644 --- a/game_server/src/scribble_group.rs +++ b/webhogg/game_server/src/scribble_group.rs diff --git a/game_server/src/server.rs b/webhogg/game_server/src/server.rs index 5b1a7a9..5b1a7a9 100644 --- a/game_server/src/server.rs +++ b/webhogg/game_server/src/server.rs diff --git a/game_server/src/webhogg_game.rs b/webhogg/game_server/src/webhogg_game.rs index 7b94fcb..7b94fcb 100644 --- a/game_server/src/webhogg_game.rs +++ b/webhogg/game_server/src/webhogg_game.rs diff --git a/game_server/src/webhogg_group.rs b/webhogg/game_server/src/webhogg_group.rs index 091f7f8..091f7f8 100644 --- a/game_server/src/webhogg_group.rs +++ b/webhogg/game_server/src/webhogg_group.rs diff --git a/game_server/src/webhogg_player.rs b/webhogg/game_server/src/webhogg_player.rs index 38b9596..38b9596 100644 --- a/game_server/src/webhogg_player.rs +++ b/webhogg/game_server/src/webhogg_player.rs diff --git a/game_server/src/ws_test.html b/webhogg/game_server/src/ws_test.html index 3b3d4ce..3b3d4ce 100644 --- a/game_server/src/ws_test.html +++ b/webhogg/game_server/src/ws_test.html |