try egypt
Merge branch 'master' of https://github.com/kmcurry/3Scape into Ancient-Egypt
fix contentDir usage and mock up Egypt
make links to Slides 2-4
Updated the current Object
Merge branch 'Ancient-Egypt' of https://github.com/kmcurry/3Scape into Ancient-Egypt
Working on Slides
Merge branch 'Ancient-Egypt' of https://github.com/kmcurry/3Scape into Ancient-Egypt
Current Slide Updates - Also fixed Slide4.xml
Fixxed the naming convension of objects to CubeX instead of X. Cube
This closes #45 and updates the current slide on both the top and the side nav bar
Added in a Text Editor, also resolved #46
Fixed #48, also commented out File,Edit, and View from the Navbar
addressed #47. You may now grab the whole list of objects and add them to the scene.
I am currently working #50. I have changed the naming of everything and will be addressing the addition of a new scene
Collapsing sidebar. Need to add animation & better UI button
Uncomment canvas
Add this content
resolve merge conflict
Merge branch 'TerabyteTyler-Ancient-Egypt' into Ancient-Egypt