Commit Graph

563 Commits

Author SHA1 Message Date
7fd49cd8be Merge pull request 'fix: remove fixed match3d demo' (#41) from codex/remove-match3d-static-demo into master
Reviewed-on: #41
2026-05-27 01:05:17 +08:00
dae46eab52 Merge branch 'master' into codex/remove-match3d-static-demo 2026-05-27 01:03:48 +08:00
kdletters
2411eb6513 fix: remove fixed match3d demo 2026-05-27 00:57:28 +08:00
927dcf5664 Sync local updates with origin/master 2026-05-26 23:00:08 +08:00
6b9c0fb3db Merge pull request 'codex/frontend-error-dialogs' (#40) from codex/frontend-error-dialogs into master
Reviewed-on: #40
2026-05-26 22:28:57 +08:00
kdletters
54683cb3ac Merge branch 'master' into codex/frontend-error-dialogs
# Conflicts:
#	.hermes/shared-memory/decision-log.md
#	server-rs/crates/api-server/src/generated_asset_sheets.rs
2026-05-26 22:10:41 +08:00
kdletters
17a184b0a7 fix: settle puzzle failures and profile tasks 2026-05-26 22:02:58 +08:00
a2972839cc Merge pull request 'codex/wechat-mini-program-auth-flow' (#39) from codex/wechat-mini-program-auth-flow into master
Reviewed-on: #39
2026-05-26 20:17:59 +08:00
kdletters
4edf76488c Merge remote-tracking branch 'origin/master' into codex/wechat-mini-program-auth-flow 2026-05-26 20:00:12 +08:00
kdletters
296a7fced9 fix: defer mini program phone auth until login 2026-05-26 19:59:14 +08:00
kdletters
4001ee0a5c Add platform generation dialogs and task refresh 2026-05-26 19:40:23 +08:00
kdletters
2d31e19791 hide frontend image model names 2026-05-26 17:37:40 +08:00
kdletters
b388b124da 修改微信小程序登录按钮名称 2026-05-26 16:59:42 +08:00
ba7abe01cc Merge pull request 'fix: return draft results to shelf' (#37) from codex/fix-draft-result-back-target into master
Reviewed-on: #37
2026-05-26 16:54:39 +08:00
kdletters
564fc01b37 test: align puzzle next-level expectation 2026-05-26 16:52:22 +08:00
kdletters
5fb51f4430 Merge remote-tracking branch 'origin/master' into codex/fix-draft-result-back-target 2026-05-26 16:45:57 +08:00
kdletters
4e14301b33 Merge remote-tracking branch 'origin/master' into codex/fix-draft-result-back-target
# Conflicts:
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
2026-05-26 16:43:30 +08:00
3909a1ef10 Merge pull request 'codex/public-work-readmodel-smooth-transition' (#38) from codex/public-work-readmodel-smooth-transition into master
Reviewed-on: #38
2026-05-26 16:40:14 +08:00
kdletters
d50e69560b Merge remote-tracking branch 'origin/master' into codex/public-work-readmodel-smooth-transition 2026-05-26 16:38:38 +08:00
kdletters
aeee782fe0 Add public work read model and smooth puzzle transitions 2026-05-26 16:38:27 +08:00
kdletters
abea7cec1d feat: 平台错误与完成弹窗收口 2026-05-26 15:57:39 +08:00
kdletters
2a031bcd89 fix: return draft results to shelf 2026-05-26 14:43:49 +08:00
kdletters
fbda614156 feat: surface platform errors in copyable dialogs 2026-05-26 14:27:18 +08:00
kdletters
44c65df5c9 refactor: extract platform media crates 2026-05-26 13:18:13 +08:00
ed0257ee2d Merge branch 'codex/wooden-fish-template' into master 2026-05-26 02:44:28 +08:00
288215285e Merge remote-tracking branch 'origin/master' into codex/wooden-fish-template
# Conflicts:
#	.hermes/shared-memory/decision-log.md
#	.hermes/shared-memory/pitfalls.md
#	docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md
#	src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
2026-05-26 02:00:11 +08:00
kdletters
2d34004e64 架构优化计划书 2026-05-26 01:19:45 +08:00
f79a6ea81e fix: stabilize match3d demo discovery 2026-05-26 00:13:08 +08:00
kdletters
50f44489cd 修改环境配置 2026-05-25 23:17:42 +08:00
e0655db01e Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative 2026-05-25 23:09:16 +08:00
19319df426 Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative 2026-05-25 23:09:07 +08:00
545f315cbc Switch miniprogram config to production domains 2026-05-25 23:02:53 +08:00
15f1d134b0 Merge pull request 'codex/puzzle-runtime-url-restore' (#36) from codex/puzzle-runtime-url-restore into master
Reviewed-on: #36
2026-05-25 22:59:33 +08:00
5a6e68b6dc 1 2026-05-25 22:57:14 +08:00
4b8e7cf4a5 merge: sync origin master into puzzle runtime restore 2026-05-25 22:57:07 +08:00
eb6ab404e2 fix: restore puzzle runtime url state 2026-05-25 22:52:38 +08:00
f4b84f0d54 Merge pull request 'codex/recommendation-login-modal-fix' (#35) from codex/recommendation-login-modal-fix into master
Reviewed-on: #35
2026-05-25 22:48:39 +08:00
62a24bf0e5 fix: keep recommend runtime on local auth 2026-05-25 22:45:29 +08:00
21d95a18d3 Merge remote-tracking branch 'origin/master' into codex/recommendation-login-modal-fix
# Conflicts:
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
#	src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx
2026-05-25 22:01:03 +08:00
abf24c0b9b Merge pull request 'fix: split recommendation layouts by breakpoint' (#34) from codex/recommendation-responsive-split into master
Reviewed-on: #34
2026-05-25 21:54:10 +08:00
cab5a5366d Merge master into codex/recommendation-responsive-split 2026-05-25 21:53:38 +08:00
485e0fe5d5 Merge branch 'master' into codex/recommendation-login-modal-fix 2026-05-25 21:52:15 +08:00
e6e2d821a8 fix: remove recommend login gate 2026-05-25 21:52:05 +08:00
ae66776fa9 fix: split recommendation layouts by breakpoint 2026-05-25 21:10:20 +08:00
6d7c688fe3 chore(dev): enable password registration in local dev 2026-05-25 20:15:28 +08:00
aa60c4a89c Merge pull request 'fix: keep draft form on mud-point failure' (#33) from codex/mud-point-modal-keep-form into master
Reviewed-on: #33
2026-05-25 20:02:30 +08:00
kdletters
220119ae54 fix: keep draft form on mud-point failure 2026-05-25 20:01:08 +08:00
kdletters
42065e0f4f docs: enforce play-type integration skill 2026-05-25 19:31:00 +08:00
080694fb46 refactor: extract platform image provider 2026-05-25 19:03:43 +08:00
0ffbea67fd 添加codex环境配置 2026-05-25 17:47:42 +08:00