Skip to content

Commit

Permalink
milestone add video
Browse files Browse the repository at this point in the history
  • Loading branch information
Milotrince committed Apr 17, 2024
1 parent 6f42e55 commit 499b9ce
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 14 deletions.
Binary file added milestone/images/team56-milestone-video.mp4
Binary file not shown.
41 changes: 27 additions & 14 deletions milestone/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,26 @@

<h1 align="middle">CS 184: Computer Graphics and Imaging, Spring 2024</h1>
<h1 align="middle">FluidPong: Milestone</h1>
<h2 align="middle">Trinity Chung, Anna Dymchenko, Oliver Ni, Tiffany Sun</h2>
<h2 align="middle">Team 56: Trinity Chung, Anna Dymchenko, Oliver Ni, Tiffany Sun</h2>
<h3 align="middle">
<a href="https://cal-cs184-student.github.io/hw-webpages-sp24-oliver-trinity/milestone/">
Website: <a href="https://cal-cs184-student.github.io/hw-webpages-sp24-oliver-trinity/milestone/">
https://cal-cs184-student.github.io/hw-webpages-sp24-oliver-trinity/milestone/
</a>
</h3>
<h3 align="middle">
Slides: <a href="https://docs.google.com/presentation/d/1c8SNqwCMYDlIjJLUUo8TMi4K9p8eQGq_Rw8kTFmvSWY/edit?usp=sharing">
https://docs.google.com/presentation/d/1c8SNqwCMYDlIjJLUUo8TMi4K9p8eQGq_Rw8kTFmvSWY/edit?usp=sharing
</a>
</h3>
<h3 align="middle">
Video: <a href="https://drive.google.com/file/d/1L4K4iBu6TYLjyek7F3Wk_5kf5YOhJ0PE/view?usp=sharing/">
https://drive.google.com/file/d/1L4K4iBu6TYLjyek7F3Wk_5kf5YOhJ0PE/view?usp=sharing
</a>
</h3>

<br><br>

<div>
<p align="middle">
<iframe
src="https://docs.google.com/presentation/d/e/2PACX-1vTQ6_dG-hq5RH434CnaCCcsBOOtxrCnGD5rbzvyQ4p38VsX2gwbxiadZ8nqsVhl3DERD4g_tlAViE7q/embed?start=true&loop=true&delayms=3000"
frameborder="0" width="960" height="569" allowfullscreen="true" mozallowfullscreen="true"
webkitallowfullscreen="true"></iframe>
</p>

<p>
Link to slides: <a
href="https://docs.google.com/presentation/d/1c8SNqwCMYDlIjJLUUo8TMi4K9p8eQGq_Rw8kTFmvSWY/edit?usp=sharing">https://docs.google.com/presentation/d/1c8SNqwCMYDlIjJLUUo8TMi4K9p8eQGq_Rw8kTFmvSWY/edit?usp=sharing</a>
</p>

<p><img src="images/first_fluidpong_large.png" alt="milestone fluidpong"></p>

<h2 id="preliminary-progress">Preliminary Progress</h2>
Expand Down Expand Up @@ -120,6 +118,21 @@ <h2 id="updated-work-plan">Updated Work Plan</h2>
<li>Make pong paddles and ball interact with fluid more intimately.</li>
</ul>

<h2>Slides</h2>
<p align="middle">
<iframe
src="https://docs.google.com/presentation/d/e/2PACX-1vTQ6_dG-hq5RH434CnaCCcsBOOtxrCnGD5rbzvyQ4p38VsX2gwbxiadZ8nqsVhl3DERD4g_tlAViE7q/embed"
frameborder="0" width="960" height="569" allowfullscreen="true" mozallowfullscreen="true"
webkitallowfullscreen="true"></iframe>
</p>

<h2>Video</h2>
<video controls>
<source src="images/team56-milestone-video.mp4" type="video/mp4">
video not supported :(
</video>



</body>

Expand Down

0 comments on commit 499b9ce

Please sign in to comment.