Commit graph

14531 commits

Author SHA1 Message Date
sphere
1c4419ee56 Merge branch 'fix-minecart-debug-build' into 'next'
Fix memory leak when other players are riding a minecart

See merge request STJr/SRB2!2146
2023-09-20 15:26:41 +00:00
sphere
e15326081b Merge branch 'fix-cmake-compiling' into 'next'
Fix CMake Compiling

Closes #1116

See merge request STJr/SRB2!2157
2023-09-20 15:20:07 +00:00
Zwip-Zwap Zapony
cfedee9dc9 Fix CMake compiling 2023-09-19 18:46:05 +02:00
Lactozilla
6deaf89f72 Merge branch 'fix-minor-spelling-mistakes' into 'next'
Fix minor spelling mistake

See merge request STJr/SRB2!2154
2023-09-19 05:07:45 +00:00
Lactozilla
68e25737c0 Fix minor spelling mistake 2023-09-18 18:51:11 -03:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next'
Re-delete netcode

See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Gustaf Alhäll
fc20508295
Fix saturation not being applied on colormaps in OpenGL 2023-09-18 18:16:10 +02:00
Gustaf Alhäll
b53b2df7ee
Fix saturation option not being applied on OpenGL 2023-09-17 22:48:26 +02:00
LJ Sonic
8f1618018e Fix free 2023-09-15 19:12:55 +02:00
Gustaf Alhäll
65547ae036
Fix memory leak when other players are riding a minecart 2023-09-14 18:31:05 +02:00
sphere
f02fd19c5a Merge branch 'team-gametype-keep-player-color' into 'next'
Respect the player's skin and color selection

See merge request STJr/SRB2!2100
2023-09-13 07:59:00 +00:00
Alam Ed Arias
6caff62662 Merge remote-tracking branch 'origin/master' into next 2023-09-12 19:40:54 -04:00
Alam Ed Arias
8558d123ee SDL: add version check for SDL_OPenURL() 2023-09-12 19:32:47 -04:00
Lactozilla
ebca345a44 Check if in a game 2023-09-12 19:32:15 -03:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
sphere
0f5e80a122 Merge branch 'warpwithoutmapheaderfix' into 'next'
Fix "-warp"ing to a level without a map header crashing the game

Closes #1105

See merge request STJr/SRB2!2143
2023-09-12 20:13:46 +00:00
LJ Sonic
06d4d71b41 Fix missing includes for Linux platforms 2023-09-12 19:52:24 +02:00
Logan Arias
02c4720703 Merge branch 'circleci' into 'master'
CircleCi: update buildbot

See merge request STJr/SRB2!2144
2023-09-09 20:53:31 +00:00
Alam Ed Arias
64eb1b0bff backtrace: do not care for junk var 2023-09-09 16:21:04 -04:00
Alam Ed Arias
05223fbc6d backtrace: store result of write() in a junk var 2023-09-09 16:10:42 -04:00
Alam Ed Arias
4d21701415 CircleCI: compile for GCC 8,1+ 2023-09-09 16:03:46 -04:00
Alam Ed Arias
5037483a1e CircleCI: look for files as root 2023-09-09 15:48:14 -04:00
Alam Ed Arias
9851c87756 CircieCI: remove curl amd64 SDK so we can install the i386 version 2023-09-09 09:36:26 -04:00
Alam Ed Arias
dcdb09769f CircleCI: try to build binary as circleci user 2023-09-08 23:20:11 -04:00
Alam Ed Arias
d5703be3e7 CircleCI: try using new cimg base image 2023-09-08 22:48:10 -04:00
MIDIMan
9b5cfe856c Add a mapheader check to M_CampaignWarpIsCheat 2023-09-08 22:03:25 -04:00
spherallic
a4a3b5b094 2.2.13 2023-09-09 01:16:28 +02:00
sphere
7debef176b Merge branch 'disablethisentirelybecauseitscausingproblems' into 'next'
Disable renderhitbox in multiplayer altogether

See merge request STJr/SRB2!2142
2023-09-08 23:09:52 +00:00
katsy
82568f81fc Disable renderhitbox in multiplaye altogether 2023-09-08 17:46:13 -05:00
sphere
0952d31369 Merge branch 'fix-1x1-floorsprite-draw' into 'next'
Fix floorsprite rendering with 1x1 images

