Merge branch 'develop' into server-develop

7 jobs for server-develop in 4 minutes and 13 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #143963
linux
mat_common

00:00:10

passed #143965
linux
mat_linux

00:00:40

passed #143964
linux
mat_submodules

00:00:45

passed #143966
linux
mat_windows

00:00:20

 
  Build
passed #143969
linux
exec_debian

00:01:35

failed #143968
linux
exec_linux

00:01:51

passed #143967
vs
exec_windows

00:01:35

 
Name Stage Failure
failed
exec_linux Build
      | ^
../gframe/game.cpp:34:15: note: to match this '{'
34 | namespace ygo {
| ^
make[1]: *** [ygopro.make:142: ../obj/Release/ygopro/game.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:57: ygopro] Error 2
Cleaning up project directory and file based variables
ERROR: Job failed: exit code 1