Alam Ed Arias
|
dfd05c6172
|
Merge branch 'master' into next
|
2023-11-01 11:37:28 -04:00 |
|
Krabs
|
6812a41b6d
|
Merge branch 'expos-sphere' into 'next'
Expose P_GivePlayerSpheres to Lua
See merge request STJr/SRB2!1996
|
2023-11-01 15:31:23 +00:00 |
|
Alam Ed Arias
|
7643ffadbc
|
Update .gitlab-ci.yml file
Limit builds to just "Windows x86" and "Debian stable:amd64", all other builds can be started manually
|
2023-11-01 15:13:40 +00:00 |
|
Krabs
|
93c5b34ac0
|
Merge branch SRB2:next into expos-sphere
|
2023-11-01 14:14:16 +00:00 |
|
Krabs
|
cec5338f7c
|
Merge branch 'lua-minmax-plus-bruh-moments' into 'next'
Fix bugs with preset values in lua cvars
See merge request STJr/SRB2!1484
|
2023-10-31 05:36:56 +00:00 |
|
Alam Ed Arias
|
419925036b
|
Merge remote-tracking branch 'origin/next' into lua-minmax-plus-bruh-moments
|
2023-10-30 22:44:44 -04:00 |
|
Monster Iestyn
|
6976f8524d
|
Merge branch 'expose-thrust-funcs-to-lua' into 'next'
Expose more thrust functions to Lua
See merge request STJr/SRB2!1493
|
2023-10-30 21:23:38 +00:00 |
|
Monster Iestyn
|
165a925220
|
Merge branch SRB2:next into expose-thrust-funcs-to-lua
|
2023-10-30 18:10:21 +00:00 |
|
Krabs
|
d6a0006b75
|
Merge branch 'combine-dupx-and-dupy' into 'next'
Combine vid.dupx and vid.dupy
See merge request STJr/SRB2!1118
|
2023-10-30 04:38:52 +00:00 |
|
Zwip-Zwap Zapony
|
cd6cd53959
|
Combine vid.dupx and vid.dupy
|
2023-10-30 04:38:51 +00:00 |
|
Krabs
|
d37a0a944d
|
Merge branch 'blue-spring-balls' into 'next'
Blue spring balls
See merge request STJr/SRB2!1282
|
2023-10-30 04:37:00 +00:00 |
|
Logan Arias
|
2dcf845c7c
|
Merge branch SRB2:next into blue-spring-balls
|
2023-10-29 18:23:50 +00:00 |
|
Krabs
|
f3c2fb50d7
|
Merge branch 'leaderofthechaotix' into 'next'
Possible fix for Leader of the Chaotix bug (credit Zwip Zwap Zapony)
Closes #1135
See merge request STJr/SRB2!2183
|
2023-10-29 17:43:40 +00:00 |
|
katsy
|
340d515754
|
Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony)
|
2023-10-29 17:43:40 +00:00 |
|
Monster Iestyn
|
512839453b
|
Merge branch 'fix-opengl-saturation' into 'next'
Fix saturation not being applied on colormaps in OpenGL
Closes #920
See merge request STJr/SRB2!2151
|
2023-10-29 16:37:35 +00:00 |
|
Monster Iestyn
|
962b1cb29e
|
Merge branch 'fix-opengl-saturation-console' into 'next'
Fix saturation not being applied on console on OpenGL
See merge request STJr/SRB2!2149
|
2023-10-29 16:37:24 +00:00 |
|
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 |
|
Alam Ed Arias
|
97e449bd59
|
Merge branch 'master' into lua-minmax-plus-bruh-moments
|
2023-10-28 22:29:19 -04: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 |
|
Alam Ed Arias
|
3ef47897e3
|
Merge branch SRB2:next into expose-thrust-funcs-to-lua
|
2023-10-25 19:42:15 +00:00 |
|
Alam Ed Arias
|
f5859c3480
|
Merge branch SRB2:next into blue-spring-balls
|
2023-10-25 19:41:36 +00:00 |
|
Alam Ed Arias
|
45a1b6be18
|
Merge branch SRB2:next into expos-sphere
|
2023-10-25 19:02:14 +00:00 |
|
Alam Ed Arias
|
5a12d65150
|
Merge branch SRB2:next into fix-opengl-saturation
|
2023-10-23 18:37:40 +00:00 |
|
Alam Ed Arias
|
a4dc67cba7
|
Merge branch SRB2:next into fix-opengl-saturation-console
|
2023-10-23 18:36:50 +00: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 |
|