diff options
author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-11 07:38:33 -0500 |
---|---|---|
committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-11 07:38:33 -0500 |
commit | 6bf27552a564297cd8aaf1e3c24d9320438bdcc5 (patch) | |
tree | 1947c5911d234e72cbf189433612047c443e40e6 /Changelog | |
parent | c16827da9b66f42e2bd0d002381bdcdaa2ac8045 (diff) | |
parent | a2284d1c9be35744cb43a91148c82cff64be7a43 (diff) |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'Changelog')
-rw-r--r-- | Changelog | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -377,7 +377,7 @@ ========== - re-did fullscreen text (importantText) - - began doxygening headers + - began doxygening headersspin a dreidel - fixed entity name reading - fixed entity sprites @@ -387,6 +387,9 @@ - continued to document header files through doxygen - added border to dialogBox - fix entity movement handling; npcs stop when you talk to them +<<<<<<< HEAD + - added sword animation? +======= - added sword animation? 12/9/2015, @@ -408,6 +411,7 @@ - imrpoved BGM handling - continued work on particles, made a fountain - added sanic +======= ~ Broke 5000 lines of code/doc, now with some file Doxygen'd @@ -420,6 +424,7 @@ - fixed fading bugs - continued fixing general game bugs - fixed structure spawn issues +======= 12/15/2015: =========== |