# Conflicts:
#   src/p_maputl.c
#   src/r_segs.c

Raise TEXTMAP parser limits

See merge request !2473

Don't traverse the entire HOME directory to find wads

See merge request !2396

Fix buffer overflow when loading addons through symlinks

See merge request !2402

Fix buffer overflow when setting NETVAR string console variable and ensure servername is within MAXSERVERNAME

See merge request !2445

This commit adds a verification before setting the servername console
variable. We now check that it fits within the MAXSERVERNAME length and
we cancel setting it if it doesn't.
Letting the servername be more than MAXSERVERNAME could lead to crashes
when trying to edit the server name from the menu so, we now avoid
those.

Fix segfault when trying to spawn an MT_PLAYER from Lua

See merge request !2276

Fix shieldscale 0 bugs

See merge request !2425

Avoid updating IPv4 MS entry if it failed to register

See merge request !2462

Fix object collision with solid noskew midtextures (resolves #523)

Closes #523

See merge request STJr/SRB2!2447

Transform FlingRing when attracted instead of spawning new Ring

Closes #1218

See merge request !2390

Fix exitgame-ing a demo crashing the game (resolves #1237)

Closes #1237

See merge request !2419

Add tofixed lua function

See merge request !2430

Fix crash when spawning a BOT_2PAI on a dedicated server

See merge request !2409

Fix tiny spindash math moment

See merge request !2421

Fix segfault when passing a long string to v.drawString

See merge request !2403

Fix automatic mode z-target bugs and crashes (resolves #751, #758, #1264)

Closes #1264, #758, and #751

See merge request !2422

Update skin cvar from character select and compare against cvar when warping without a loaded file (resolves #1267, #1117, #1114, #1112)

Closes #1112, #1114, #1117, and #1267

See merge request !2467

Add a console variable that will allow individual demos to desync....

See merge request !2361

Fix mouse buttons not working in menus with alwaysgrabmouse on

Closes #1257

See merge request !2449

Clean up the backtrace code and make it use write() more safely.

See merge request !1897

Removed thokked when hitting springs (resolves #1245)

Closes #1245

See merge request !2429

Allow less than 3 emerald shards instead of crashing

See merge request !2433

Fix vertical aim being off when using lack of perspective

See merge request !2408

Don't change drawangle while riding on a fan

Closes #1062

See merge request !2371

Rollout rock handling with gravity boots

See merge request !2343

Fix forcecharacter regressions & crash (resolves #1262)

Closes #1262

See merge request !2464

Fix equation slopes breaking with slopes farther than 32k FU away from the map center

See merge request !2397

Expose BASEVIDWIDTH and BASEVIDHEIGHT to Lua and SOC

See merge request !2468

Improve slope physics on solid middle textures

See merge request !2455

Use correct slope for solid middle textures

Closes #1093

See merge request !2454