Closes #1052

See merge request STJr/SRB2!2141
2023-09-08 22:35:34 +00:00
Lactozilla
27021d2921 Optimize 2023-09-08 17:43:55 -03:00
Lactozilla
14eb589611 Fix floorsprite rendering with 1x1 images 2023-09-08 17:26:42 -03:00
sphere
0f914a4e25 Merge branch 'netvars-fix' into 'next'
Replace CV_NETVAR with CV_NOTINNET for cv_renderhitbox (Fixes #1103)

Closes #1103

See merge request STJr/SRB2!2140
2023-09-08 17:51:30 +00:00
sphere
b5636d9dc9 Merge branch 'lua-supername' into 'next'
Expose skin.supername to Lua

See merge request STJr/SRB2!2138
2023-09-08 17:51:19 +00:00
sphere
afee1cb687 Merge branch 'sprite-clip-optimization' into 'next'
Optimize sprite rendering by ignoring completely occluded sprites

See merge request STJr/SRB2!2131
2023-09-08 17:51:11 +00:00
sphere
d42a96263b Merge branch 'interpolate-hitbox-scaling' into 'next'
Interpolate Hitboxes when Scaling Mobjs

See merge request STJr/SRB2!2124
2023-09-08 17:51:06 +00:00
SteelT
72662efc8d Replace CV_NETVAR with CV_NOTINNET for cv_renderhitbox
The CV_NETVAR flag being used for cvars not registered in a dedicated server context will completely mess with the internal netid to cvar linkage.
And I'm not really keen on registering a cvar purely for rendering on dedicated servers, so let's just prevent renderhitbox from being changed in netgames entirely.
2023-09-08 13:34:56 -04:00
Zwip-Zwap Zapony
11a2fe8613 Expose skin.supername to Lua 2023-09-06 21:02:04 +02:00
Krabs
858f102ca4 Update hash for patch.pk3 2023-09-06 12:50:51 -04:00
Krabs
49ee744ba1 Update version number 2023-09-06 12:50:32 -04:00
sphere
b5232a4ca4 Merge branch 'nights-noclip-camera' into 'next'
Make camera noclip during NiGHTS gameplay

See merge request STJr/SRB2!2136
2023-09-05 22:27:13 +00:00
sphere
5ce2b93a74 Merge branch 'lua-invalid-field-crash' into 'next'
Fix possible crashes in the Lua API when accessing invalid fields

See merge request STJr/SRB2!2128
2023-09-05 22:24:29 +00:00
sphere
fefdd7987c Merge branch 'title-animation-skip' into 'next'
Allow input during title animation after the first time

See merge request STJr/SRB2!2122
2023-09-05 22:23:57 +00:00
sphere
a90422a30e Merge branch 'dodrawforviewmobj' into 'next'
Don't Copy mobj->dontdrawforviewmobj To MT_OVERLAYs

See merge request STJr/SRB2!2125
2023-09-05 17:56:34 +00:00
spherallic
85fc55bfc1 Prevent title input during negative finalecount 2023-09-05 19:38:45 +02:00
sphere
417928f680 Merge branch 'nobombsphereattract2' into 'next'
Don't attract bomb spheres with Nightopian Helper

See merge request STJr/SRB2!2135
2023-09-05 17:25:42 +00:00
sphere
1ba1f7454b Merge branch 'the_elder_skyscroll_ii_daggerfall' into 'next'
Fix the Record Attack Background Jumping

See merge request STJr/SRB2!2129
2023-09-05 17:24:22 +00:00
sphere
e012a721e8 Merge branch 'instantretry' into 'next'
Add toggle for instant retry in Record Attack

See merge request STJr/SRB2!2120
2023-09-05 17:24:03 +00:00
sphere
b7b1e0b1e5 Add toggle for instant retry in Record Attack 2023-09-05 17:24:03 +00:00
sphere
758c5a893b Merge branch 'katsy-next-patch-00801' into 'next'
Make renderhitbox a netvar to prevent clientside wallhacking

See merge request STJr/SRB2!2133
2023-09-05 17:23:35 +00:00