aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-03-01 08:43:33 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-03-01 08:43:33 -0500
commitd42b81661ac1d1303746082b3606e80e92f5fdd6 (patch)
tree1458419db1bc95c0ac63311385c34cb2913445d2 /Changelog
parent20948cfe47f1fbeeed04e890c457d83cc826d74d (diff)
parent47f8aa5b312a5ef671e83322bcbe201a034f84c0 (diff)
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog17
1 files changed, 16 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index b85c195..0384181 100644
--- a/Changelog
+++ b/Changelog
@@ -690,10 +690,25 @@
- looked into better automated Makefiles
- improving villages, began work on shops
-2/26/2015:
+2/26/2016:
==========
- made fonts more memory-efficient
- C++-ified loaded texture handlers
- documented more stuff
- made merchant menu
+
+2/29/2016:
+==========
+
+ - renewed branch 'remake': re-wrote world.cpp and pushed
+ - fixed world linkage errors
+ - considered more formal coding? (as in documentation and indentation)
+ - fixed dialog boxes and options
+ - broke screenshots
+
+3/1/2016:
+=========
+
+ - merged 'remake' with 'master', fixed font issues and world stuffs
+ - continued work on merchant dialog