Commit graph

15975 commits

Author SHA1 Message Date
SSNTails
53c6e65fd2 Merge branch 'issue1062' of https://git.do.srb2.org/SSNTails/SRB2 into issue1062 2024-05-29 21:18:42 -04:00
SSNTails
19736fa55e possibly more valid...? 2024-05-29 21:18:36 -04:00
SSNTails
5fe927038c Merge branch SRB2:next into issue1062 2024-05-29 21:42:28 +00:00
SSNTails
a2bba687ba Don't break automatic mode. 2024-05-29 17:19:49 -04:00
pastel
712414817b also fix ticcmd intro crash 2024-05-28 13:51:29 -05:00
pastel
db40279fdb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into nostickztarget 2024-05-28 13:31:42 -05:00
Zwip-Zwap Zapony
b1f15a35ba Use a three-option menu instead of a yes/no prompt 2024-05-28 14:25:30 +02:00
Zwip-Zwap Zapony
c53da609b1 Shield button prompt for old configs 2024-05-28 14:17:57 +02:00
LJ Sonic
1ba9ecf027 Add missing newline in console warning 2024-05-26 17:51:48 +02:00
LJ Sonic
3b14531dc2 Fix spriteinfo indexing 2024-05-26 17:51:20 +02:00
Hanicef
19500742d2 Avoid updating IPv4 MS entry if it failed to register 2024-05-26 13:00:16 +02:00
kaldrum1
b7fdcdf2b2 fix spr2defaults pretty sure 2024-05-25 20:49:29 -07:00
kaldrum1
92fc592966 fix spr2defaults probably 2024-05-25 20:08:43 -07:00
Hanicef
72f2942929 Fix players not rendering on team scoreboards 2024-05-25 18:04:49 +02:00
Lactozilla
813c609c5f Fix repeatcnt data type mistake in UDMF specification 2024-05-23 01:32:13 -03:00
Lactozilla
341139ea73 Scale the vertical offsets 2024-05-22 23:37:31 -03:00
Lactozilla
6e4eb6292f Merge branch 'next' into fix-1248 2024-05-22 23:16:49 -03:00
sphere
a75fbd229e Merge branch 'fix-ctrl+backspace-in-console' into 'next'
Fix Ctrl+Backspace in the console causing a crash

See merge request STJr/SRB2!2437
2024-05-22 11:25:07 +00:00
sphere
593ffd2435 Merge branch 'fix-linedef-type-466' into 'next'
Fix Linedef type 466

Closes #1246

See merge request STJr/SRB2!2453
2024-05-22 11:21:42 +00:00
sphere
d6df06949d Merge branch 'fix-1222' into 'next'
Fix #1222

Closes #1222

See merge request STJr/SRB2!2448
2024-05-22 11:20:06 +00:00
sphere
a5e89ea032 Merge branch 'flats-as-texpatch-overlap' into 'next'
Fix composite "flats as patch" name overlap crash

See merge request STJr/SRB2!2450
2024-05-22 11:16:07 +00:00
sphere
418671863c Merge branch 'fix-us-intl-console-key' into 'next'
Fix keyboard input when certain keys overlap with dead keys

Closes #1174

See merge request STJr/SRB2!2443
2024-05-22 11:14:57 +00:00
Lactozilla
36395bfaac Copy the flags of the reference slope 2024-05-20 20:25:42 -03:00
Lactozilla
3fb5907eff Add slope data to lines 2024-05-20 20:10:49 -03:00
Lactozilla
3d4c9eedf8 Revert "Improve slope physics on solid middle textures"
This reverts commit e67e225ff2.
2024-05-20 20:10:34 -03:00
Lactozilla
6bf58ce870 Revert "Add comments"
This reverts commit 3a09c475c7.
2024-05-20 20:10:25 -03:00
Refrag
68264e7288
Fix buffer overflow when setting a NETVAR string CVar
There was a possible buffer overflow if you tried setting a console var
that had the CV_NETVAR and that was of the string type.
The overflow would happen if you were trying to set the console variable
while in a multiplayer / netgame state.

