Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into scriptloading-ov…
Browse files Browse the repository at this point in the history
…erhaul

# Conflicts:
#	Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua
  • Loading branch information
TBN-MapleWheels committed Sep 6, 2023
2 parents 602d8b8 + 711b745 commit 4bfe0e3
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/harden-ci-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
with:
ref: ${{ inputs.target }}
- name: Ensure all actions are pinned to a specific commit
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@555a30da2656b4a7cf47b107800bef097723363e # v2.1.3
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@f32435541e24cd6a4700a7f52bb2ec59e80603b1 # v2.1.4
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
done
- name: Publish release
uses: notpeelz/action-gh-create-release@a12edfc71daf5daa7922b931c28e2bf88d3b2ced # v5.0.0
uses: notpeelz/action-gh-create-release@c1bebd17c8a128e8db4165a68be4dc4e3f106ff1 # v5.0.1
with:
target: ${{ inputs.target }}
tag: ${{ inputs.tag }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private void ReadIds(IReadMessage netMessage)
{
if (netReceives.ContainsKey(name))
{
netReceives[name](netMessage, null);
netReceives[name](queueMessage, null);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public void CheckInitialize()
if (GameMain.Client.IsServerOwner)
{
new GUIMessageBox("", "You have CSharp mods enabled but don't have the Cs For Barotrauma package enabled, those mods might not work.");
Initialize();
return;
}

Expand Down
14 changes: 9 additions & 5 deletions luacs-docs/lua/lua/Networking.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ Networking.FileSenderMaxPacketsPerUpdate = 4
-- @realm server
Networking.LastClientListUpdateID = 0

--- Send a post HTTP Request, callback is called with an argument result string.
-- @realm server
--- Send a GET HTTP Request, callback is called with the result string message, status code and headers. only url anda callback are optional.
-- @realm shared
function Networking.HttpGet(url, callback, textData, contentType) end

--- Send a get HTTP Request, callback is called with an argument result string.
-- @realm server
function Networking.HttpPost(url, callback) end
--- Send a POST HTTP Request, callback is called with the result string message, status code and headers.
-- @realm shared
function Networking.HttpPost(url, callback, textData, contentType) end

--- Sends a HTTP Request, callback is called with the result string message, status code and headers. If savePath is specified, the result will be saved as binary format in the specified path. only url and callback are optional.
-- @realm shared
function Networking.HttpRequest(url, callback, data, method, contentType, headers, savePath) end

--- Creates a new net message, returns an IWriteMessage
-- @treturn IWriteMessage netMessage
Expand Down

0 comments on commit 4bfe0e3

Please sign in to comment.