Commit graph

14521 commits

Author SHA1 Message Date
Monster Iestyn
e825a93add Merge branch 'nononet' into 'next'
Revert "Merge branch 'master' into next"

See merge request STJr/SRB2!2187
2023-10-29 16:19:16 +00:00
Alam Ed Arias
b4ba90b29d Merge branch 'master' into next 2023-10-29 08:47:28 -04:00
Alam Ed Arias
bea48012c4 Merge branch 'musl' into 'master'
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2186
2023-10-29 05:16:34 +00:00
Alam Ed Arias
18f61ab90c Update .gitlab-ci.yml file
Add ARM64=1 for arm build
2023-10-29 05:14:48 +00:00
katsy
b658a9629e Revert "Merge branch 'master' into next"
This reverts commit b26cf5248f, reversing
changes made to a68440c4db.
2023-10-28 16:16:17 -05:00
Alam Ed Arias
b26cf5248f Merge branch 'master' into next 2023-10-28 16:42:54 -04:00
Alam Ed Arias
86d7c9862c Update .gitlab-ci.yml file
Now, try compiling with musl on Debian testing
2023-10-28 16:20:49 +00:00
Alam Ed Arias
f705e53826 GitLab CI: try compiling with dummy interface with musl 2023-10-28 11:49:26 -04:00
Logan Arias
ae783f0129 Merge branch 'tb-nonet' into 'master'
Disable libcurl when building without network support

See merge request STJr/SRB2!2182
2023-10-22 16:21:37 +00:00
Logan Arias
6fac101cbe Disable libcurl when building without network support 2023-10-22 11:49:23 -04:00
Alam Ed Arias
a68440c4db Merge branch 'master' into next 2023-10-22 11:14:13 -04:00
Alam Ed Arias
662e1e0623 Merge branch 'dummy' into 'master'
dummy: fixup warnings

See merge request STJr/SRB2!2181
2023-10-22 15:13:36 +00:00
Alam Ed Arias
610fd76edb dummy: fixup warnings 2023-10-22 11:09:58 -04:00
Alam Ed Arias
2bbbf7d1f8 Merge branch 'fix-freebsd-build-again' into 'master'
Fix FreeBSD build errors (again)

See merge request STJr/SRB2!2179
2023-10-20 21:07:42 +00:00
Gustaf Alhäll
b544c4202a
Fix FreeBSD build errors (again) 2023-10-20 17:37:32 +02:00
Alam Ed Arias
b86e77e58a Merge branch 'master' into next 2023-10-20 09:07:43 -04:00
Alam Ed Arias
981b2029aa Merge branch 'gitlab-ci' into 'master'
GitLab CI: More work

See merge request STJr/SRB2!2180
2023-10-20 13:03:52 +00:00
Alam Ed Arias
eb38267823 GitLab CI: More work 2023-10-20 13:03:52 +00:00
Alam Ed Arias
4196252ea9 Merge branch 'master' into next 2023-10-17 09:12:50 -04:00
Alam Ed Arias
70746a949d Merge branch 'gitlab-ci' into 'master'
Update .gitlib-ci.yml

See merge request STJr/SRB2!2177
2023-10-17 13:11:18 +00:00
Alam Ed Arias
265c1ac0c8 Update .gitlib-ci.yml 2023-10-17 13:11:17 +00:00
Alam Ed Arias
bc26d72528 Merge branch 'master' into next 2023-10-16 21:43:29 -04:00
Alam Ed Arias
efe8becd37 Merge branch 'gitlab-ci' into 'master'
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2176
2023-10-17 01:41:43 +00:00
Alam Ed Arias
330b10cbb5 Update .gitlab-ci.yml file 2023-10-17 01:41:43 +00:00
Alam Ed Arias
0cc6c13dde Merge branch 'gitlabcirunnertest' into 'next'
CI bot for Linux and Windows builds

