From bbb418a1d807fb73a14061f5b403df9867e5433a Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 2 Jun 2022 19:44:50 +0200 Subject: [PATCH] v1.5.2 --- electron/package.json | 2 +- electron/yarn.lock | 18 ++++++++-------- res/ui/cursor.png | Bin 0 -> 1811 bytes src/css/common.scss | 4 ++-- src/css/ingame_hud/buildings_toolbar.scss | 18 +++++++++++----- src/css/ingame_hud/dialogs.scss | 3 +++ src/css/ingame_hud/shop.scss | 8 +++++++- src/css/states/keybindings.scss | 3 ++- src/css/states/main_menu.scss | 24 ++++++++++++++-------- src/css/states/mods.scss | 6 +++--- src/css/states/preload.scss | 8 +++++--- src/css/variables.scss | 4 ++-- src/js/changelog.js | 13 ++++++++++++ src/js/game/hud/parts/shop.js | 4 ++-- src/js/states/main_menu.js | 7 +++---- translations/base-en.yaml | 4 ++-- version | 2 +- 17 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 res/ui/cursor.png diff --git a/electron/package.json b/electron/package.json index a0b97f6f..442113ed 100644 --- a/electron/package.json +++ b/electron/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "async-lock": "^1.2.8", - "electron": "16.0.7", + "electron": "18.3.0", "electron-window-state": "^5.0.3" } } diff --git a/electron/yarn.lock b/electron/yarn.lock index 626235de..72ab7701 100644 --- a/electron/yarn.lock +++ b/electron/yarn.lock @@ -30,10 +30,10 @@ dependencies: defer-to-connect "^1.0.1" -"@types/node@^14.6.2": - version "14.18.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.5.tgz#0dd636fe7b2c6055cbed0d4ca3b7fb540f130a96" - integrity sha512-LMy+vDDcQR48EZdEx5wRX1q/sEl6NdGuHXPnfeL8ixkwCOSZ2qnIyIZmcCbdX0MeRqHhAcHmX+haCbrS8Run+A== +"@types/node@^16.11.26": + version "16.11.38" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.38.tgz#be0edd097b23eace6c471c525a74b3f98803017f" + integrity sha512-hjO/0K140An3GWDw2HJfq7gko3wWeznbjXgg+rzPdVzhe198hp4x2i1dgveAOEiFKd8sOilAxzoSJiVv5P/CUg== async-lock@^1.2.8: version "1.2.8" @@ -149,13 +149,13 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@16.0.7: - version "16.0.7" - resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" - integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== +electron@18.3.0: + version "18.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.0.tgz#43de95979341e63f1b209c569a0ad148d98ae5b7" + integrity sha512-2+pAUIViVvFOGE5mJKKi8F6ruyvQrcqdfsm/AUfz+6P05vbvR5ZsR6WBkr90mlyojHW5w/nAVX9ZSOtz3aHs4A== dependencies: "@electron/get" "^1.13.0" - "@types/node" "^14.6.2" + "@types/node" "^16.11.26" extract-zip "^1.0.3" encodeurl@^1.0.2: diff --git a/res/ui/cursor.png b/res/ui/cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..6d2514e4cfe64817d2d8b9a6986f298eda80c5b5 GIT binary patch literal 1811 zcmeAS@N?(olHy`uVBq!ia0vp^qCl*`!3HG%E->x@Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?{;ELn2Bde0{8v^K6{VzE1-ZCEEd%mwl`=|73as?? z%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8& zOv*1Uu~h;(72=270=Thx#n5m9hM0auVu8M)o&m^DFonLp_?717!c`ZS1f?R}i`C%b zkjjEo{h-w1{L-RiV9cc{gRCmBaxO|uEXgkl$lGdFN`c6D*IFvac`h~5<3ZZX5@7JZ;&^g(fp6xT2zU;+X$;Yk8LY*Qxw1L z)Gtb6Io)zv6`R#JidRp_dgOkjf8Jh|u6dUd1Y3oA?u$i5uQl;i?KF*7^L_MfZ(^Be zc(13-kI6U9jrZ4ne)e{@fTKVj$MW0GK?%kZJT2ZTLg6mWN0S!rXQ+FVU;ivu$i4|vqq?`Ls)&dvCFVSvZX%p3RasfDec z`Yqle`PuZ!N-o2vPmcBW@^Z;ZNiE9xaBY_OmpzOu$r5et?WzUq7CzX_yKe2;K!a`9 zu3eksd@$A|v9xq54-ZerhdE9MpKhAF*{Lv7W82rSrCf57k~;;?JS|=&!NqbrXWNrQV=`dncXH1|Nxgz7V*Q6>f=5fk0q-Hks-lxt?B$#o}O5NkPp<~g^P zrlz8)sj17-pot+`uDQX%!76k89C@C-I#q4F zT|dI-J?A`LsJS(2Zri^^qnTfHbanUIi+6>3t*HqO4Hc2$Yxk_KwqCn)qK68@?X8DD z#0Ri^k>0}3HNP_8?%lg0FTPe4DrM&7O*^KhuKx0UZHBL}FXxLo_PtmzgQ}!O!L8*Q(5Uck`|v*t1%}bOpx}mAP~0UVr-CIOi`fj~%1! ztG91!b#HZdcdHs4SfMM|Z$CBuB3BJ}&fC1o%AJm@ug*$1U0t{TKKEmL$Kx|RH*em2 zZPTVr)nC7UW%*T77#k})bN1}TwcBs6ZSwK-{BFlqR$gvyV{gCT*v#x1i^8#V_Akw{ z2N+vU9Mp5-3e=j)Vl!pW>J=+iOsW5!IZeo}Y|?#)xUyLp_Os^A``0m9T1v_zH&^#; zc*lMg#`JFooLgnOZrh|hU=HYb8ZYE8+;#llp+ih(m-^f|bLPzLW5?Y79yxNvbJ=pP z4pT#^-XCHgeVJCzX4)*?m^W?Ov{%+vR`X{1EMxaue%aQ}?%k)KHPHs&T3a=>)-An| z!+YRI`eUgVd>-7pj<)@I!+nVPXww9Ng*!#22!C7pz)7_GD<^mOgjTJe_xJM8i(wIs psOi7)NQuoh&1+M7=IQ?|5)6mRS? .boxLink { diff --git a/src/css/states/mods.scss b/src/css/states/mods.scss index acec41fb..e09391f8 100644 --- a/src/css/states/mods.scss +++ b/src/css/states/mods.scss @@ -92,7 +92,7 @@ .mod { @include S(border-radius, $globalBorderRadius); - background: $accentColorBright; + background: #eeeff4; @include S(margin-bottom, 4px); @include S(padding, 7px, 10px); @include S(grid-gap, 15px); @@ -113,14 +113,14 @@ flex-direction: column; .description { - @include SuperSmallText; + @include PlainText; @include S(margin-top, 5px); color: $accentColorDark; } .website { text-transform: uppercase; align-self: start; - @include SuperSmallText; + @include PlainText; @include S(margin-top, 5px); } } diff --git a/src/css/states/preload.scss b/src/css/states/preload.scss index 2e14abd6..7acb5bba 100644 --- a/src/css/states/preload.scss +++ b/src/css/states/preload.scss @@ -7,14 +7,15 @@ } .changelogDialogEntry { - margin-top: 10px; + @include S(margin-top, 10px); + width: 100%; flex-direction: column; text-align: left; padding: 10px; box-sizing: border-box; background: #eef1f4; - @include S(border-radius, 3px); + @include S(border-radius, $globalBorderRadius); @include DarkThemeOverride { background: #33343c; @@ -34,6 +35,7 @@ .changes { @include PlainText; @include S(padding-left, 15px); + @include S(margin-top, 10px); strong { background: $colorBlueBright; color: #fff; @@ -46,7 +48,7 @@ } li { @include SuperSmallText; - @include S(margin-bottom, 10px); + @include S(margin-bottom, 5px); } } } diff --git a/src/css/variables.scss b/src/css/variables.scss index 3d991df5..e041c6e4 100644 --- a/src/css/variables.scss +++ b/src/css/variables.scss @@ -37,7 +37,7 @@ $colorBlueBright: rgb(74, 151, 223); $colorRedBright: #ef5072; $colorOrangeBright: #ef9d50; $themeColor: #393747; -$ingameHudBg: rgba(#333438, 0.9); +$ingameHudBg: rgba(#33343b, 0.9); $modsColor: rgb(214, 60, 228); $text3dColor: #f4ffff; @@ -69,7 +69,7 @@ $numberFont: $mainFont; $textFont: $mainFont; $mainFontWeight: 400; -$mainFontSpacing: 0.04em; +$mainFontSpacing: 0.01em; $mainFontScale: 1; @mixin DebugText($color) { diff --git a/src/js/changelog.js b/src/js/changelog.js index 6640dd9e..3a05e3e2 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,4 +1,17 @@ export const CHANGELOG = [ + { + version: "1.5.2", + date: "02.06.2022", + entries: [ + "Attempted to fix the 'vram glitch', where the map background would not redraw anymore, especially in fullscreen. If the issue still persists, please let me know in the discord server!", + "The game has been renamed from 'shapez.io' to 'shapez', since it is not really an .io game", + "Various performance improvements", + "Upgrades should now show the full precision", + "UI Polishing & Cleanup", + "Updated translations", + "PS: We are already working on shapez 2, more information will follow in the discord soon!", + ], + }, { version: "1.5.1", date: "25.02.2022", diff --git a/src/js/game/hud/parts/shop.js b/src/js/game/hud/parts/shop.js index 4b353bd3..70f7fa25 100644 --- a/src/js/game/hud/parts/shop.js +++ b/src/js/game/hud/parts/shop.js @@ -98,8 +98,8 @@ export class HUDShop extends BaseHUDPart { // Set description handle.elemDescription.innerText = T.shopUpgrades[upgradeId].description - .replace("", formatBigNumber(currentTierMultiplier)) - .replace("", formatBigNumber(currentTierMultiplier + tierHandle.improvement)); + .replace("", currentTierMultiplier.toFixed(2)) + .replace("", (currentTierMultiplier + tierHandle.improvement).toFixed(2)); tierHandle.required.forEach(({ shape, amount }) => { const container = makeDiv(handle.elemRequirements, null, ["requirement"]); diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 1d120e1f..adcecd79 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -227,10 +227,9 @@ export class MainMenuState extends GameState { ${showExternalLinks ? `${T.mainMenu.helpTranslate}` : ""} -
${T.mainMenu.madeBy.replace( - "", - `` - )}
+
+ +
${ diff --git a/translations/base-en.yaml b/translations/base-en.yaml index e385c395..1403bf0b 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -1110,7 +1110,7 @@ mods: browseMods: Browse Mods modsInfo: >- - To install and manage mods, copy them to the mods folder within the game directory. You can also use the 'Open Mods Folder' button on the top right. + To install and manage mods, copy them to the mods folder (use the 'Open Mods Folder' button). Be sure to restart the game afterwards, otherwise the mods will not show up. noModSupport: You need the full version on Steam to install mods. togglingComingSoon: @@ -1229,7 +1229,7 @@ settings: title: Tick Rate description: >- This determines how many game ticks happen per second. In general, a higher tick rate means better precision but also worse performance. On lower tickrates, the throughput may not be - exact. + exact. Anything above 60 Hz is expected to be laggy! alwaysMultiplace: title: Multiplace diff --git a/version b/version index 8e03717d..a73b4325 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.5.1 \ No newline at end of file +1.5.2 \ No newline at end of file