diff --git a/electron/index.js b/electron/index.js index 264aa581..abfd7ede 100644 --- a/electron/index.js +++ b/electron/index.js @@ -60,7 +60,7 @@ function createWindow() { useContentSize: false, minWidth: 800, minHeight: 600, - title: "shapez.io Standalone", + title: "shapez", transparent: false, icon: path.join(__dirname, "favicon" + faviconExtension), // fullscreen: true, diff --git a/mod_examples/README.md b/mod_examples/README.md index 2eccb1e2..5086bbdb 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -13,7 +13,7 @@ A great place to get help with mod development is the official [shapez.io modloa ## Setting up your development environment -The simplest way of developing mods is by just creating a `mymod.js` file and putting it in the `mods/` folder of the standalone (You can find the `mods/` folder by clicking "Open Mods Folder" in the shapez.io Standalone, be sure to select the 1.5.0-modloader branch on Steam). +The simplest way of developing mods is by just creating a `mymod.js` file and putting it in the `mods/` folder of the standalone (You can find the `mods/` folder by clicking "Open Mods Folder" in the shapez Standalone, be sure to select the 1.5.0-modloader branch on Steam). You can then add `--dev` to the launch options on Steam. This adds an application menu where you can click "Restart" to reload your mod, and will also show the developer console where you can see any potential errors. diff --git a/res/logo-tobspr-games.svg b/res/logo-tobspr-games.svg new file mode 100644 index 00000000..996170b8 --- /dev/null +++ b/res/logo-tobspr-games.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/puzzle_dlc_logo.png b/res/puzzle_dlc_logo.png index 1c430c82..5572fca6 100644 Binary files a/res/puzzle_dlc_logo.png and b/res/puzzle_dlc_logo.png differ diff --git a/src/css/common.scss b/src/css/common.scss index 5b28cd03..a32be3ee 100644 --- a/src/css/common.scss +++ b/src/css/common.scss @@ -195,6 +195,7 @@ button { border: 0; background: $colorBlueBright; color: #fff; + @include S(border-radius, $globalBorderRadius); // border: #{D(1px)} solid rgba(0, 10, 20, 0.2); @include S(border-bottom-width, 2px); @@ -673,7 +674,7 @@ input.rangeInput { text-transform: uppercase; @include S(padding, 1.5px, 3px, 2px); @include PlainText; - @include S(border-radius, $globalBorderRadius); + @include S(border-radius, 0.5 * $globalBorderRadius); &, > span { @include S(font-size, 9px); @@ -682,6 +683,7 @@ input.rangeInput { text-shadow: none !important; // font-family: Arial, sans-serif !important; } + font-weight: bold; color: $accentColorDark; text-align: center; diff --git a/src/css/ingame_hud/building_placer.scss b/src/css/ingame_hud/building_placer.scss index 9c038340..12965f0f 100644 --- a/src/css/ingame_hud/building_placer.scss +++ b/src/css/ingame_hud/building_placer.scss @@ -14,9 +14,9 @@ grid-template-columns: 1fr auto; grid-template-rows: auto 1fr; - @include DarkThemeOverride { - background-color: #55585a; - } + // @include DarkThemeOverride { + // // background-color: #55585a; + // } transition: opacity 0.1s ease-out; &.hovered { @@ -133,7 +133,7 @@ grid-row: 2 / 3; @include S(border-radius, $globalBorderRadius); - background: rgba($ingameHudBg, 0.3); + background: rgba($ingameHudBg, 0.5); opacity: 0.5; display: inline-flex; vertical-align: top; diff --git a/src/css/ingame_hud/buildings_toolbar.scss b/src/css/ingame_hud/buildings_toolbar.scss index 3af5edf4..51447271 100644 --- a/src/css/ingame_hud/buildings_toolbar.scss +++ b/src/css/ingame_hud/buildings_toolbar.scss @@ -7,6 +7,7 @@ display: grid; grid-template-rows: auto auto; justify-items: center; + @include S(grid-gap, 4px); background: transparent; transition: transform 120ms ease-in-out; @@ -32,8 +33,6 @@ &.secondary { grid-row: 1 / 2; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; .building { @include S(width, 30px); @@ -108,7 +107,7 @@ &.selected { // transform: scale(1.05); background-color: rgba(lighten($colorBlueBright, 9), 0.4); - @include S(border-radius, 2px); + @include S(border-radius, $globalBorderRadius); .keybinding { color: #111; diff --git a/src/css/ingame_hud/dialogs.scss b/src/css/ingame_hud/dialogs.scss index 6a93ceb7..4c9264a9 100644 --- a/src/css/ingame_hud/dialogs.scss +++ b/src/css/ingame_hud/dialogs.scss @@ -96,6 +96,8 @@ @include S(grid-gap, 5px); grid-template-columns: 1fr 1fr; .option { + @include S(border-radius, $globalBorderRadius); + pointer-events: all; cursor: pointer; @include S(padding, 10px); diff --git a/src/css/ingame_hud/interactive_tutorial.scss b/src/css/ingame_hud/interactive_tutorial.scss index 45750b04..3e1b5c99 100644 --- a/src/css/ingame_hud/interactive_tutorial.scss +++ b/src/css/ingame_hud/interactive_tutorial.scss @@ -10,7 +10,7 @@ @include S(width, 150px); background: $ingameHudBg; - @include S(padding, 4px); + @include S(padding, 7px); color: #eee; display: flex; flex-direction: column; @@ -60,5 +60,6 @@ @include S(height, 150px); background: center center / cover no-repeat; transition: opacity 0.1s ease-out; + @include S(border-radius, $globalBorderRadius); } } diff --git a/src/css/ingame_hud/shape_viewer.scss b/src/css/ingame_hud/shape_viewer.scss index 9ece9f35..2e07f1da 100644 --- a/src/css/ingame_hud/shape_viewer.scss +++ b/src/css/ingame_hud/shape_viewer.scss @@ -51,6 +51,7 @@ display: flex; align-items: center; justify-content: center; + @include S(border-radius, $globalBorderRadius); > canvas { @include S(width, 50px); diff --git a/src/css/ingame_hud/waypoints.scss b/src/css/ingame_hud/waypoints.scss index e5a38705..f7566ee5 100644 --- a/src/css/ingame_hud/waypoints.scss +++ b/src/css/ingame_hud/waypoints.scss @@ -8,10 +8,11 @@ @include PlainText; @include S(width, 150px); - background: rgba(0, 10, 20, 0.5); - @include S(padding, 5px); + background: $ingameHudBg; + @include S(padding, 7px); color: #eee; + @include S(border-radius, $globalBorderRadius); .desc { @include SuperSmallText; diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 7330744d..031c702c 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -63,9 +63,9 @@ opacity: 0; display: none; transform: translate(50%, 50%); - filter: blur(D(3px)); + filter: blur(D(7px)); - $opacity: 0.07; + $opacity: 0.4; &.loaded { display: block; opacity: $opacity; @@ -241,6 +241,7 @@ position: relative; @include S(padding, 20px); @include S(border-radius, $globalBorderRadius); + box-shadow: 0 D(5px) D(15px) rgba(#000, 0.2); > .badge { color: #fff; @@ -398,6 +399,8 @@ @include S(padding, 20px); @include S(border-radius, $globalBorderRadius); // border: #{D(2px)} solid rgba(0, 10, 20, 0.1); + + box-shadow: 0 D(5px) D(15px) rgba(#000, 0.2); height: 100%; width: 100%; box-sizing: border-box; @@ -716,18 +719,31 @@ } .author { - flex-grow: 1; + margin-left: auto; text-align: right; @include PlainText; - color: #888a8f; + color: #000; + a { - color: #333438; + &:hover { + opacity: 0.8; + } + display: flex; + align-items: center; + justify-content: center; + + img { + @include S(margin-left, 5px); + @include S(margin-top, 3px); + @include S(width, 50px); + filter: invert(100%); + } } } @include S(padding, 15px); - $linkBg: #fdfdff; + $linkBg: rgba(#fdfdff, 0.5); $linkBgHover: darken($linkBg, 2); $linkColor: #55586a; @@ -737,11 +753,9 @@ grid-template-columns: 1fr auto; justify-content: center; + backdrop-filter: blur(5px); + background: $linkBg; - & { - /* @load-async */ - background: $linkBg uiResource("icons/link.png") top D(3px) right D(3px) / D(9px) no-repeat; - } @include S(padding, 5px); @include S(padding-left, 10px); @include S(border-radius, $globalBorderRadius); @@ -830,7 +844,7 @@ } @include DarkThemeOverride { - background: $darkModeGameBackground center center / cover !important; + background: rgba($darkModeGameBackground, 0.5) center center / cover !important; .mainContainer { background: $darkModeControlsBackground; @@ -861,19 +875,11 @@ .footer { > a, .sidelinks > a { - background-color: $darkModeControlsBackground; + background-color: rgba($darkModeControlsBackground, 0.3); color: #eee; &:hover { - background-color: darken($darkModeControlsBackground, 5); - } - } - - .author { - color: #bdbdbd; - - > a { - color: white; + background-color: rgba(darken($darkModeControlsBackground, 5), 0.5); } } diff --git a/src/css/variables.scss b/src/css/variables.scss index fe1fa864..3d991df5 100644 --- a/src/css/variables.scss +++ b/src/css/variables.scss @@ -1,4 +1,4 @@ -$globalBorderRadius: 2px; +$globalBorderRadius: 6px; // When to reduce control elements size for small devices $layoutExpandMinWidth: 340px; diff --git a/src/html/index.standalone.html b/src/html/index.standalone.html index cde8e595..9209c2fc 100644 --- a/src/html/index.standalone.html +++ b/src/html/index.standalone.html @@ -1,7 +1,7 @@
-If you want to play on your computer, you can also get the standalone on Steam:
+If you want to play on your computer, you can also get the game on Steam:
Get the shapez.io standalone! + }" class="standaloneLink" target="_blank">Get on Steam! `; } diff --git a/src/js/states/mods.js b/src/js/states/mods.js index 1e0fe5f1..b5601b03 100644 --- a/src/js/states/mods.js +++ b/src/js/states/mods.js @@ -47,7 +47,7 @@ export class ModsState extends TextualGameState {${T.mods.noModSupport}
- Get the shapez.io standalone! + Get on Steam! diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 0fa240be..e385c395 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -112,7 +112,7 @@ mainMenu: # This is shown when using firefox and other browsers which are not supported. browserWarning: >- - Sorry, but the game is known to run slowly on your browser! Get the standalone version or download Google Chrome for the full experience. + Sorry, but the game is known to run slowly on your browser! Get the full version or download Google Chrome for the full experience. savegameLevel: Level