upstream
gitignore fix
cmake build system (by mkwork)
Revert "cmake build system (by mkwork)"

This reverts commit 615a8b91c5430e4dba7f86f3b8d970c94b1d1392.
int64 -> int
fix a bug in network error handler: the first byte is control message
tweak damage indicator