coryc/codename-jovambers-cyberpunk
1
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

ai> #7

Open
jprimus3 wants to merge 1 commit from feat/ai_behavior_insanity into main
pull from: feat/ai_behavior_insanity
merge into: coryc:main
Conversation 0 Commits 1 Files changed 30 +115924 -1
jprimus3 commented 2026-03-29 10:06:55 -04:00
Collaborator
Copy link
nodes >
		btiaction
		bticondition
		btinode
		btisequence
		btiwselector
trees >
		calm_tree.gd
		calm_tree.tres
		chaotic_tree.gd
		chaotic_tree.tres
		nervous_tree.gd
		nervous_tree.tres

added npc_02_insanity to the scenes folder
adjusted debug room color
added lights to debug room

nodes > btiaction bticondition btinode btisequence btiwselector trees > calm_tree.gd calm_tree.tres chaotic_tree.gd chaotic_tree.tres nervous_tree.gd nervous_tree.tres added npc_02_insanity to the scenes folder adjusted debug room color added lights to debug room
nodes >
			btiaction
			bticondition
			btinode
			btisequence
			btiwselector
	trees >
			calm_tree.gd
			calm_tree.tres
			chaotic_tree.gd
			chaotic_tree.tres
			nervous_tree.gd
			nervous_tree.tres

added npc_02_insanity to the scenes folder
adjusted debug room color
added lights to debug room
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/ai_behavior_insanity:feat/ai_behavior_insanity
git switch feat/ai_behavior_insanity

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/ai_behavior_insanity
git switch feat/ai_behavior_insanity
git rebase main
git switch main
git merge --ff-only feat/ai_behavior_insanity
git switch feat/ai_behavior_insanity
git rebase main
git switch main
git merge --no-ff feat/ai_behavior_insanity
git switch main
git merge --squash feat/ai_behavior_insanity
git switch main
git merge --ff-only feat/ai_behavior_insanity
git switch main
git merge feat/ai_behavior_insanity
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
coryc/codename-jovambers-cyberpunk!7
No description provided.