Compare commits
merge into: shmup:main
shmup:main
shmup:feat/room-contents-line
shmup:fix/player-cleanup-on-disconnect
shmup:fix-msdp-negotiation-and-help-client
shmup:fix-portal-type-narrowing
shmup:phase-7-gmcp-rich-client
shmup:phase-6-multizone-content-building
shmup:phase-5-verbs-interaction
shmup:phase-4-containers-portals
shmup:phase-3-things-inventory
shmup:phase-2-zones-migration
shmup:phase-1-object-foundation
shmup:roadmap
shmup:object-model-doc
shmup:prompt-system
shmup:fix/embedded-if-read-char
shmup:normalize-if-prompt
shmup:zmachine-compatibility
shmup:restore_undo
shmup:fix/read-char-optional-args
shmup:study-mojozork
shmup:fix/suppress-upper-window-writes
shmup:fix/if-bugs
shmup:v5-support
shmup:fix/zmachine-restore-stack
shmup:wire-embedded-zmachine-to-mud
shmup:zmachine-save-restore
shmup:zmachine-zork1-integration
shmup:hybrid-zmachine-interpreter
shmup:if-opcode-tracing
shmup:fix-if-terminal-formatting
shmup:if-terminal
shmup:speed-up-if-reads
shmup:containerize
shmup:research-if
shmup:add-fightable-mobs
shmup:add-rest-and-fix-prefix-matching
shmup:reload-and-toml-descriptions
shmup:prefix-matching-and-help
shmup:commands-and-editor-wiring
shmup:improve-combat
shmup:fix-combat
shmup:design/things-and-building
shmup:editor-mode
shmup:speedup-tests
shmup:ansi-color-depth
shmup:fix-player-data-typing
shmup:persistence
shmup:combat-as-content
shmup:map-editor
shmup:entity-model
shmup:content-loading
shmup:restructure
shmup:world-cache
shmup:flying
shmup:movement
shmup:worldgen
...
pull from: shmup:main
shmup:main
shmup:feat/room-contents-line
shmup:fix/player-cleanup-on-disconnect
shmup:fix-msdp-negotiation-and-help-client
shmup:fix-portal-type-narrowing
shmup:phase-7-gmcp-rich-client
shmup:phase-6-multizone-content-building
shmup:phase-5-verbs-interaction
shmup:phase-4-containers-portals
shmup:phase-3-things-inventory
shmup:phase-2-zones-migration
shmup:phase-1-object-foundation
shmup:roadmap
shmup:object-model-doc
shmup:prompt-system
shmup:fix/embedded-if-read-char
shmup:normalize-if-prompt
shmup:zmachine-compatibility
shmup:restore_undo
shmup:fix/read-char-optional-args
shmup:study-mojozork
shmup:fix/suppress-upper-window-writes
shmup:fix/if-bugs
shmup:v5-support
shmup:fix/zmachine-restore-stack
shmup:wire-embedded-zmachine-to-mud
shmup:zmachine-save-restore
shmup:zmachine-zork1-integration
shmup:hybrid-zmachine-interpreter
shmup:if-opcode-tracing
shmup:fix-if-terminal-formatting
shmup:if-terminal
shmup:speed-up-if-reads
shmup:containerize
shmup:research-if
shmup:add-fightable-mobs
shmup:add-rest-and-fix-prefix-matching
shmup:reload-and-toml-descriptions
shmup:prefix-matching-and-help
shmup:commands-and-editor-wiring
shmup:improve-combat
shmup:fix-combat
shmup:design/things-and-building
shmup:editor-mode
shmup:speedup-tests
shmup:ansi-color-depth
shmup:fix-player-data-typing
shmup:persistence
shmup:combat-as-content
shmup:map-editor
shmup:entity-model
shmup:content-loading
shmup:restructure
shmup:world-cache
shmup:flying
shmup:movement
shmup:worldgen
These branches are equal. There is no need to create a pull request.