Changes between Version 300 and Version 301 of pps/main

Timestamp:

Sep 2, 2015, 1:08:34 PM (9 years ago)

Author:

maxima

Comment:

—

pps/main

@@ -46 +46 @@
 Facts about our PPS for the 3rd semester:
  * You get '''3KP''' 
- * The PPS takes place on '''Thursday, 13:15 until 16:00'''
- * The PPS starts on 26 February 2015 
- * Room: ETZ D 96
+ * The PPS takes place on '''Monday, 13:15 until 16:00'''
+ * The PPS starts on 28 September 2015 
+ * Room: ETZ D61.2
 }}}
 
@@ -56 +56 @@
  * Maxim Aebischer (maxima@student.ethz.ch)
  * Fabien Vultier (fvultier@student.ethz.ch)
+ * Florian Zinggeler (zifloria@student.ethz.ch)
 
 }}}
@@ -74 +75 @@
 #!div style="background-color: #ffdede; border: dashed 2px #000000; margin: 10px; padding: 10px;"
 || '''Date''' || '''Room''' || '''Topic''' || '''Slides''' ||
-|| 26 feb  || ETZ D 96 || Introduction and Tools (wiki, forum, svn and blender), [http://svn.orxonox.net/webdev/pps/fs15/BlenderTutorial.pdf Blender Tutorial] || [http://svn.orxonox.net/webdev/pps/hs13/week1/Introduction.pdf Introduction], [http://svn.orxonox.net/webdev/pps/hs13/week1/licensing.pdf Licensing], [http://svn.orxonox.net/webdev/pps/hs11/svn_howto2011.pdf SVN], [http://svn.orxonox.net/webdev/pps/hs13/week1/blender_intro_slides_hs13.pdf Blender]||
-|| 5 mar || ETZ D 61.1 || Framework and coding [wiki:PPS_tutorial tutorial] || [http://svn.orxonox.net/webdev/pps/hs13/week2/OrxonoxFrameworkHS13.pdf Framework], [http://svn.orxonox.net/webdev/pps/fs12/orxonox_das_wichtigste_in_kuerze.pdf Handout] ||
-|| 12 mar || ETZ D 61.2 || Choose the projects, start planning. || ||
-|| 19 mar || ETZ D 61.2 || Project Work ||  ||
-|| 26 mar || ETZ D 61.2 || 1st Review ||  ||
-|| 2 apr  || ETZ D 61.2 || Project Work ||  ||
-|| 9 apr  ||  || Easter Break ||  ||
-|| 16 apr || ETZ D 61.2 || Project Work ||  ||
-|| 23 apr || ETZ D 61.2 || 2nd Review||  ||
-|| 30 apr || ETZ D 61.2 || Project Work ||  ||
-|| 7 may || ETZ D 61.2 || 3rd Review / Pizzaessen  ||  ||
-|| 14 may ||  || Auffahrt ||  ||
-|| 21 may || ETZ D 61.2 || Presentation Preparation / Polish Up ||  ||
-|| 28 may || ETZ F91 || Presentation (12:30) || [http://www.orxonox.net/attachment/wiki/PPS_main/OrxonoxSlidesTemplate.odp Slide-Template] ||
+|| 28 sep || ETZ D 61.2 || Introduction and Tools (wiki, forum, svn and blender), [http://svn.orxonox.net/webdev/pps/fs15/BlenderTutorial.pdf Blender Tutorial] || [http://svn.orxonox.net/webdev/pps/hs13/week1/Introduction.pdf Introduction], [http://svn.orxonox.net/webdev/pps/hs13/week1/licensing.pdf Licensing], [http://svn.orxonox.net/webdev/pps/hs11/svn_howto2011.pdf SVN], [http://svn.orxonox.net/webdev/pps/hs13/week1/blender_intro_slides_hs13.pdf Blender]||
+|| 5 oct  || ETZ D 61.2 || Framework and coding [wiki:PPS_tutorial tutorial] || [http://svn.orxonox.net/webdev/pps/hs13/week2/OrxonoxFrameworkHS13.pdf Framework], [http://svn.orxonox.net/webdev/pps/fs12/orxonox_das_wichtigste_in_kuerze.pdf Handout] ||
+|| 12 oct || ETZ D 61.2 || Choose the projects, start planning. || ||
+|| 19 oct || ETZ D 61.2 || Project Work ||  ||
+|| 26 oct || ETZ D 61.2 || 1st Review / Project Work ||  ||
+|| 2 nov  || ETZ D 61.2 || Project Work ||  ||
+|| 9 nov  || ETZ D 61.2 || Project Work ||  ||
+|| 16 nov || ETZ D 61.2 || 2nd Review / Project Work ||  ||
+|| 23 nov || ETZ D 61.2 || Project Work ||  ||
+|| 30 nov || ETZ D 61.2 || 3rd Review / Project Work / Pizzaessen  ||  ||
+|| 7 dec  || ETZ D 61.2 || Presentation Preparation / Polish Up ||  ||
+|| 14 dec || TBD || Presentation (12:30) || [http://www.orxonox.net/attachment/wiki/PPS_main/OrxonoxSlidesTemplate.odp Slide-Template] ||
 }}}