gas -> aether; fix tests

unnatural-worlds · Dec 10, 2023 · 7a6cb61 · 7a6cb61
1 parent 247b88c
commit 7a6cb61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,9 +8,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os-version: [2019]
-        build-config: [debug, relwithdebinfo]
-        build-arch: [Win32, x64]
+        os-version: [2022]
+        build-config: [debug, release, relwithdebinfo]
+        build-arch: [x64]
 
     steps:
     - name: Versions
@@ -53,17 +53,17 @@ jobs:
       fail-fast: false
       matrix:
         os-version: [22]
-        build-config: [debug, relwithdebinfo]
+        build-config: [debug, release, relwithdebinfo]
         compiler:
         - {
             cc: gcc-13,
             cxx: g++-13,
             install: gcc-13 g++-13
           }
         - {
-            cc: clang,
-            cxx: clang++,
-            install: clang
+            cc: clang-15,
+            cxx: clang++-15,
+            install: clang-15
           }
 
     steps:

diff --git a/doodads/ores/gas.doodad → doodads/ores/aether.doodad b/doodads/ores/gas.doodad → doodads/ores/aether.doodad
@@ -1,6 +1,6 @@
 [doodad]
 package = unnatural/base/ores/ores.pack
-prototype = unnatural/base/ores/gas_deposit.proto
+prototype = unnatural/base/ores/aether_deposit.proto
 
 [generating]
 count = 3

diff --git a/externals/cage b/externals/cage
+7 −22		.github/workflows/tests.yml
+61 −82		data/cage/shader/engine/fragment.glsl
+10 −4		data/cage/shader/engine/uniforms.glsl
+2 −1		data/cage/shader/functions/attenuation.glsl
+4 −2		sources/.clang-format
+0 −6		sources/CMakeLists.txt
+1 −6		sources/include/cage-core/core.h
+23 −23		sources/include/cage-core/math.h
+1 −1		sources/include/cage-core/networkGinnel.h
+9 −0		sources/include/cage-core/networkSteam.h
+1 −1		sources/include/cage-core/process.h
+0 −19		sources/include/cage-core/sourceLocationDummy.h
+1 −0		sources/include/cage-engine/guiManager.h
+5 −5		sources/include/cage-engine/scene.h
+4 −4		sources/include/cage-engine/shaderConventions.h
+1 −0		sources/include/cage-simple/guiInWorld.h
+12 −3		sources/libcore/concurrent/process.cpp
+9 −9		sources/libcore/geometry/aabbCone.cpp
+4 −0		sources/libcore/math/vectors.cpp
+19 −5		sources/libcore/network/steam.cpp
+132 −87		sources/libengine/graphics/renderPipeline.cpp
+1 −1		sources/libengine/gui/gui.cpp
+1 −0		sources/libengine/gui/private.h
+3 −0		sources/libengine/gui/tooltips.cpp
+2 −2		sources/libengine/sound/speaker.cpp
+1 −0		sources/libsimple/guiInWorld.cpp
+0 −4		sources/test-core/exceptions.cpp
+5 −1		sources/test-core/networkSteam.cpp
+2 −2		sources/test-core/pointerRange.cpp
+0 −7		sources/tryCompileSourceLocation.cpp