Merge branch 'serial' into server (read more)

Conflicts:
	server/server_application.cpp (resolved)

After completing the serialization code, I'm merging it into the server's
development branch. This means that although the connection and
disconnection functionality work, I still need to test the player systems
from the new server with the new serialization code.

Immediately following this commit, I'll be merging the minor tweaks to the
editor from the master branch into this one.
This commit is contained in:
Kayne Ruse
2014-03-07 20:58:37 +11:00
9 changed files with 311 additions and 124 deletions
+3
View File
@@ -94,6 +94,9 @@ union NetworkPacket {
Vector2 motion;
}playerInfo;
//map data
//...
//defaults
NetworkPacket() {
meta.type = Type::NONE;