Merge branch 'master' into develop

Conflicts: todo.txt
2015-01-20 05:21:00 +11:00
parent 1e8f91a871 92a02c7f0c
commit 453a211343
3 changed files with 12 additions and 8 deletions
@@ -7,6 +7,9 @@ TODO: Account passwords (list)
 	* ...
 	* salts & hashes

+TODO: Split config.cfg in two, one for the server and the client
+TODO: Add the "home" parameter to the server's config file
+TODO: Waypoints, with positions and trigger zones (collision areas) for doors, monster spawns, etc.
 TODO: Fix shoddy movement
 TODO: Periodic mass server saves
 TODO: Remove the big "Shut Down" button (currently broken...)