Revert transform code and fix player.tscn and fix game_entry #18
noahg
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "revert-transform"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
@ -75,2 +75,4 @@func scene_changed():var root := get_tree().edited_scene_rootif not root:This was causing crashes in editor when trying to open the project
@ -1,6 +1,6 @@extends CanvasLayerconst MUSEUM_1 = preload('uid://crv6kgdf05l0p')const MUSEUM_1 := preload("uid://crv6kgdf05l0p")This was causing crashes when trying to run the game without first specifying a run config
Not sure where but the tanukui also lost its materials along the way. 😢
@devonereynolds wrote in #18 (comment):
This was my doing, it's fine.
Cleaning up the way the tanuki gets imported. I'm going to use materials instead of vertex colors. So in the meantime, he's just gray.
I think that is from recent changes in swapping the model over to the rigged one? There have been a lot of changes for that model specifically lately.
ffce713777toa827460686This PR is close to fixing the recent batch of changes. There are more broken commits that also need to be reverted.
Somehow while rebasing the branch @Alexis_Aurora ended up making broken copies of other people's commits.
The three commits that are broken copies of previous commits are:
Zoom camera in/out with mouse wheel/a2f7368c27is a broken copy of5b33d7d410.Free-moving overhead camera/e1978eeb48is a broken copy ofa48dcc97c6.added worldenvironment change to nate's test scene/3fc57602b4is a broken copy of5fc3a86396.I'm certain this is the case because these incorrectly rebased commits show another contributor as the author and @Alexis_Aurora as the committer.
Also, I remember these broken copies of commits were giving me trouble while trying to help get the original PR #10 for these changes fixed so it could be merged.
In summary, we also need to revert the commits above in reverse chronological order to avoid merge conflicts and fully back out these breaking changes. In the interest of time I went ahead and took care of doing this and force pushed this branch.