Commit graph

14968 commits

Author SHA1 Message Date
Alam Ed Arias
d0cb7707e3 Merge branch SRB2:next into thokking-hell 2023-10-25 19:40:02 +00:00
Alam Ed Arias
f3ad50e654 Merge branch SRB2:next into drawfill-transparency 2023-10-25 19:24:23 +00:00
Alam Ed Arias
277b64f290 Merge branch 'next' into bustablemobjzfix 2023-10-25 15:08:22 -04:00
Alam Ed Arias
26f978a905 Merge branch 'next' into platformpmomz 2023-10-25 15:07:49 -04:00
Alam Ed Arias
f2fa2505cd Merge branch SRB2:next into native-keyboard-layout-support 2023-10-25 19:05:06 +00:00
Alam Ed Arias
43e8e42e09 Merge branch SRB2:next into static-void-drawstaticbox 2023-10-25 19:04:49 +00:00
Alam Ed Arias
45a1b6be18 Merge branch SRB2:next into expos-sphere 2023-10-25 19:02:14 +00:00
Alam Ed Arias
ebd355e563 Merge branch SRB2:next into expos-local 2023-10-25 18:57:35 +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
79aaf3e613 Merge branch SRB2:next into perfstats-thinkframes 2023-10-25 18:34:06 +00:00
Alam Ed Arias
b75a09bfcf Merge branch SRB2:next into expos-special 2023-10-25 18:31:51 +00:00
Alam Ed Arias
e368f95f3a Merge branch SRB2:next into custom-2.2.10 2023-10-25 18:31:28 +00:00
Alam Ed Arias
3f29140ecb Merge branch SRB2:next into fix-segfault-polyvertex-null 2023-10-25 18:21:13 +00:00
Alam Ed Arias
e3250b460d Merge branch SRB2:next into devmode-hudlines 2023-10-25 18:19:01 +00:00
Alam Ed Arias
9b1374359b Merge branch SRB2:next into interpolate-shield-spawning 2023-10-25 18:12:55 +00:00
Alam Ed Arias
1590f2a6f8 Merge branch 'master' into fix-sprite-clip-warning 2023-10-25 14:10:47 -04:00
Alam Ed Arias
e5d16e7112 Merge branch SRB2:next into setflip 2023-10-25 18:05:24 +00:00
Alam Ed Arias
59fc021d97 Merge branch 'next' into renderhitbox-nightsitems 2023-10-25 14:03:23 -04:00
Alam Ed Arias
67b6172f82 Merge branch SRB2:next into pit-savior 2023-10-25 18:01:12 +00:00
Alam Ed Arias
fd41bf188d sidenum[0] is an uint32_t, not uint16_t 2023-10-25 12:16:10 -04:00
Alam Ed Arias
ec1b629609 spriteframe_t only gave 1D array, not 2D for rotated 2023-10-25 08:00:04 -04:00
Alam Ed Arias
229d0364d4 Fixed lookup sides for 32-bit systems 2023-10-25 07:40:55 -04:00
Alam Ed Arias
9d650b0ddc Makefile: add lua_colorlib.c 2023-10-25 07:27:35 -04:00
Alam Ed Arias
dea519637a Merge branch 'next' into lua-extracolormap 2023-10-23 14:49:44 -04:00
Alam Ed Arias
955d54e11e Merge branch 'next' into mapcommand 2023-10-23 14:49:02 -04:00
Alam Ed Arias
b9dddfbb23 Merge branch 'next' into raise-side-limits 2023-10-23 14:47:25 -04:00
Alam Ed Arias
bd9aa75f8a Merge branch 'next' into kill-hud-feetoffset 2023-10-23 14:45:49 -04:00
Alam Ed Arias
ffbe5dba15 Merge branch 'next' into fix-ungrabbed-keydown 2023-10-23 14:44:34 -04: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
41fbfda870 Merge branch SRB2:next into fix-line-415-buffer-overflow 2023-10-23 18:32:41 +00:00
Alam Ed Arias
52a295d6f7 Merge branch SRB2:next into add-auto-kick-idle-players 2023-10-23 18:29:59 +00:00
Alam Ed Arias
d1fb9e191a Merge branch SRB2:next into configurable-spam-protection 2023-10-23 18:29:32 +00:00
Alam Ed Arias
41dc39630e Merge branch SRB2:next into exitfix 2023-10-23 18:26:53 +00:00
Alam Ed Arias
80a227d719 Merge branch SRB2:next into fix-pointtodist-negative-abs 2023-10-22 23:22:51 +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
LJ Sonic
9f116c7c9e Fix mouse events not being fired when the mouse is ungrabbed 2023-10-18 16:50:06 +02: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