Skip to content

Commit

Permalink
[v5.1] Project structure changes + input validation!
Browse files Browse the repository at this point in the history
  • Loading branch information
evolutionleo committed Apr 29, 2023
1 parent 7f4b458 commit 6f9518c
Show file tree
Hide file tree
Showing 194 changed files with 2,553 additions and 6,009 deletions.
28 changes: 19 additions & 9 deletions Client/Client.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@
{"name":"UI","order":3,"path":"folders/Warp Demo/Sprites/UI.yy",},
{"name":"Extensions","order":3,"path":"folders/Warp/Extensions.yy",},
{"name":"Objects","order":4,"path":"folders/Warp/Objects.yy",},
{"name":"Entities","order":4,"path":"folders/Warp/Objects/Entities.yy",},
{"name":"Parents","order":2,"path":"folders/Warp/Objects/Parents.yy",},
{"name":"Scripts","order":2,"path":"folders/Warp/Scripts.yy",},
{"name":"__Custom (Edit this)","order":5,"path":"folders/Warp/Scripts/__Custom (Edit this).yy",},
{"name":"Struct N' Array Parser","order":1,"path":"folders/Warp/Scripts/lib/Struct N' Array Parser.yy",},
{"name":"Messagepack","order":1,"path":"folders/Warp/Scripts/lib/Struct N' Array Parser/Messagepack.yy",},
{"name":"util","order":1,"path":"folders/Warp/Scripts/util.yy",},
{"name":"Entities","order":4,"path":"folders/Warp/Objects/Entities.yy",},
{"name":"cmd","order":4,"path":"folders/Warp/Scripts/cmd.yy",},
{"name":"handlers","order":2,"path":"folders/Warp/Scripts/cmd/handlers.yy",},
{"name":"senders","order":3,"path":"folders/Warp/Scripts/cmd/senders.yy",},
{"name":"Managers","order":6,"path":"folders/Warp/Objects/Managers.yy",},
],
"ResourceOrderSettings": [
{"name":"sPlayer","order":2,"path":"sprites/sPlayer/sPlayer.yy",},
Expand All @@ -35,9 +38,9 @@
{"name":"SimpleUIBinding","order":3,"path":"scripts/SimpleUIBinding/SimpleUIBinding.yy",},
{"name":"oSimpleUI","order":2,"path":"objects/oSimpleUI/oSimpleUI.yy",},
{"name":"SUIText","order":4,"path":"scripts/SUIText/SUIText.yy",},
{"name":"WarpEvents","order":4,"path":"scripts/WarpEvents/WarpEvents.yy",},
{"name":"WarpEvents","order":5,"path":"scripts/WarpEvents/WarpEvents.yy",},
{"name":"SUISprite","order":3,"path":"scripts/SUISprite/SUISprite.yy",},
{"name":"__WarpConfig","order":2,"path":"scripts/__WarpConfig/__WarpConfig.yy",},
{"name":"__WarpConfig","order":3,"path":"scripts/__WarpConfig/__WarpConfig.yy",},
{"name":"oMainMenu","order":4,"path":"objects/oMainMenu/oMainMenu.yy",},
{"name":"sSimpleUITextCursor","order":3,"path":"sprites/sSimpleUITextCursor/sSimpleUITextCursor.yy",},
{"name":"sWall","order":1,"path":"sprites/sWall/sWall.yy",},
Expand All @@ -46,24 +49,31 @@
{"name":"oPlayer","order":1,"path":"objects/oPlayer/oPlayer.yy",},
{"name":"oWall","order":2,"path":"objects/oWall/oWall.yy",},
{"name":"rLogin","order":1,"path":"rooms/rLogin/rLogin.yy",},
{"name":"WarpInitializers","order":3,"path":"scripts/WarpInitializers/WarpInitializers.yy",},
{"name":"network_write","order":3,"path":"scripts/network_write/network_write.yy",},
{"name":"WarpInitializers","order":6,"path":"scripts/WarpInitializers/WarpInitializers.yy",},
{"name":"network_write","order":5,"path":"scripts/network_write/network_write.yy",},
{"name":"authHandlers","order":3,"path":"scripts/authHandlers/authHandlers.yy",},
{"name":"gameLoopHandlers","order":2,"path":"scripts/gameLoopHandlers/gameLoopHandlers.yy",},
{"name":"rTest2","order":2,"path":"rooms/rTest2/rTest2.yy",},
{"name":"entityHandlers","order":4,"path":"scripts/entityHandlers/entityHandlers.yy",},
{"name":"rTest","order":1,"path":"rooms/rTest/rTest.yy",},
{"name":"oPartyUI","order":5,"path":"objects/oPartyUI/oPartyUI.yy",},
{"name":"SUITextBox","order":5,"path":"scripts/SUITextBox/SUITextBox.yy",},
{"name":"systemSenders","order":1,"path":"scripts/systemSenders/systemSenders.yy",},
{"name":"gameplaySenders","order":3,"path":"scripts/gameplaySenders/gameplaySenders.yy",},
{"name":"oLobbiesDemo","order":2,"path":"objects/oLobbiesDemo/oLobbiesDemo.yy",},
{"name":"SUIBackButton","order":1,"path":"scripts/SUIBackButton/SUIBackButton.yy",},
{"name":"oPingManager","order":5,"path":"objects/oPingManager/oPingManager.yy",},
{"name":"oPingManager","order":3,"path":"objects/oPingManager/oPingManager.yy",},
{"name":"sWarpPortal","order":3,"path":"sprites/sWarpPortal/sWarpPortal.yy",},
{"name":"oEntityManager","order":3,"path":"objects/oEntityManager/oEntityManager.yy",},
{"name":"lobbyHandlers","order":1,"path":"scripts/lobbyHandlers/lobbyHandlers.yy",},
{"name":"oEntityManager","order":2,"path":"objects/oEntityManager/oEntityManager.yy",},
{"name":"SUIBox","order":1,"path":"scripts/SUIBox/SUIBox.yy",},
{"name":"oPhysicsEntity","order":1,"path":"objects/oPhysicsEntity/oPhysicsEntity.yy",},
{"name":"SimpleUIUtils","order":5,"path":"scripts/SimpleUIUtils/SimpleUIUtils.yy",},
{"name":"oDualInstance","order":1,"path":"objects/oDualInstance/oDualInstance.yy",},
{"name":"oWarpPortal","order":3,"path":"objects/oWarpPortal/oWarpPortal.yy",},
{"name":"SUIButton","order":2,"path":"scripts/SUIButton/SUIButton.yy",},
{"name":"NetworkInterpolation","order":5,"path":"scripts/NetworkInterpolation/NetworkInterpolation.yy",},
{"name":"authSenders","order":2,"path":"scripts/authSenders/authSenders.yy",},
{"name":"NetworkInterpolation","order":4,"path":"scripts/NetworkInterpolation/NetworkInterpolation.yy",},
{"name":"oFriendList","order":6,"path":"objects/oFriendList/oFriendList.yy",},
{"name":"SimpleUI","order":2,"path":"scripts/SimpleUI/SimpleUI.yy",},
{"name":"rMenu","order":2,"path":"rooms/rMenu/rMenu.yy",},
Expand Down
20 changes: 15 additions & 5 deletions Client/Client.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Client/objects/oClient/Alarm_1.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// @desc

sendRequestTime()
//alarm[1] = 240
2 changes: 0 additions & 2 deletions Client/objects/oClient/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ connect = function() {
// -1 if no half-pack, a buffer otherwise
halfpack = -1

alarm[0] = CONNECT_TIMEOUT

socket = network_create_socket(SOCKET_TYPE)
var port

Expand Down
1 change: 1 addition & 0 deletions Client/objects/oClient/Other_68.gml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ switch(type) {
trace("Connected to the server!")
connected = true
connecting = false
alarm[1] = 60
onConnect()
break
case network_type_disconnect:
Expand Down
5 changes: 3 additions & 2 deletions Client/objects/oClient/oclient.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Client/objects/oDualInstance/oDualInstance.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Client/objects/oEntity/CleanUp_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// @desc

if (variable_struct_exists(global.instance_uuids, self.uuid)) {
variable_struct_remove(global.instance_uuids, self.uuid)
}
1 change: 1 addition & 0 deletions Client/objects/oEntity/oEntity.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Client/objects/oEntityManager/oEntityManager.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Client/objects/oPingManager/oPingManager.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6f9518c

Please sign in to comment.