Merge

AmazingTurtle · Nov 16, 2016 · 00be458 · 00be458
2 parents 41b67c7 + 611c652
commit 00be458
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 2,932 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+bam
+.bam
+/config.lua
+/datasrc/__pycache__
+/datasrc/*.pyc
+/objs
+src/game/generated
+/*.dll
+
+/crapnet*
+/dilate*
+/fake_server*
+/map_resave*
+/map_version*
+/mastersrv*
+/packetgen*
+/tileset_border*
+/versionsrv*
+/infclass_client*
+/infclass_srv*
diff --git a/config.lua b/config.lua
diff --git a/src/game/generated/client_data.cpp b/src/game/generated/client_data.cpp
diff --git a/src/game/generated/client_data.h b/src/game/generated/client_data.h
diff --git a/src/game/generated/nethash.cpp b/src/game/generated/nethash.cpp