See merge request STJr/SRB2!2173
2023-10-16 04:32:24 +00:00
Alam Ed Arias
33f6deb7f0 Update sc/netcode/commands.c
'i' variable is set but unused in Ban_Load_File()
2023-10-15 23:57:00 -04:00
Alam Ed Arias
a60ac0508f Merge remote-tracking branch 'origin/next' into gitlabcirunnertest 2023-10-15 21:43:35 -04:00
Alam Ed Arias
538dfe072b Merge branch 'gitlabcirunnertest' into 'master'
CI bot for Linux and Windows builds

See merge request STJr/SRB2!2172
2023-10-16 01:39:51 +00:00
Alam Ed Arias
2865873e70 Update src/lua_baselib.c
No need of counting bots.
2023-10-15 20:35:33 -04:00
Alam Ed Arias
de4a8a193b Update src/d_clisrv.c
Remove unused i var in Ban_Load_File()
2023-10-15 20:35:33 -04:00
Alam Ed Arias
6a37b3c0c6 Update src/hardware/mw_model.c
Restore old code in GeneratePolygonNormals(), add TODO
2023-10-15 20:35:33 -04:00
Alam Ed Arias
4bec143427 Update .gitlab-ci.yml file
Do not care for non-prototypes for clang-testing job
2023-10-15 23:42:27 +00:00
Alam Ed Arias
b27de309a8 Update .gitlab-ci.yml file
Testing compiling with Debian's testing clang package
2023-10-15 20:32:11 +00:00
Alam Ed Arias
976a2850af Update .gitlab-ci.yml file
change name of artifact for clang build
2023-10-15 16:02:27 -04:00
Alam Ed Arias
1372b60db9 Update src/hardware/mw_md2.c
there are 2 more name buffers that need to be bigger
2023-10-15 16:00:25 -04:00
Alam Ed Arias
b6aaf582d1 Update src/hardware/mw_md2.c
fscanf need 26 chars in the name buffer
2023-10-15 15:29:51 -04:00
Alam Ed Arias
6c19fcc607 Update .gitlab-ci.yml file
Try compiling with clang
2023-10-15 18:56:06 +00:00
Alam Ed Arias
bc852fa099 remove unused variables that was only set 2023-10-15 14:34:53 -04:00
Alam Ed Arias
aaebcc6ce1 Update src/hardware/hw_batching.c
fix misleading indentation
2023-10-15 14:24:20 -04:00
Alam Ed Arias
35f57882e4 signalhandlers are function of NORETURN 2023-10-15 14:16:13 -04:00
Alam Ed Arias
aa21dcad33 Update .gitlab-ci.yml file
Try to hide echos
2023-10-15 17:50:45 +00:00
Alam Ed Arias
3adc15d521 Update .gitlab-ci.yml file
Only need to setup debconf in before_script
2023-10-15 17:30:07 +00:00
Alam Ed Arias
b8861b1912 Update .gitlab-ci.yml file
Let see if I need to need to run export again in the main build script
2023-10-15 17:11:44 +00:00
Alam Ed Arias
595ce3e225 Update .gitlab-ci.yml file
Update Debian image
2023-10-15 16:08:15 +00:00
Alam Ed Arias
8ace36efbf Update .gitlab-ci.yml file
Try to list packages that can be upgraded
2023-10-15 14:44:17 +00:00
Alam Ed Arias
de7f0cba1b Update .gitlab-ci.yml file
Can not set CCACHE=1 in shell env
2023-10-15 04:55:29 +00:00
Alam Ed Arias
4904177312 Update .gitlab-ci.yml file
Move the exports to variables section
2023-10-15 04:34:39 +00:00
Alam Ed Arias
50d8cb4c00 Update .gitlab-ci.yml file
hide ccache statistics
2023-10-14 21:08:13 +00:00
Alam Ed Arias
c74711fefa Update .gitlab-ci.yml file
section off ccache output
2023-10-14 19:51:11 +00:00
Alam Ed Arias
dee306c58b Update .gitlab-ci.yml file
I need to make the .ccache folder
2023-10-14 15:25:04 +00:00