Commit graph

12862 commits

Author SHA1 Message Date
Alam Ed Arias
e3250b460d Merge branch SRB2:next into devmode-hudlines 2023-10-25 18:19:01 +00:00
Alam Ed Arias
a68440c4db Merge branch 'master' into next 2023-10-22 11:14:13 -04:00
Alam Ed Arias
610fd76edb dummy: fixup warnings 2023-10-22 11:09:58 -04:00
Gustaf Alhäll
b544c4202a
Fix FreeBSD build errors (again) 2023-10-20 17:37:32 +02: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
2865873e70 Update src/lua_baselib.c
No need of counting bots.
2023-10-15 20:35:33 -04:00
Alam Ed Arias
de4a8a193b Update src/d_clisrv.c
Remove unused i var in Ban_Load_File()
2023-10-15 20:35:33 -04:00
Alam Ed Arias
6a37b3c0c6 Update src/hardware/mw_model.c
Restore old code in GeneratePolygonNormals(), add TODO
2023-10-15 20:35:33 -04:00
Alam Ed Arias
1372b60db9 Update src/hardware/mw_md2.c
there are 2 more name buffers that need to be bigger
2023-10-15 16:00:25 -04:00
Alam Ed Arias
b6aaf582d1 Update src/hardware/mw_md2.c
fscanf need 26 chars in the name buffer
2023-10-15 15:29:51 -04:00
Alam Ed Arias
bc852fa099 remove unused variables that was only set 2023-10-15 14:34:53 -04:00
Alam Ed Arias
aaebcc6ce1 Update src/hardware/hw_batching.c
fix misleading indentation
2023-10-15 14:24:20 -04:00
Alam Ed Arias
35f57882e4 signalhandlers are function of NORETURN 2023-10-15 14:16:13 -04:00
Alam Ed Arias
806c8f259c Update src/Makefile.d/detect.mk
Support Mingw64 toolchain versions
2023-10-14 08:23:03 -04:00
Alam Ed Arias
8533955da8 Update src/p_map.c
it seems line_t have pointers, clear all of it
2023-10-13 22:52:43 -04:00
Alam Ed Arias
8f00667abe Update src/Makefile.d/*.mk
both Makefile and *.mk should be in the same EOL
2023-10-13 20:18:37 -04:00
Alam Ed Arias
1bf78686e2 let not pass a point of a temp stack var around 2023-10-13 19:33:31 -04:00
Alam Ed Arias
af020810bf fix compiling for GCC 11+ 2023-10-13 17:02:33 -04:00
Alam Ed Arias
a6038dd6f2 Update detect.mk
Add support for GCC 13.2
2023-10-13 19:49:43 +00:00
Alam Ed Arias
dfe1810580 Revert "Undo src/Makefile"
This reverts commit 4f116673f3.
2023-10-12 22:30:26 -04:00
Alam Ed Arias
4f116673f3 Undo src/Makefile
Let see, revert OBJCOPY,OBJDUMP and WINDRES statements
2023-10-12 22:26:43 -04:00
Alam Ed Arias
4e2324216d Makefile
Also allow overwrite of OBJCOPY, OBJDUMP and WINDRES
2023-10-12 19:43:09 -04:00
sphere
9925e96365 Merge branch 'if-range-demoversion' into 'next'
Use if-range checks instead of switch for demo versions

See merge request STJr/SRB2!2164
2023-10-06 13:19:48 +00:00
Gustaf Alhäll
12d595399e
Avoid branch prediction slowdowns in R_PointOnSide 2023-10-01 17:34:13 +02:00
Zwip-Zwap Zapony
fb9e6c9c6d Use if-range instead of switch for demo versions 2023-09-22 18:16:54 +02:00
sphere
a373d96d07 Merge branch 'fix-overflow-scrolling-background' into 'next'
Fix buffer overflow when displaying a scrolling background

See merge request STJr/SRB2!2010
2023-09-20 16:10:56 +00:00
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
Zwip-Zwap Zapony
cfedee9dc9 Fix CMake compiling 2023-09-19 18:46:05 +02: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
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
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
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