This commit just increases the size of buf to account for everything
that needs to be written to it.
2024-05-20 10:55:10 +02:00
Lactozilla
0186e5bce5 Fix a mistake 2024-05-20 02:54:45 -03:00
Lactozilla
4502e67f0f Ignore flats when loading patches 2024-05-20 02:48:38 -03:00
MIDIMan
a19f843a3e Implement Lactozilla's suggestions and add 3D model support 2024-05-19 22:21:09 -04:00
Lactozilla
3a09c475c7 Add comments 2024-05-19 22:53:00 -03:00
MIDIMan
7c937a5dc0 Merge branch SRB2:next into mobj-alpha 2024-05-20 01:26:33 +00:00
Lactozilla
e67e225ff2 Improve slope physics on solid middle textures 2024-05-19 20:40:40 -03:00
Lactozilla
3a62ebbe3e Set correct slope for solid midtextures 2024-05-19 18:56:14 -03:00
Lactozilla
464072d7af Fix Linedef type 466 2024-05-19 16:24:03 -03:00
Lactozilla
27e1ee710c Fix #1248 2024-05-19 15:28:55 -03:00
Sally Coolatta
619cf708a1 Fix composite "flats as patch" name overlap crash 2024-05-19 03:57:07 -04:00
Refrag
ccadfd8157
Fix mouse buttons not working in menus with alwaysgrabmouse on
This commit fixes #1257 by reintroducing something left out in commit
9f116c7c9e. From my testing, it looks
look the behavior is the exact same regarding the lua hook script that
the original commit was fixing (#879).
2024-05-19 09:08:00 +02:00
Lactozilla
d90c2ac4b4 Fix #1222 2024-05-19 01:43:02 -03:00
Lactozilla
b3418cd685 Fix #523 2024-05-19 01:29:54 -03:00
Eidolon
47bcad4ab1 Put the apt-cache in build/
Like with ccache, we want to make sure the git checkout is considered
clean during build.
2024-05-17 19:04:41 -05:00
Eidolon
e2c7514cfd Put ccache dirs in build dir to avoid dirty worktree
Placing these directories at the root will make the git revision
detection consider the working directory to be dirty.
2024-05-17 19:00:36 -05:00
Eidolon
01aa8cb0b4 Make pipelines auto-interruptible by default
Fixes: KartKrew/Kart#1405
2024-05-17 16:40:11 -05:00
Eidolon
f36f2fa07d Set CI shallow clone depth to 20 2024-05-17 16:39:39 -05:00
Eidolon
997fcc9aa4 Use default GIT_STRATEGY in CI
The "clone" strategy clones the entire repository, which takes
a significant amount of time. It's not needed, because the default
"fetch" strategy will reuse the executor's local clone and clean it
before the job scripts run.
2024-05-17 16:39:34 -05:00
Eidolon
0f705fdb43 Expire artifacts after 1 days by default
There's no need to let these artifacts pile up since the only ones that
will be relevant to non-programmers are the latest from any given ref.
2024-05-17 16:39:29 -05:00
Eidolon
0e293c4c98 Raise ccache limit to 300M
Ring Racers' object file output is considerably larger than SRB2.
50M is insufficient to hold even a single build.
2024-05-17 16:39:24 -05:00
Eidolon
dfada161cc Separate gitlab CI into multiple yaml documents
The singular .gitlab-ci.yml is pretty beefy. Splitting it into
smaller files by job and job template will make maintaining the
individual jobs easier.
2024-05-17 16:38:01 -05:00
Lactozilla
c2b57e2654 Merge branch 'fffffop2' into 'next'
Fix backwards compat for SPR2 Super (resolves #1225)

Closes #1225

See merge request STJr/SRB2!2410
2024-05-14 02:07:11 +00:00
katsy
509df21f25 Fix backwards compat for SPR2 Super (resolves #1225) 2024-05-14 02:07:11 +00:00