Merge remote-tracking branch 'origin/staging' into bus-bunching-bug-fix

BYU-PCCL · Oct 14, 2024 · da6f72f · da6f72f
2 parents 9527754 + 0ea041a
commit da6f72f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/collections.toml b/collections.toml
@@ -13,7 +13,8 @@ experiences = [
   "papa",
   "stowaway",
   "cenote",
-  "witchscat"
+  "witchscat",
+  "studacc"
 ]
 
 [commercials]

diff --git a/experiences/bus-bunching/web/index.html b/experiences/bus-bunching/web/index.html
@@ -16,12 +16,12 @@
 
 <body>
   <div class="storytext fader">Have you ever been waiting for a bus for a long time when several arrive at
-    once?.</div>
+    once?</div>
 
   <div class="storytext fader">This phenomenon is called <strong>bus bunching</strong>.</div>
 
   <div class="storytext fader">
-    This visualization illustrrates why it happens.</strong>
+    This visualization illustrates why it happens.</strong>
   </div>
 
   <div class="storytext fader">
@@ -50,4 +50,4 @@
       </script>
 </body>
 
-</html>
+</html>
diff --git a/experiences/studacc/config.json b/experiences/studacc/config.json
@@ -0,0 +1,12 @@
+{
+    "id": "studacc",
+    "title": "Student Accomplice",
+    "description": "Driving is so much harder than it seems...",
+    "long_description": "Driving is so much harder than it seems...<br><br>This film was made entirely by BYU students!<br><br>Students pitched the idea, wrote the script, developed the characters, storyboarded the film, composed the music, rigged the animations, set up the lighting, rendered the scenes and edited the final cut&mdash;all as part of their final capstone experience in the BYU Animation program.<br><br>It's a highly dynamic, hands-on program structured to provide students with the skill sets necessary for success in the animation, live-action, special effects, and game industries. Many of our alumni go on to work for major studios such as Disney Feature Animation, Pixar Animation, DreamWorks Animation, Blizzard Entertainment, among many others.",
+    "artist": "BYU Animation",
+    "collection": "animations",
+    "scrubbing": true,
+    "type": "video",
+    "filename": "video.mp4",
+    "queueable": true
+}
diff --git a/experiences/studacc/thumb.jpg b/experiences/studacc/thumb.jpg
diff --git a/experiences/studacc/wide.jpg b/experiences/studacc/wide.jpg
diff --git a/folders.toml b/folders.toml
@@ -2,7 +2,7 @@
 title = "Interactive Experiences"
 description = "Explore Computer Science with these real-time interactive visualizations."
 tags = [ "interactive" ]
-featured = "bus-bunching"
+featured = "ifs"
 
 [animation]
 title = "BYU Animation"

diff --git a/tags.toml b/tags.toml
@@ -41,7 +41,8 @@ experiences = [
   "salt",
   "stowaway",
   "cenote",
-  "witchscat"
+  "witchscat",
+  "studacc"
 ]
 
 [graduation]