Skip to content

Commit 38f5005

Browse files
committed
Merge branch 'real-master' into granito-fixes
2 parents a3d18c8 + 6376c05 commit 38f5005

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+5480
-3947
lines changed

.github/workflows/bsd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
matrix:
3333
# TODO: Add the OpenBSD, NetBSD and Solaris VMs whenever possible
3434
vm_os: [freebsd]
35-
build_type: [Debug, RelWithDebInfo]
35+
build_type: [Debug, Release]
3636
# FreeBSD does not have glbinding
3737
# glbiactions/checkout@v4
3838

.github/workflows/gnulinux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
arch: [32, 64]
3535
os: [ubuntu-20.04]
3636
compiler: [gcc, clang]
37-
build_type: [Debug, RelWithDebInfo]
37+
build_type: [Debug, Release]
3838
glbinding: [ON, OFF]
3939
exclude:
4040
- arch: 32
4141
glbinding: ON
4242
include:
4343
- os: ubuntu-20.04
44-
build_type: RelWithDebInfo
44+
build_type: Release
4545
compiler: gcc
4646
arch: 64
4747
glbinding: OFF

.github/workflows/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
os: [macos-12]
35-
build_type: [Debug, RelWithDebInfo]
35+
build_type: [Debug, Release]
3636
glbinding: [ON, OFF]
3737
include:
3838
- os: macos-12
39-
build_type: RelWithDebInfo
39+
build_type: Release
4040
glbinding: OFF
4141
release: ON
4242

.github/workflows/ubuntu-touch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
build_type: [Debug, RelWithDebInfo]
33+
build_type: [Debug, Release]
3434
arch: [amd64, arm64, armhf]
3535
# glbinding is missing as it isn't available on Ubuntu 16.04
3636
opengl: [glew, sdl]

.github/workflows/wasm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
build_type: ["RelWithDebInfo", "Debug"]
33+
build_type: ["Release", "Debug"]
3434

3535
runs-on: ubuntu-latest
3636
steps:

.github/workflows/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
arch: [x64, x86]
35-
build_type: [Debug, RelWithDebInfo]
35+
build_type: [Debug, Release]
3636
glbinding: [OFF] # [ON, OFF] # FIXME: Fix Windows glbinding builds
3737
include:
38-
- build_type: RelWithDebInfo
38+
- build_type: Release
3939
arch: x64
4040
glbinding: OFF
4141
release: ON
42-
- build_type: RelWithDebInfo
42+
- build_type: Release
4343
arch: x86
4444
glbinding: OFF
4545
release: ON

data/images/decal/retro/picnic.png

18.6 KB
Loading

data/levels/misc/menu_retro.stl

+427
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)