Merge branch 'dev'
169 files changed, 8457 insertions(+), 3431 deletions(-) R sdbapi/Dockerfile => .archived/sdbapi/Dockerfile R sdbapi/LICENSE => .archived/sdbapi/LICENSE A .archived/sdbapi/README.md A .archived/sdbapi/apierror/apierror.go R sdbapi/auth/auth.go => .archived/sdbapi/auth/auth.go R sdbapi/db/db.go => .archived/sdbapi/db/db.go A .archived/sdbapi/db/game.go A .archived/sdbapi/db/user.go A .archived/sdbapi/dev-launch-alpine.sh R sdbapi/dev-launch.sh => .archived/sdbapi/dev-launch.sh R sdbapi/docker-compose.yaml => .archived/sdbapi/docker-compose.yaml A .archived/sdbapi/go.mod A .archived/sdbapi/go.sum A .archived/sdbapi/handlers/allforming.go A .archived/sdbapi/handlers/gamecreate.go A .archived/sdbapi/handlers/gameinfo.go A .archived/sdbapi/handlers/joingame.go R sdbapi/handlers/misc.go => .archived/sdbapi/handlers/misc.go A .archived/sdbapi/handlers/mygames.go A .archived/sdbapi/handlers/patchgamestate.go R sdbapi/handlers/usercreate.go => .archived/sdbapi/handlers/usercreate.go R sdbapi/handlers/userinfo.go => .archived/sdbapi/handlers/userinfo.go R sdbapi/handlers/userinfop.go => .archived/sdbapi/handlers/userinfop.go R sdbapi/handlers/usertoken.go => .archived/sdbapi/handlers/usertoken.go A .archived/sdbapi/handlers/ws.go R sdbapi/main.go => .archived/sdbapi/main.go A .archived/sdbapi/main_test.go R sdbapi/middlewares/auth.go => .archived/sdbapi/middlewares/auth.go A .archived/sdbapi/models/action.go A .archived/sdbapi/models/game.go A .archived/sdbapi/models/gamedata.go R sdbapi/models/user.go => .archived/sdbapi/models/user.go M .cargo/config.toml M Cargo.lock M Cargo.toml M README.md A api/Cargo.toml R sdbclient/LICENSE => api/LICENSE A api/README.md A api/diesel.toml A api/docker-compose.dev.yaml A api/migrations/00000000000000_diesel_initial_setup/down.sql A api/migrations/00000000000000_diesel_initial_setup/up.sql A api/migrations/2023-02-17-075706_create_users/down.sql A api/migrations/2023-02-17-075706_create_users/up.sql A api/migrations/2023-02-17-085226_create_gamedata/down.sql A api/migrations/2023-02-17-085226_create_gamedata/up.sql A api/migrations/2023-02-17-085421_create_actions/down.sql A api/migrations/2023-02-17-085421_create_actions/up.sql A api/migrations/2023-02-17-095727_create_games/down.sql A api/migrations/2023-02-17-095727_create_games/up.sql A api/scripts/dev-launch.sh A api/scripts/dev-migr-redo.sh A api/scripts/dev-migr-reset.sh A api/scripts/dev-migr.sh A api/scripts/dev-start-db.sh A api/src/actions/mod.rs A api/src/actions/user/create.rs A api/src/actions/user/login.rs A api/src/actions/user/logout.rs A api/src/actions/user/mod.rs A api/src/handlers/game/mod.rs A api/src/handlers/info.rs A api/src/handlers/mod.rs A api/src/handlers/user/create.rs A api/src/handlers/user/login.rs A api/src/handlers/user/mod.rs A api/src/main.rs A api/src/models/action.rs A api/src/models/game.rs A api/src/models/gamedata.rs A api/src/models/mod.rs A api/src/models/user.rs A api/src/schema.rs A api/src/session.rs R sdbclient/.gitignore => client/.gitignore A client/Cargo.lock A client/Cargo.toml A client/LICENSE A client/README.md R sdbclient/assets/branding/logo.png => client/assets/branding/logo.png R sdbclient/assets/fonts/FiraMono-Bold.ttf => client/assets/fonts/FiraMono-Bold.ttf R sdbclient/assets/fonts/FiraMono-Medium.ttf => client/assets/fonts/FiraMono-Medium.ttf R sdbclient/assets/fonts/FiraMono-Regular.ttf => client/assets/fonts/FiraMono-Regular.ttf R sdbclient/assets/fonts/OFL.txt => client/assets/fonts/OFL.txt A client/assets/scripts/ui_play.lua A client/assets/ui.ess A client/flake.lock A client/flake.nix R sdbclient/src/cfg/mod.rs => client/src/cfg/mod.rs R sdbclient/src/constants.rs => client/src/constants.rs A client/src/dev.rs A client/src/lua/mod.rs R sdbclient/src/main.rs => client/src/main.rs R sdbclient/src/plugins/config/mod.rs => client/src/plugins/config/mod.rs A client/src/plugins/menu/mod.rs A client/src/plugins/menu/ui/connect/mod.rs A client/src/plugins/menu/ui/connect/ui.rs A client/src/plugins/menu/ui/menu.rs A client/src/plugins/menu/ui/mod.rs A client/src/plugins/menu/ui/play/mod.rs A client/src/plugins/menu/ui/play/ui.rs A client/src/plugins/menu/ui/settings/mod.rs A client/src/plugins/menu/ui/settings/ui.rs R sdbclient/src/plugins/mod.rs => client/src/plugins/mod.rs A client/src/plugins/networking/mod.rs A client/src/plugins/networking/systems/events.rs A client/src/plugins/networking/systems/mod.rs R sdbclient/src/plugins/phases/loading/mod.rs => client/src/plugins/phases/loading/mod.rs R sdbclient/src/plugins/phases/mod.rs => client/src/plugins/phases/mod.rs R sdbclient/src/plugins/phases/splash/mod.rs => client/src/plugins/phases/splash/mod.rs A client/src/runtime/game/mod.rs A client/src/runtime/menu/mod.rs A client/src/runtime/mod.rs A client/src/util/egui/menuwindow.rs A client/src/util/egui/mod.rs R sdbclient/src/util/eguipwd.rs => client/src/util/egui/password.rs R sdbclient/src/util/mod.rs => client/src/util/mod.rs R sdbclient/src/util/sl.rs => client/src/util/sl.rs D deck-builder.code-workspace D sdbapi/README.md D sdbapi/errors/errors.go D sdbapi/go.mod D sdbapi/go.sum D sdbclient/Cargo.toml D sdbclient/README.md D sdbclient/src/api/user/mod.rs D sdbclient/src/plugins/connection_check/mod.rs D sdbclient/src/plugins/menu/accountlogin/mod.rs D sdbclient/src/plugins/menu/accountlogin/ui.rs D sdbclient/src/plugins/menu/accountregister/mod.rs D sdbclient/src/plugins/menu/accountregister/ui.rs D sdbclient/src/plugins/menu/accountscreenloggedin.rs D sdbclient/src/plugins/menu/accountscreenloggedout.rs D sdbclient/src/plugins/menu/mainmenuscreen.rs D sdbclient/src/plugins/menu/mod.rs D sdbclient/src/plugins/menu/settingsaudioscreen.rs D sdbclient/src/plugins/menu/settingsdisplayscreen.rs D sdbclient/src/plugins/menu/settingsmenuscreen.rs D sdbclient/src/plugins/menu/settingsmiscscreen.rs A server/Cargo.toml A server/LICENSE A server/scripts/dev-launch.sh A server/src/main.rs A server/src/systems/event/mod.rs A server/src/systems/init.rs A server/src/systems/mod.rs A shared/Cargo.toml A shared/LICENSE A shared/src/api/game/all_forming.rs A shared/src/api/game/create.rs A shared/src/api/game/info.rs A shared/src/api/game/join.rs A shared/src/api/game/mod.rs A shared/src/api/game/mygames.rs A shared/src/api/game/patchstate.rs A shared/src/api/game/types.rs R sdbclient/src/api/mod.rs => shared/src/api/mod.rs A shared/src/api/types.rs A shared/src/api/user/mod.rs A shared/src/error/api.rs A shared/src/error/mod.rs A shared/src/lib.rs A shared/src/server/channels.rs A shared/src/server/messages/auth.rs A shared/src/server/messages/mod.rs A shared/src/server/mod.rs A shared/src/server/protocol.rs A shell.nix