v4.0 pre-release! (Merge pull request #7 from evolutionleo/feature/ssp)

Server-Side Physics (TypeScript)
evolutionleo · Nov 11, 2021 · ee27413 · ee27413
2 parents bf2c005 + 896f25f
commit ee27413
Show file tree

Hide file tree

Showing 160 changed files with 47,134 additions and 402 deletions.
diff --git a/.gitignore.txt b/.gitignore.txt
@@ -0,0 +1 @@
+server_log.txt
diff --git a/EmptyClient/EmptyClient.yyp b/EmptyClient/EmptyClient.yyp
diff --git a/EmptyClient/extensions/WinDev/WinDev.yy b/EmptyClient/extensions/WinDev/WinDev.yy
diff --git a/EmptyClient/notes/ProjectStructure/ProjectStructure.yy b/EmptyClient/notes/ProjectStructure/ProjectStructure.yy
diff --git a/EmptyClient/objects/btnButton/btnButton.yy b/EmptyClient/objects/btnButton/btnButton.yy
diff --git a/EmptyClient/objects/btnLogin/btnLogin.yy b/EmptyClient/objects/btnLogin/btnLogin.yy
diff --git a/EmptyClient/objects/btnRegister/btnRegister.yy b/EmptyClient/objects/btnRegister/btnRegister.yy
diff --git a/EmptyClient/objects/btnToLobbies/btnToLobbies.yy b/EmptyClient/objects/btnToLobbies/btnToLobbies.yy
diff --git a/EmptyClient/objects/btnToLogin/btnToLogin.yy b/EmptyClient/objects/btnToLogin/btnToLogin.yy
diff --git a/EmptyClient/objects/btnToMenu/btnToMenu.yy b/EmptyClient/objects/btnToMenu/btnToMenu.yy
diff --git a/EmptyClient/objects/oBox/Step_0.gml b/EmptyClient/objects/oBox/Step_0.gml
@@ -0,0 +1,11 @@
+/// @description Insert description here
+// You can write your code in this editor
+if (place_meeting(x + spd.x, y, oWall)) {
+	spd.x = 0
+}
+x += spd.x
+
+if (place_meeting(x, y + spd.y, oWall)) {
+	spd.y = 0
+}
+y += spd.y
diff --git a/EmptyClient/objects/oBox/oBox.yy b/EmptyClient/objects/oBox/oBox.yy
diff --git a/EmptyClient/objects/oClient/Create_0.gml b/EmptyClient/objects/oClient/Create_0.gml
@@ -2,16 +2,28 @@
 
 #region Connect!
 
-socket = network_create_socket(network_socket_tcp)
-// Async = Don't crash the game if the server is down
-network_connect_raw_async(socket, IP, real(PORT));
+connect = function() {
+	// if a packet is split in half, we use this
+	// -1 if no half-pack, a buffer otherwise
+	connecting = true
+	connected = false
+	halfpack = -1
+
+	alarm[0] = CONNECT_TIMEOUT
+
+	socket = network_create_socket(network_socket_tcp)
+	// Async = Don't crash the game if the server is down
+	network_connect_raw_async(socket, IP, real(PORT));
+}
 
 // connect/disconnect events defined in __NetworkingConfig.gml
 onConnect = global.onConnect
 onDisconnect = global.onDisconnect
 
 #endregion
 
-// if a packet is split in half, we use this
-// -1 if no half-pack, a buffer otherwise
-halfpack = -1
+
+connecting = false
+connected = false
+
+connect()
diff --git a/EmptyClient/objects/oClient/KeyPress_82.gml b/EmptyClient/objects/oClient/KeyPress_82.gml
@@ -0,0 +1,4 @@
+/// @description Ctrl+R to reconnect
+
+if (keyboard_check(vk_control))
+	connect()
diff --git a/EmptyClient/objects/oClient/Other_68.gml b/EmptyClient/objects/oClient/Other_68.gml
@@ -71,10 +71,14 @@ switch(type) {
 	case network_type_non_blocking_connect:
 	case network_type_connect:
 		trace("Connected to the server!")
+		connected = true
+		connecting = false
 		onConnect()
 		break
 	case network_type_disconnect:
 		trace("Disconnected from the server!")
+		connected = false
+		connecting = false
 		onDisconnect()
 		break
 }
diff --git a/EmptyClient/objects/oClient/Step_0.gml b/EmptyClient/objects/oClient/Step_0.gml
@@ -0,0 +1,6 @@
+/// @description Reconnect
+
+if (!connected and !connecting) {
+	trace("reconnecting...")
+	connect()
+}
diff --git a/EmptyClient/objects/oClient/oClient.yy b/EmptyClient/objects/oClient/oClient.yy
diff --git a/EmptyClient/objects/oDemo/oDemo.yy b/EmptyClient/objects/oDemo/oDemo.yy
diff --git a/EmptyClient/objects/oDualInstance/oDualInstance.yy b/EmptyClient/objects/oDualInstance/oDualInstance.yy
diff --git a/EmptyClient/objects/oEntity/Create_0.gml b/EmptyClient/objects/oEntity/Create_0.gml
@@ -0,0 +1,3 @@
+/// @description This is the parent object for entities
+
+use_uuid()
diff --git a/EmptyClient/objects/oEntity/oEntity.yy b/EmptyClient/objects/oEntity/oEntity.yy
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		/// @description This is the parent object for entities

		use_uuid()