Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added img/richard.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/xiaoxi.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions references.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,20 @@ <h1>References</h1>
<div class = "container-content">
<div class = "references">
<p>
<h3>Bump Mapping</h3>
<ol>
<li> blah blah </li>
<li> alksdjf laksdjf </li>
<li><a href="http://www.mat.ucsb.edu/594cm/2010/adams_rp1/index.html">An Introduction to Bump Mapping</a></li>
<li><a href="http://wiki.blender.org/index.php/Doc:2.4/Manual/Textures/Influence/Material/Bump_and_Normal">Bump and Normal Mapping</a></li>
<li><a href="http://wiki.blender.org/index.php/Doc:2.4/Manual/Textures/Influence/Material/Bump_and_Normal">1</a></li>
<li><a href="http://wiki.blender.org/index.php/Doc:2.4/Manual/Textures/Influence/Material/Bump_and_Normal">2</a></li>
</ol>

<h3>Other Mapping</h3>
<ol>
<li><a href="http://www.mat.ucsb.edu/594cm/2010/adams_rp1/index.html">An Introduction to Bump Mapping</a></li>
<li><a href="http://wiki.blender.org/index.php/Doc:2.4/Manual/Textures/Influence/Material/Bump_and_Normal">Bump and Normal Mapping</a></li>
<li><a href="http://wiki.blender.org/index.php/Doc:2.4/Manual/Textures/Influence/Material/Bump_and_Normal">1</a></li>
<li><a href="http://wiki.blender.org/index.php/Doc:2.4/Manual/Textures/Influence/Material/Bump_and_Normal">2</a></li>
</ol>
</p>
</div>
Expand Down
30 changes: 28 additions & 2 deletions team.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
</nav>

<div class="container">
<div class = "text-center">
Expand All @@ -64,8 +64,34 @@ <h1>Team Members</h1>
Insert Group Picture
</div>
</div><!-- /.container -->

<div class = "container-content">
<p> Nicola <hr> Richard <hr> Natalie <hr> XiaoXi </p>
<h2 class ="text-center"> Nicola </h2>
<p>
...
</p>
<hr>
<h2 class ="text-center">Richard</h2><br>
<center><img src="img/richard.jpg" height="281" width="350" alt="me">
<p class = "text-center">Hello! My name’s Richard, first-generation Chinese-American, native Floridian, University of Florida student, third-year computer science major, self-appointed friend, programmer, and social mammal. I understand that that’s quite a long name, so I just go by Richard. You would likely find me in one of three places: in class, in front of my computer(s), and in the land of dreams. In the empty spaces between those three, I’m all over the place, so no promises. I am a pop music lover, a listener, a joker, and above all things a runner - both physically and philosophically.Feet to the pavement, eyes to the horizon: it is only there where we will find the future.Besides those quaint little notions, I am a student programmer of various small-scale applications, eagerly looking for opportunities to get involved in larger projects.I am a programmer by trade, gamer by heart, jack-of-all-trades as necessitated by responsibility. My interest (at least, one of them) is in reading and writing stories, but not necessarily in words: video games are a great and relevant example. I have spent more than enough of my past time on this earth lost in other developers’ crafted worlds; it is only appropriate that in the future I should try to create my own worlds for the next generation of dreamers to lose themselves in. But… things can change. In the end, all I am is a wee baby in this world made of cogs, which would keep on turning whether or not I helped to make it so. For the record, I do intend to help. I’m just not sure how to, yet. Working on it!
</p>
<hr>
<h2 class="text-center"> Natalie</h2> <br>
<p>
...
</p>
<hr>
<h2 class ="text-center">XiaoXi</h2><br>
<center><img src="img/xiaoxi.JPG" height="281" width="502" alt="xiaoxi"></center>
<p class="text-center">My name is Xiaoxi Zheng. I'm currently a 3rd year
<a href="https://www.cise.ufl.edu/academics/undergrad/das/about">Digital Art and Sciences Major</a> at the University of FLorida.<br>
I'm an aspiring front-end developer with my focuses on
overall user experience.I'm exicited for today's rapid growing<br>
web and software landscape. I enjoy challenging myself in solving everyday needs for users across the board. <br>
I'm a first generation Chinese American, lived around the world before settling in Tampa, Florida and now Gainesville.<br> I'm a mutilangual,curious and an ambitious individual who just likes to laugh too much. <br>I'm a fan of photography, love to play sports and various outdoor activities.
<br>
<br>
</p>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
Expand Down