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 |
|
Alam Ed Arias
|
0c49144c72
|
Merge branch 'master' into udmf-texture-scaling
|
2023-10-28 21:35:35 -04:00 |
|
Alam Ed Arias
|
bdc4512565
|
Merge branch 'master' into quake-fix
|
2023-10-28 21:02:44 -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 |
|
LJ Sonic
|
8608ded317
|
Add deprecation TODOs
|
2023-10-28 15:19:35 +02:00 |
|
LJ Sonic
|
c0146744b7
|
Normalise 2.3-related TODO comments
|
2023-10-28 14:46:10 +02:00 |
|
LJ Sonic
|
c3f79a112f
|
Add LUA_SetCFunctionField
|
2023-10-28 11:06:30 +02:00 |
|
LJ Sonic
|
d1dbdee016
|
Refactor global userdata registration
|
2023-10-28 00:24:04 +02:00 |
|
LJ Sonic
|
7a7d4f832a
|
Remove stupid whitespace
|
2023-10-27 21:34:53 +02:00 |
|
LJ Sonic
|
bc9a378521
|
Refactor userdata metatable registration
|
2023-10-27 20:17:27 +02:00 |
|
LJ Sonic
|
4fa4d6e076
|
Implement input.ignoregameinputs
|
2023-10-27 17:34:29 +02:00 |
|
LJ Sonic
|
23268bf3e5
|
Move input-related Lua variables into the library
|
2023-10-27 16:29:47 +02: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
|
26f978a905
|
Merge branch 'next' into platformpmomz
|
2023-10-25 15:07:49 -04:00 |
|
Alam Ed Arias
|
45a1b6be18
|
Merge branch SRB2:next into expos-sphere
|
2023-10-25 19:02:14 +00:00 |
|
Alam Ed Arias
|
15d476e3e6
|
Merge branch SRB2:next into expos-dust
|
2023-10-25 18:55:40 +00:00 |
|
Alam Ed Arias
|
b3ba4210d9
|
Merge branch SRB2:next into expos-sky
|
2023-10-25 18:55:00 +00:00 |
|
Alam Ed Arias
|
bc2f2b8d2a
|
Merge branch SRB2:next into expos-follow
|
2023-10-25 18:34:25 +00:00 |
|
Alam Ed Arias
|
b75a09bfcf
|
Merge branch SRB2:next into expos-special
|
2023-10-25 18:31:51 +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 |
|
Alam Ed Arias
|
52a295d6f7
|
Merge branch SRB2:next into add-auto-kick-idle-players
|
2023-10-23 18:29:59 +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 |
|