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.

Sign up for GitHub

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

Jump to bottom

Next #179

Merged
merged 14 commits into from
Aug 19, 2024
Merged

Next #179

merged 14 commits into from
Aug 19, 2024

Conversation

fire
Copy link
Member

@fire fire commented Jul 23, 2024

Merge changes.

fire added 14 commits July 21, 2024 13:53
@fire
Use windows.
a8f8ba2
@fire
git subrepo pull (merge) --force 19_godot
2776687 
subrepo:
  subdir:   "19_godot"
  merged:   "f029fb93e7"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "f029fb93e7"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire
Merge remote-tracking branch 'origin/next' into next
93ccdd9
@fire
Use the merge project.
66c3dd9
@fire
git subrepo pull (merge) --force 19_godot
cebde21 
subrepo:
  subdir:   "19_godot"
  merged:   "b4364f87a0"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "b4364f87a0"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire
Include compute_global_transforms and compute_rest_and_target_positio…
ab9dfd9 
…ns directly.
@fire
Try to optimize renik.
a2ef73c
@fire
Try optimal priority for three directions.
0505901
@fire
Cache local to global transforms.
5ebb2a2
@fire
git subrepo push 19_godot/modules/renik
89c591a 
subrepo:
  subdir:   "19_godot/modules/renik"
  merged:   "a74ee86c74"
upstream:
  origin:   "https://github.com/V-Sekai/renik.git"
  branch:   "master"
  commit:   "a74ee86c74"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire
git subrepo pull (merge) --force 19_godot
0b19bb9 
subrepo:
  subdir:   "19_godot"
  merged:   "b5f1e400d4"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "b5f1e400d4"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire
Avoid crash.
9f71952
@fire
git subrepo pull (merge) --force 19_godot
77eb32e 
subrepo:
  subdir:   "19_godot"
  merged:   "16e84067fb"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "16e84067fb"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire
git subrepo pull (merge) --force 19_godot
3518033 
subrepo:
  subdir:   "19_godot"
  merged:   "34e25c2e6d"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-staging-4.3"
  commit:   "34e25c2e6d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"
@fire fire merged commit b68b4d9 into main Aug 19, 2024
4 checks passed
@fire fire deleted the next branch August 19, 2024 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@fire