feature/slay-deck-controller #14

Merged

gahusb merged 8 commits from feature/slay-deck-controller into main 2026-06-09 13:39:17 +09:00

Conversation 0 Commits 8 Files Changed 20 +3195 -1948

gahusb commented 2026-06-09 02:45:05 +09:00

Owner

Copy Link

No description provided.

gahusb added 7 commits 2026-06-09 02:45:05 +09:00

Add main menu flow 8c397cbc09

Fix generated UI GUIDs 8eab9a75ac

Freeze monsters for turn combat a9926feea3

Avoid client state transition for monsters 913b4f1721

Disable monster patrol movement 1299d718e2

Fix turn combat facing and player movement 27818e92c7

Merge pull request 'Add main menu flow' (#7) from feature/main-menu into feature/slay-deck-controller ... 14449373e0

Reviewed-on: #7

gahusb added 1 commit 2026-06-09 13:29:39 +09:00

Merge main into feature/slay-deck-controller — B~E6a 카드시스템 통합 + 메인 메뉴 이식 ... 861442e2c1

main의 35커밋(B 전투통합~E6a 멀티act)을 브랜치에 통합. 충돌 해결:
- tools/gen-slaydeck.mjs: main(B~E6a) 생성기 채택 + 브랜치 메인 메뉴(MainMenu UI·ShowMainMenu/BindMenuButtons/StartNewGame/SetEntityEnabled·OnBeginPlay→메뉴) 이식
- ui/DefaultGroup.ui·SlayDeckController.codeblock: 통합 생성기로 재생성
- map10·모델: main 채택 후 freeze 도구(freeze-turn-monsters/player) 재적용
정적 검증: 문법·JSON 유효·생성기 결정적·메뉴/B~E6a 양쪽 유지·freeze 적용.
⚠️ Maker 연결 해제로 메뉴→게임 런타임 검증은 미수행(사용자 메이커 확인 필요).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

gahusb merged commit 971539a72f into main 2026-06-09 13:39:17 +09:00

gahusb referenced this issue from a commit 2026-06-09 13:39:20 +09:00

Merge pull request 'feature/slay-deck-controller' (#14) from feature/slay-deck-controller into main

gahusb deleted branch feature/slay-deck-controller 2026-06-09 13:39:26 +09:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

maple gahusb

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: gahusb/maplecontest#14