Skip to content

Commit 9368762

Browse files
committed
Merge branch 'development' into browncoat-mission
2 parents f1e2a94 + afddaa8 commit 9368762

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- name: Update tag pointing to the previous nightly release
128128
if: steps.check_nightly.outputs.release_exists
129129
run: |
130-
curl -X PATCH \
130+
curl --fail-with-body -X PATCH \
131131
-H "Authorization: Bearer ${{ secrets.WORKFLOW_TOKEN }}" \
132132
-H "Accept: application/vnd.github.v3+json" \
133133
https://api.github.com/repos/${{ github.repository }}/git/refs/tags/${{ env.PREV_TAG }} \

Source/Managers/LuaMan.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ void LuaStateWrapper::Initialize() {
4444
{LUA_STRLIBNAME, luaopen_string},
4545
{LUA_MATHLIBNAME, luaopen_math},
4646
{LUA_DBLIBNAME, luaopen_debug},
47+
{LUA_BITLIBNAME, luaopen_bit},
4748
{LUA_JITLIBNAME, luaopen_jit},
4849
{NULL, NULL} // End of array
4950
};

Source/Managers/MovableMan.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,12 +1368,12 @@ void MovableMan::Update() {
13681368

13691369
{
13701370
auto actorsSeeFuture = g_ThreadMan.GetPriorityThreadPool().parallelize_loop(m_Actors.size(),
1371-
[&](int start, int end) {
1372-
ZoneScopedN("Actors See");
1373-
for (int i = start; i < end; ++i) {
1374-
m_Actors[i]->CastSeeRays();
1375-
}
1376-
});
1371+
[&](int start, int end) {
1372+
ZoneScopedN("Actors See");
1373+
for (int i = start; i < end; ++i) {
1374+
m_Actors[i]->CastSeeRays();
1375+
}
1376+
});
13771377

13781378
{
13791379
ZoneScopedN("Actors Update");

0 commit comments

Comments
 (0)