aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-12-14 21:45:25 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-12-14 21:45:25 -0500
commit426809972df04eebb4702432c352b8e7d88f792d (patch)
tree35d5e4903cb18448a91cd8f298effc1db45ebf33 /Changelog
parenta2c6134f2527efbbf46954bdd6056e43d1e00848 (diff)
parent43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3 (diff)
Shit
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog26
1 files changed, 25 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 61dee12..0a44904 100644
--- a/Changelog
+++ b/Changelog
@@ -387,4 +387,28 @@
- continued to document header files through doxygen
- added border to dialogBox
- fix entity movement handling; npcs stop when you talk to them
- - added sword animation? \ No newline at end of file
+<<<<<<< HEAD
+ - added sword animation?
+=======
+ - added sword animation?
+
+12/9/2015,
+12/10/2015:
+===========
+
+ - added sound effects
+ - fixed disappearing building
+ - began actually plotting areas
+ - fixed layer switching-ish
+ - added passive dialogs
+ - began working on particles stuffses
+ - improved village spawning
+
+12/11/2015:
+===========
+
+ - plotted out a tutorial-ish area in game
+ - imrpoved BGM handling
+ - continued work on particles, made a fountain
+ - added sanic
+>>>>>>> 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3