Commit Graph

Select branches

Hide Pull Requests

feature/combat

feature/combat-bootstrap

feature/combat-turns

feature/dungeon-state

feature/encounter-resolution

feature/game-shell-ui

feature/loot-resolution

feature/map-navigation-ui

feature/post-combat-rewards

feature/return-to-town-flow

feature/room-entry-flow

feature/room-generation

feature/rules-foundation

feature/run-state-flow

feature/town-sell-and-stash

feature/treasure-ui-and-inventory

main

staging/features

#1

#10

#11

#12

#13

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 0182e9eb79 Merge branch 'feature/room-generation-fidelity' main Keith Solomon 2026-03-20 17:07:24 -05:00
• 9f494461de Expand room generation fidelity and magic item actions Keith Solomon 2026-03-20 17:06:45 -05:00
• 37e2b27870 Add campaign shell and map generation recovery Keith Solomon 2026-03-18 21:35:53 -05:00
• bcd720cae8 Merge branch 'main' of ssh://git.keithsolomon.net:222/keith/2D6-Dungeon Keith Solomon 2026-03-18 20:19:45 -05:00
• c616ead519 Merge branch 'feature/level-progression' Keith Solomon 2026-03-18 19:37:14 -05:00
• 8600f611a6 ✨Feature: add town systems, saves, recovery, and level progression Keith Solomon 2026-03-18 19:37:01 -05:00
• a4d2890cd9 ✨Feature: implement return to town and resume dungeon flow with state management feature/return-to-town-flow Keith Solomon 2026-03-18 18:42:43 -05:00
• d3183a92b6 Merge pull request '✨Feature: implement town market functionality with treasure selling and stashing' (#13) from feature/town-sell-and-stash into main keith 2026-03-16 00:06:11 +00:00
• 1613acd39b Merge branch 'main' into feature/town-sell-and-stash feature/town-sell-and-stash keith 2026-03-16 00:06:01 +00:00
• 2c58c3f1a5 Merge pull request '✨Feature: enhance inventory UI with structured layout and item categorization' (#12) from feature/treasure-ui-and-inventory into main keith 2026-03-16 00:05:43 +00:00
• 967766956f Merge branch 'main' into feature/treasure-ui-and-inventory feature/treasure-ui-and-inventory keith 2026-03-16 00:05:36 +00:00
• 9eef50e0c9 Merge pull request '✨Feature: implement loot resolution system with gold and item tracking from defeated creatures' (#11) from feature/loot-resolution into main keith 2026-03-16 00:05:14 +00:00
• cbb3efafd7 Merge branch 'main' into feature/loot-resolution feature/loot-resolution keith 2026-03-16 00:05:05 +00:00
• 626d5ca05c Merge branch 'feature/post-combat-rewards' Keith Solomon 2026-03-15 19:03:37 -05:00
• 68654a8cc0 Merge pull request '✨Feature: implement game shell UI with room navigation and combat mechanics' (#9) from feature/game-shell-ui into main keith 2026-03-15 23:57:34 +00:00
• 40ce9644ab Merge branch 'main' into feature/game-shell-ui feature/game-shell-ui keith 2026-03-15 23:57:24 +00:00
• 8597b4fded ✨Feature: implement town market functionality with treasure selling and stashing Keith Solomon 2026-03-15 14:31:53 -05:00
• 71bdc6d031 ✨Feature: enhance inventory UI with structured layout and item categorization Keith Solomon 2026-03-15 14:29:03 -05:00
• 6c2257b032 ✨Feature: implement loot resolution system with gold and item tracking from defeated creatures Keith Solomon 2026-03-15 14:24:39 -05:00
• cf98636a52 ✨Feature: implement post-combat rewards system with XP tracking and creature defeat logging feature/post-combat-rewards Keith Solomon 2026-03-15 14:16:37 -05:00
• 473ea83cdf Merge pull request '✨Feature: Implement staged backend features' (#8) from staging/features into main keith 2026-03-15 19:06:33 +00:00
• 7fb3bd6cf5 Merge branch 'main' into staging/features staging/features keith 2026-03-15 19:04:06 +00:00
• fb6cbfe9fb ✨Feature: implement game shell UI with room navigation and combat mechanics Keith Solomon 2026-03-15 14:02:19 -05:00
• 9c7acf6825 Merge pull request '✨Feature: implement run state management with combat resolution and room entry' (#7) from feature/run-state-flow into staging/features keith 2026-03-15 18:53:14 +00:00
• 102cbfeaad Merge branch 'staging/features' into feature/run-state-flow feature/run-state-flow keith 2026-03-15 18:53:03 +00:00
• 377a533466 Merge pull request '✨Feature: implement combat' (#6) from feature/combat into staging/features keith 2026-03-15 18:52:27 +00:00
• e3f90ca545 Merge branch 'staging/features' into feature/combat feature/combat keith 2026-03-15 18:52:08 +00:00
• d504008030 ✨Feature: implement run state management with combat resolution and room entry feature/map-navigation-ui Keith Solomon 2026-03-15 13:50:50 -05:00
• 79b9e448b7 Merge pull request '✨Feature: implement combat turn resolution with player and enemy actions' (#5) from feature/combat-turns into feature/combat keith 2026-03-15 18:46:14 +00:00
• 50873e6989 ✨Feature: implement combat turn resolution with player and enemy actions feature/combat-turns Keith Solomon 2026-03-15 13:44:46 -05:00
• ec0de5b0b8 ✨Feature: add creature lookup functionality and combat state management feature/combat-bootstrap Keith Solomon 2026-03-15 13:35:13 -05:00
• aea00d31e8 Merge pull request '✨Feature: implement room entry flow with encounter resolution and logging' (#4) from feature/room-entry-flow into staging/features keith 2026-03-15 18:30:14 +00:00
• fdaa2e3135 Merge branch 'staging/features' into feature/room-entry-flow feature/room-entry-flow keith 2026-03-15 18:28:40 +00:00
• 4dde4bff99 ✨Feature: implement room entry flow with encounter resolution and logging Keith Solomon 2026-03-15 13:26:59 -05:00
• 67453df51e Merge pull request '✨Feature: enhance encounter resolution with creature names and result labels' (#3) from feature/encounter-resolution into staging/features keith 2026-03-15 18:19:53 +00:00
• cff5f786a0 Merge pull request '✨Feature: implement dungeon state management with room expansion and exit handling' (#2) from feature/dungeon-state into staging/features keith 2026-03-15 18:19:15 +00:00
• 39703ce6b0 ✨Feature: enhance encounter resolution with creature names and result labels feature/encounter-resolution Keith Solomon 2026-03-15 13:11:28 -05:00
• 1ff20723ec ✨Feature: implement dungeon state management with room expansion and exit handling feature/dungeon-state Keith Solomon 2026-03-15 13:05:48 -05:00
• 5debb5bd5e Merge pull request '✨Feature: Add foundational rules and mechanics' (#1) from feature/rules-foundation into main keith 2026-03-15 17:58:14 +00:00
• 120e144b3f ✨Feature: add level 1 content including room templates, encounter tables, and room generation logic feature/room-generation Keith Solomon 2026-03-15 12:54:46 -05:00
• 6bf48df74c ✨Feature: add character creation logic and tests feature/rules-foundation Keith Solomon 2026-03-15 11:59:50 -05:00
• e303373441 ✨feature: Initial code setup Keith Solomon 2026-03-15 10:26:20 -05:00
• e052544989 ✨feature: Implementation notes Keith Solomon 2026-03-15 10:08:37 -05:00
• 95c629a42e ✨feature: Initial commit Keith Solomon 2026-03-15 09:41:22 -05:00