heart/carnation ui
Merge branch 'concepts-branch'
outline of style guide

template file is work in progress
Week 7 Log

Moved Week 6 into previous weeks, created Week 7 dir, added my weekly
log
wind particles
added 12 wind particles

located in assets->2d->particles
interim
Merge branch 'art-particles-branch'
Level Creation

I have modeled out and imported the starting area for the game. This
include, a basic house exterior, fenced in yard, and the beginnings of
the path to the Monk's house. Gameplay is next
Second Level Creation Commit
week 8 logs

created week 8 logs dir, moved week 7 dir to previous weeks, added my
week 8 log
third commit, level.data
control diagrams

mouse, keyboard buttons, and gamepad
I played the game!
Revert "I played the game!"

This reverts commit 7209d0846daf5ae0ffb97da99ed47c2013f58a4a.
Merge branch 'master' of https://github.com/egleiser/DemonParasol
ModelBreaking
Merge branch 'Monk_Path'
Merge branch 'ui-branch'