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
17a184b0a7
fix: settle puzzle failures and profile tasks
2026-05-26 22:02:58 +08:00
4001ee0a5c
Add platform generation dialogs and task refresh
2026-05-26 19:40:23 +08:00
2d31e19791
hide frontend image model names
2026-05-26 17:37:40 +08:00
b388b124da
修改微信小程序登录按钮名称
2026-05-26 16:59:42 +08:00
kdletters
ba7abe01cc
Merge pull request 'fix: return draft results to shelf' ( #37 ) from codex/fix-draft-result-back-target into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/37
2026-05-26 16:54:39 +08:00
564fc01b37
test: align puzzle next-level expectation
2026-05-26 16:52:22 +08:00
5fb51f4430
Merge remote-tracking branch 'origin/master' into codex/fix-draft-result-back-target
2026-05-26 16:45:57 +08:00
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
kdletters
3909a1ef10
Merge pull request 'codex/public-work-readmodel-smooth-transition' ( #38 ) from codex/public-work-readmodel-smooth-transition into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/38
2026-05-26 16:40:14 +08:00
d50e69560b
Merge remote-tracking branch 'origin/master' into codex/public-work-readmodel-smooth-transition
2026-05-26 16:38:38 +08:00
aeee782fe0
Add public work read model and smooth puzzle transitions
2026-05-26 16:38:27 +08:00
abea7cec1d
feat: 平台错误与完成弹窗收口
2026-05-26 15:57:39 +08:00
2a031bcd89
fix: return draft results to shelf
2026-05-26 14:43:49 +08:00
fbda614156
feat: surface platform errors in copyable dialogs
2026-05-26 14:27:18 +08:00
44c65df5c9
refactor: extract platform media crates
2026-05-26 13:18:13 +08:00
wuxiangwanzi
ed0257ee2d
Merge branch 'codex/wooden-fish-template' into master
2026-05-26 02:44:28 +08:00
wuxiangwanzi
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
2d34004e64
架构优化计划书
2026-05-26 01:19:45 +08:00
wuxiangwanzi
f79a6ea81e
fix: stabilize match3d demo discovery
2026-05-26 00:13:08 +08:00
50f44489cd
修改环境配置
2026-05-25 23:17:42 +08:00
JenkenB
e0655db01e
Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative
2026-05-25 23:09:16 +08:00
JenkenB
19319df426
Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative
2026-05-25 23:09:07 +08:00
kdletters
545f315cbc
Switch miniprogram config to production domains
2026-05-25 23:02:53 +08:00
kdletters
15f1d134b0
Merge pull request 'codex/puzzle-runtime-url-restore' ( #36 ) from codex/puzzle-runtime-url-restore into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/36
2026-05-25 22:59:33 +08:00
JenkenB
5a6e68b6dc
1
2026-05-25 22:57:14 +08:00
kdletters
4b8e7cf4a5
merge: sync origin master into puzzle runtime restore
2026-05-25 22:57:07 +08:00
kdletters
eb6ab404e2
fix: restore puzzle runtime url state
2026-05-25 22:52:38 +08:00
kdletters
f4b84f0d54
Merge pull request 'codex/recommendation-login-modal-fix' ( #35 ) from codex/recommendation-login-modal-fix into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/35
2026-05-25 22:48:39 +08:00
kdletters
62a24bf0e5
fix: keep recommend runtime on local auth
2026-05-25 22:45:29 +08:00
kdletters
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
kdletters
abf24c0b9b
Merge pull request 'fix: split recommendation layouts by breakpoint' ( #34 ) from codex/recommendation-responsive-split into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/34
2026-05-25 21:54:10 +08:00
kdletters
cab5a5366d
Merge master into codex/recommendation-responsive-split
2026-05-25 21:53:38 +08:00
kdletters
485e0fe5d5
Merge branch 'master' into codex/recommendation-login-modal-fix
2026-05-25 21:52:15 +08:00
kdletters
e6e2d821a8
fix: remove recommend login gate
2026-05-25 21:52:05 +08:00
kdletters
ae66776fa9
fix: split recommendation layouts by breakpoint
2026-05-25 21:10:20 +08:00
kdletters
6d7c688fe3
chore(dev): enable password registration in local dev
2026-05-25 20:15:28 +08:00
kdletters
aa60c4a89c
Merge pull request 'fix: keep draft form on mud-point failure' ( #33 ) from codex/mud-point-modal-keep-form into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/33
2026-05-25 20:02:30 +08:00
220119ae54
fix: keep draft form on mud-point failure
2026-05-25 20:01:08 +08:00
42065e0f4f
docs: enforce play-type integration skill
2026-05-25 19:31:00 +08:00
kdletters
080694fb46
refactor: extract platform image provider
2026-05-25 19:03:43 +08:00
kdletters
0ffbea67fd
添加codex环境配置
2026-05-25 17:47:42 +08:00
kdletters
bdb81466ce
fix: prefer localhost git checkout for web build
2026-05-25 15:46:04 +08:00
kdletters
3ddf603829
Merge pull request 'feat: 统一推荐页匿名游玩的 Runtime Guest 认证' ( #32 ) from feat/recommend-runtime-guest into master
...
Reviewed-on: https://git.genarrative.world/GenarrativeAI/Genarrative/pulls/32
2026-05-25 14:17:53 +08:00
5859d738a0
Merge remote-tracking branch 'origin/master' into feat/recommend-runtime-guest
...
# Conflicts:
# docs/【玩法创作】平台入口与玩法链路-2026-05-15.md
2026-05-25 14:12:39 +08:00
c1dcf074bb
feat: unify recommend anonymous runtime guest auth
...
- Route recommended runtime launches through shared runtime guest token handling
- Extend recommend-page anonymous play beyond jump-hop
- Add regression coverage for runtime guest launch clients
- Update docs to reflect the full anonymous-play matrix
2026-05-25 14:03:38 +08:00
JenkenB
30cf8abbf7
Merge branch 'codex/profile-mobile-ui-reference'
2026-05-25 01:41:05 +08:00
JenkenB
50a0d6f982
Refine creation tab UX, generation flow, and bindings
...
Large changes across frontend, backend and docs to align creation-tab and generation-page behavior with new product UI/UX and Spacetime bindings. Updated hermes decision-log and pitfalls with concrete rules (banner carousel, font sizing, unread-dot tokens, template-card layout, direct card->entry routing, separation of account balance vs prize pools, removal of global page card shell, generation progress milestones and unified circular progress, and background video handling). Added GenerationProgressHero component and media assets, plus generation-related UI/tests updates (CustomWorldGenerationView, BarkBattleGeneratingView, creation hub/cards, platform entry routing, index tests). Backend and contract updates include new category fields in admin API types and admin UI form/list, spacetime-client/module/migration changes and generated bindings script. Misc: many tests adjusted, new docs and plan files added, and several server-rs crate changes to support the updated creation/ generation workflows.
2026-05-25 00:41:30 +08:00
wuxiangwanzi
5d3e2ac111
Merge remote-tracking branch 'origin/master' into codex/wooden-fish-template
2026-05-24 20:35:32 +08:00
wuxiangwanzi
838c74d8fe
feat: 完善敲木鱼结果页元信息补录
2026-05-24 20:34:36 +08:00
kdletters
kdletters
wuxiangwanzi
JenkenB