Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to Godot Engine 4.4 #183

Merged
merged 27 commits into from
Sep 15, 2024
Merged

Move to Godot Engine 4.4 #183

merged 27 commits into from
Sep 15, 2024

Conversation

fire
Copy link
Member

@fire fire commented Sep 15, 2024

Update the world.

fire added 26 commits August 25, 2024 17:11
subrepo:
  subdir:   "16_manuals"
  merged:   "83f66d284f"
upstream:
  origin:   "https://github.com/V-Sekai/manuals.git"
  branch:   "main"
  commit:   "83f66d284f"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "16_manuals"
  merged:   "ea23f794ee"
upstream:
  origin:   "https://github.com/V-Sekai/manuals.git"
  branch:   "main"
  commit:   "ea23f794ee"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "16_manuals"
  merged:   "5d43d88345"
upstream:
  origin:   "https://github.com/V-Sekai/manuals.git"
  branch:   "main"
  commit:   "5d43d88345"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
…19_godot/modules/speech

subrepo:
  subdir:   "19_godot/modules/speech"
  merged:   "2515ba2f4f"
upstream:
  origin:   "https://github.com/V-Sekai/godot-speech.git"
  branch:   "main"
  commit:   "2515ba2f4f"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "19_godot/modules/speech"
  merged:   "7585fab797"
upstream:
  origin:   "https://github.com/V-Sekai/godot-speech.git"
  branch:   "main"
  commit:   "7585fab797"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "19_godot"
  merged:   "35b10e36d9"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "35b10e36d9"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "14_godot"
  merged:   "1f7d41a4f6"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "1f7d41a4f6"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "14_godot"
  merged:   "022f46178f"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.4"
  commit:   "022f46178f"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
git subrepo pull (merge) --force --branch=groups-staging-4.3 14_godot

subrepo:
  subdir:   "14_godot"
  merged:   "34b9518b6d"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "34b9518b6d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

Save work.

git subrepo pull (merge) --force --branch=groups-staging-4.4 14_godot

subrepo:
  subdir:   "14_godot"
  merged:   "05b20f9df4"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.4"
  commit:   "05b20f9df4"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

Cleanup many bone ik.

git subrepo push 14_godot/modules/many_bone_ik

subrepo:
  subdir:   "14_godot/modules/many_bone_ik"
  merged:   "ddc539e515"
upstream:
  origin:   "https://github.com/V-Sekai/many_bone_ik.git"
  branch:   "main"
  commit:   "ddc539e515"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

Update the codebase to 4.4

git subrepo pull (merge) --force --branch=groups-staging-4.3 14_godot

subrepo:
  subdir:   "14_godot"
  merged:   "59f696123d"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "59f696123d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

git subrepo pull (merge) --force --branch=groups-staging-4.3 14_godot

subrepo:
  subdir:   "14_godot"
  merged:   "7919e588aa"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "7919e588aa"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

git subrepo pull (merge) --force --branch=groups-staging-4.4 14_godot

subrepo:
  subdir:   "14_godot"
  merged:   "e1a388979e"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.4"
  commit:   "e1a388979e"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

git subrepo pull (merge) --force --branch=groups-staging-4.3 14_godot

subrepo:
  subdir:   "14_godot"
  merged:   "826d77efef"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "826d77efef"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "14_godot"
  merged:   "a90430a994"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.4"
  commit:   "a90430a994"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
subrepo:
  subdir:   "14_godot"
  merged:   "c7c800a1d0"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.4"
  commit:   "c7c800a1d0"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire fire enabled auto-merge September 15, 2024 13:07
@fire fire disabled auto-merge September 15, 2024 13:38
@fire fire merged commit c99b1c7 into main Sep 15, 2024
@fire fire deleted the next branch September 15, 2024 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant