Commit Graph

641 Commits

Author SHA1 Message Date
Andrei Andreev
3299be8b44 Nuke .DS_Store files 2023-02-14 12:02:26 +01:00
ZackRhodes
7b2fd1be71 Merge branch 'master' into Steam-Webpack 2023-02-12 17:00:18 -05:00
ZackRhodes
b4c5fa664d Remove comments for easier transfer 2023-02-12 16:58:26 -05:00
SpectralFlame
de2f9c3b68 Merge branch 'master' into amoled-theme 2023-02-11 09:29:16 -06:00
SpectralFlame
4916ea566e Fix some invisible borders in AMOLED themes 2023-02-11 09:26:40 -06:00
SpectralFlame
ea4f187982 Various styling and layout improvements/fixes 2023-02-07 16:11:38 -06:00
Dys
7e717b8de2
S12 theme PR (#3285)
* Base of S12 theme

* Add taskbar (no subtab switching yet) for S12

* Add s12 support for old UI

* Add subtab switching support to s12

* Make S12 subtabs properly blur the background

* Add minimisation functionality

* Add images for all tabs in s12

* Move Fixed UI components into another file S12

* Style Modals for S12

* Fix bugs with S12 in the glyph cosmetic modal

* Add a245 message for S12

* Add desktop icons to s12

* Address PR feedback (S12 theme)

- Remove a bunch of debug statements
- Make image size smaller where needed
- Fix a bug with news disabled
- Fix end credits modal colours

* Add a games modal to S12

* Fix stray bugs with modal handling in S12

* Fix colouring and positioning of credits display on S12

* Fix S12 bugs (thanks hira)

* Fix S12 glyph tooltip bug
2023-02-04 19:52:59 +08:00
Hirame1
7d5214d3d6 Another fix for the classic ui
and delete unnecessary rule in styles.css
2023-01-30 22:11:43 +07:00
Hirame1
395f7c0368 Attempted to fix cramped spacing
Font file update might do nothing, but just in case.
2023-01-30 22:11:43 +07:00
Hirame1
4f6578cd5e Blobfont in color :blobheart: 2023-01-30 22:11:43 +07:00
Dys
922cc37418 Fix options dropdown being blurry 2023-01-30 06:41:00 -06:00
ZackRhodes
9e5ca39ec0 Merge remote-tracking branch 'origin/release' into Steam-Webpack 2023-01-27 08:59:00 -05:00
Dys
392a2934b0
Add "Respec and load" option (#3270)
* Add rudimentary "Eternity and load" function to studystringmodal

* Add "Eternity and load" Button to tt shop

* Make it clearer when eternity and load option won't eternity

* make StudyStringPreview more accurate for eternity and load

* Fix eternity and load bug

* Rename "eternity and load" to "respec and load"

* Address PR feedback (Respec and load)
2023-01-17 13:22:59 +08:00
SpectralFlame
3a9c2519a5 Some various layout adjustments 2023-01-16 12:45:48 -06:00
ZackRhodes
569a53043c Discord Rich Presence 2023-01-10 18:25:33 -04:00
ZackRhodes
121ac0648e Adjust Rich Presence 2023-01-10 15:08:09 -04:00
Hirame1
2afc8a2855 Fix Autobuyer dropdown hover color in Classic UI 2023-01-02 20:20:59 +07:00
Hirame1
41ceb497a5 Fix Autobuyer dropdown color in Classic UI 2023-01-02 19:37:36 +07:00
Hirame1
e075f25998 Fix ID/TD tab header color in Classic UI 2023-01-02 19:22:11 +07:00
ZackRhodes
cc878cab43 News Change and Client Side Discord Calls 2022-12-29 14:49:21 -05:00
ZackRhodes
7872ded621 Merge remote-tracking branch 'origin/release' into Steam-Webpack 2022-12-21 17:15:56 -05:00
SpectralFlame
66525825a8 Rollback some styling changes, shorten Telemechanical text 2022-12-21 07:12:55 -06:00
SpectralFlame
efaa057ec3 Widen reality upgrade buttons and fix text 2022-12-21 07:12:55 -06:00
ZackRhodes
cfc07f3d7a Add Zooming 2022-12-20 15:43:03 -05:00
Dys
efc91e08b0 Fix some elements not showing up correctly in AMOLED 2022-12-20 23:13:20 +08:00
Dys
d0037666a2 Create AMOLED theme base 2022-12-20 22:35:22 +08:00
Andrei Andreev
4a024c3ae9 Merge branch 'master' into Steam-Webpack
# Conflicts:
#	javascripts/core/app/options.js
#	javascripts/core/secret-formula/shop-purchases.js
#	src/components/tabs/shop/ShopTab.vue
2022-12-20 00:49:08 +01:00
SpectralFlame
c8e6e66778 Make dimension tab stripes properly colored 2022-12-19 11:10:15 -06:00
SpectralFlame
4f2df11ddf Use Modern-Default color for Classic-Dark unpurchasable buttons 2022-12-18 15:05:01 -06:00
SpectralFlame
3955cb5557 Make unpurchased reality upgrade appearance theme-independent 2022-12-18 15:05:01 -06:00
ZackRhodes
14252d0818 Fix old Ui scaling 2022-12-18 13:25:10 -05:00
ZackRhodes
675078f167 Merge branch 'master' into Steam-Webpack 2022-12-17 16:25:02 -05:00
L4R5W
2ce8fc82a3
lars does first misc adjustements (#3246)
Hello :blobwave:
2022-12-17 20:01:07 +01:00
ZackRhodes
7b1dd16871 Cloud Fixes 2022-12-17 01:04:40 -05:00
ZackRhodes
67a278147a Merge branch 'master' into Steam-Webpack 2022-12-16 23:54:14 -05:00
SpectralFlame
8fdd659c50 Fix #3236 2022-12-16 08:58:01 -06:00
ZackRhodes
e643f4958c Last Day Cleanup 1 2022-12-16 09:46:28 -05:00
SpectralFlame
236316b6e1 Fix #3234 2022-12-16 05:16:52 -06:00
Omsi
d66465d52f fix h2p modal text overflow when not enough screen height 2022-12-16 05:16:35 -06:00
Omsi
c0090ac13d remove prestige button box shadows from non-default metro themes 2022-12-16 05:16:35 -06:00
Omsi
227747fce5 fix alignment of reality button info tooltip across themes 2022-12-16 05:16:35 -06:00
Omsi
d06e22401d fix cursed glyph coloring in certain cases, fix white outline on reality glyph name in tooltip when dark 2022-12-16 05:16:35 -06:00
ZackRhodes
f683c06c38 Add Cosmetic Purchasing 2022-12-11 16:51:10 -05:00
ZackRhodes
1fcc61a4dc Post Merge 2022-12-10 15:48:20 -05:00
ZackRhodes
2ed9a46e47 Merge branch 'master' into Steam-Webpack 2022-12-10 13:45:09 -05:00
ZackRhodes
0c55efcf0c Slight alteration 2022-12-10 13:42:58 -05:00
SpectralFlame
e135dca54b Modify end screen handling to allow cosmetic modal 2022-12-10 05:22:38 -06:00
ZackRhodes
3b303dc129 Playfab Shop Handling 2022-12-09 23:32:16 -05:00
ZackRhodes
9a272cc7b1 Revert "Nullify all playfab references"
This reverts commit 9b62b65d0e.
2022-12-09 18:44:58 -05:00
ZackRhodes
342ba53ee5 Reintegrate Playfab Files 2022-12-09 18:44:42 -05:00