Commit Graph

899 Commits

Author SHA1 Message Date
SpikeHD
41077c32b7 merge fixes 2022-06-03 17:58:19 -07:00
SpikeHD
aa3048fbd5 Merge branch 'main' of https://github.com/Grasscutters/Cultivation into main 2022-06-03 17:57:32 -07:00
SpikeHD
97b2f8a616 fix derived state 2022-06-03 17:57:26 -07:00
SpikeHD
bbff2e51c7 remove derivedStateFromProps 2022-06-03 17:26:12 -07:00
SpikeHD
1ac4fd5a63 partial default theme safeguard 2022-06-03 16:59:37 -07:00
SpikeHD
8d8b617198 working theming 2022-06-02 19:03:32 -07:00
SpikeHD
e3aade7955 get themes backend fn 2022-06-02 18:14:31 -07:00
SpikeHD
fac061a13f get theme list frontend fn 2022-06-02 18:02:15 -07:00
SpikeHD
28d9b89686 pass theme 2022-06-02 17:48:42 -07:00
SpikeHD
cdd15123dc begin theme scaffolding 2022-06-02 17:37:01 -07:00
SpikeHD
c7b3f5491c fix remote img hosts 2022-06-02 17:16:34 -07:00
SpikeHD
203c45c5ef fix invalid file paths 2022-06-02 17:06:25 -07:00
SpikeHD
5acd9b54d0 custom clear function 2022-06-02 17:04:20 -07:00
KingRainbow44
476f9b9c94 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/ui/App.tsx
2022-06-02 19:48:32 -04:00
KingRainbow44
b16104963c Use the Grasscutter API to get the background file 2022-06-02 19:47:55 -04:00
SpikeHD
5aaa85939c new bg 2022-06-02 16:46:57 -07:00
SpikeHD
91581f620a alert when game is not found 2022-06-01 22:17:58 -07:00
SpikeHD
adb4b94585 resource button is enabled after repo download 2022-06-01 22:15:10 -07:00
SpikeHD
7de67e9c42 right bar extension 2022-06-01 20:03:45 -07:00
SpikeHD
3611cf1a15 bg changes 2022-06-01 19:31:43 -07:00
SpikeHD
e71ca9ff40 validate url backgrounds 2022-06-01 19:20:43 -07:00
SpikeHD
fe48eb3c67 remove logging 2022-06-01 19:04:36 -07:00
SpikeHD
54d400d67b differ between URL and file custom bg 2022-06-01 19:04:21 -07:00
SpikeHD
c1973a2d2e reload launcher on bg set 2022-06-01 18:59:33 -07:00
SpikeHD
aedd7ecf3c proper setting and getting local files 2022-06-01 18:52:32 -07:00
SpikeHD
a1f768140d fix bg file path not showing 2022-06-01 18:13:25 -07:00
SpikeHD
53f42be967 move image files to local bg folder 2022-06-01 18:08:50 -07:00
SpikeHD
da6d05c7d0 fixes 2022-06-01 17:49:10 -07:00
SpikeHD
7d0326dcdf fix background 2022-06-01 17:44:53 -07:00
SpikeHD
ecd4bff882 get language despite admin or not 2022-06-01 17:40:24 -07:00
KingRainbow44
174a990c40 QoL changes & code formatting 2022-06-01 17:28:48 -04:00
KingRainbow44
2d2cf82751 Implement semi-working custom backgrounds 2022-06-01 17:28:07 -04:00
KingRainbow44
2d77d74d3a Update UNIX command for installing certificates 2022-05-30 01:41:27 -04:00
KingRainbow44
643799441f Merge remote-tracking branch 'origin/main' 2022-05-30 01:39:32 -04:00
KingRainbow44
aa5cc334ef Fix certificate issue & rustc warning 2022-05-30 01:39:21 -04:00
KingRainbow44
9e9aff93e9 Update testing environment 2022-05-30 01:38:54 -04:00
KingRainbow44
efca152539 Remove pre-generated certificates 2022-05-30 01:38:00 -04:00
SpikeHD
28c5581215 minimize/maximize on game open/close 2022-05-29 22:30:10 -07:00
SpikeHD
92f51cc306 do not show prog bar when not downloading 2022-05-29 22:04:17 -07:00
SpikeHD
6f5ed86f03 cert path fix 2022-05-29 21:14:31 -07:00
SpikeHD
95691d8c27 fix certpath arg 2022-05-29 21:10:38 -07:00
SpikeHD
e99bea7a15 dynamically read cert and priv key 2022-05-29 19:44:54 -07:00
KingRainbow44
2e90635ba5 Use generated certificate 2022-05-29 22:27:04 -04:00
KingRainbow44
1b945253b6 Merge remote-tracking branch 'origin/main' 2022-05-29 21:54:53 -04:00
KingRainbow44
bc438e3dca stop complaining my god 2022-05-29 21:53:54 -04:00
SpikeHD
2e53ac4615 fix errors on first launch due to async dir creation 2022-05-29 18:34:53 -07:00
SpikeHD
13e84d50fa set last connection defaults 2022-05-29 18:27:48 -07:00
SpikeHD
7cfd41f9b0 proper last connection autofill 2022-05-29 18:25:26 -07:00
SpikeHD
c15e82b30a Merge branches 'main' and 'main' of https://github.com/Grasscutters/Cultivation into main 2022-05-29 17:31:18 -07:00
SpikeHD
f1ad0b2565 fix scripts 2022-05-28 21:25:37 -07:00