Skip to content

[GH-156] resolve conflicts with old feature set#173

Draft
scottwestover wants to merge 20 commits intomainfrom
GH-156-resolve-conflicts
Draft

[GH-156] resolve conflicts with old feature set#173
scottwestover wants to merge 20 commits intomainfrom
GH-156-resolve-conflicts

Conversation

@scottwestover
Copy link
Member

@scottwestover scottwestover commented Dec 11, 2025 •
edited
Loading

[GH-156] resolve conflicts with old feature set

@scottwestover
GH-156 started working on adding support for npc battles
60deefc 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-156 more work on the npc battle logic
87f48ef 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
added custom tools for disable features and loading custom saves
fbf4e68 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
Merge branch 'scott-testing-tools' into GH-156-npc-battles
e540c18
@scottwestover
GH-156 more work on npc battle flows
b7b4da9 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-156 finished core npc battle logic
4a874c1 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-156 finished npc battle feature
71ccb52 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-157 more work on line of sight and having npc move to player
220a6ae 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-157 wrapped up line of sight npc move
9481d3d 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-157 added feature for player running
ba03254 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
GH-157 revert change to preload scene
39966ae 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
added docs
eb5d1ce 
Signed-off-by: Scott Westover <scottwestover2006@gmail.com>
@scottwestover
resolve conflicts
35fac23 
Signed-off-by: scottwestover <scottwestover2006@gmail.com>
@scottwestover scottwestover changed the title Gh 156 resolve conflicts [GH-156] resolve conflicts with old feature set Dec 11, 2025
@scottwestover scottwestover self-assigned this Dec 11, 2025
@scottwestover
Merge branch 'main' into GH-156-resolve-conflicts
d690f02
@scottwestover
Merge branch 'GH-156-battles' into GH-156-resolve-conflicts
8683b82
@scottwestover
resolve conflicts
96be89d 
Signed-off-by: scottwestover <scottwestover2006@gmail.com>
@scottwestover
resolve conflicts
e611e98 
Signed-off-by: scottwestover <scottwestover2006@gmail.com>
@scottwestover
resolve conflicts
37b2cea 
Signed-off-by: scottwestover <scottwestover2006@gmail.com>
@scottwestover
resolve conflicts
a2e5fc6 
Signed-off-by: scottwestover <scottwestover2006@gmail.com>
@scottwestover
Merge branch 'GH-157-line-of-sight-battle' into GH-156-resolve-conflicts
397bc70
Base automatically changed from GH-156-battles to main December 29, 2025 03:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@scottwestover scottwestover

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@scottwestover