Skip to content

Commit

Permalink
Merge branch 'main' into remove-collider-vis-scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
winthos committed Aug 12, 2024
2 parents e0bd9bb + 7bd8b4d commit 9d0a679
Show file tree
Hide file tree
Showing 155 changed files with 12,203 additions and 20,603 deletions.
6 changes: 5 additions & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,11 @@ def ci_build(
"id": None,
}

novelty_thor_add_branches = ["new_cam_adjust", "stretch_with_many_cameras"]
novelty_thor_add_branches = [
"new_cam_adjust",
"stretch_with_many_cameras",
"stretch_with_many_cameras_no_down_gopro_roll",
]
if is_travis_build and build and build["branch"] in novelty_thor_add_branches:
novelty_thor_scenes = True
private_repos.append(novelty_thor_repo)
Expand Down
290 changes: 95 additions & 195 deletions unity/Assets/Scripts/ActionDispatcher.cs

Large diffs are not rendered by default.

Loading

0 comments on commit 9d0a679

Please sign in to comment.