Commit graph

12389 commits

Author SHA1 Message Date
GoldenTails
0a9c061fea Fix bug where SRB2 would check size of current directory instead of srb2home
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05:00
Hannu Hanhi
bda1d1e725 Convince the compiler that I know what I'm doing, I think 2020-08-18 23:21:26 +03:00
James R
300436825d Cast UINT16 for unlockable_t.height -> alphaKey 2020-08-18 11:19:16 -07:00
Zwip-Zwap Zapony
d87c0eeaf1 Fix Ringslinger weapon ring penalty missnapment 2020-08-18 11:42:35 +02:00
James R
16362388fc Merge branch 'IS-IT-1094' into 'next'
REMOVE THE LAST OF CV_ALLCAPS

See merge request STJr/SRB2!1116
2020-08-16 22:45:15 -04:00
Nev3r
77e438d4bd Some commenting tweaks. 2020-08-16 11:33:00 +02:00
Jaime Passos
92c4993d67 Introduce Doom patch format into picture formats
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
9b426b474c Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Jaime Passos
8863e13fde Rename R_CheckIfPatch 2020-08-15 20:14:36 -03:00
Nev3r
b15c760dc2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
James R
bcb0854db8 . 2020-08-14 22:38:15 -07:00
James R
0944b5ad6f Strip a few more instances of SONIC ROBO BLAST 2 KART 2020-08-14 22:18:51 -07:00
James R
58971259ef Is this SRB2Kart server? 2020-08-14 22:13:28 -07:00
James R
beba43cffc Add a menu option for showjoinaddress
I also had to make the "alphaKey" UINT16. Hopefully nothing breaks!
2020-08-14 21:13:15 -07:00
James R
405639bc78 Disable showjoinaddress by default 2020-08-14 21:05:23 -07:00
James R
5ccafe0314 REMOVE THE LAST OF CV_ALLCAPS 2020-08-14 21:01:41 -07:00
Jaime Passos
78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
Jaime Passos
1751d7afed Cache the console patch only once in CON_DrawBackpic 2020-08-14 20:48:15 -03:00
Jaime Passos
1950f1c7f7 Fix cv_glshearing 2 in first person 2020-08-14 20:31:30 -03:00
James R
be14b8a564 dumbass doesn't test changes before pushing directly to next 2020-08-14 08:25:12 -07:00
James R
aa19bce4a9 Autocomplete aliases in console 2020-08-14 00:00:45 -07:00
James R
f0a79df2b8 Use AsciiChar to get the input from windows console window 2020-08-13 21:57:36 -07:00
James R
4734b9d728 Stop treating apostrophes, parenthesis and curly braces as separate arguments 2020-08-13 21:11:45 -07:00
Louis-Antoine
9dd5c11322 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
2020-08-13 13:53:10 +02:00
bartuinceQR
b565b805a9 chain homing 2020-08-12 22:49:41 +03:00
James R
3e02f5d0cb Add http-mserv to fuck
(cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)
2020-08-09 23:34:16 -07:00
Steel Titanium
3d1110a0c2 Fix cmake using wrong libs if internal libs is turned on
Use '\0' instead, just in case

(cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)
2020-08-09 20:28:33 -07:00
James R
0af38bc5eb Bump MAXNETNODES to 127
(cherry picked from commit 9d9f8fd8a337a1786efa0d348c89e05b26ce8571)
2020-08-09 18:32:05 -07:00
James R
e9748e5317 Merge branch 'clipboard-crash-fix-2' into 'next'
Fix buffer overrun in I_ClipboardPaste (resolves #205)

Closes #205

See merge request STJr/SRB2!1105
2020-08-09 21:06:18 -04:00
James R
3e8cf5ab06 Merge branch 'bt_spin' into 'next'
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
James R
85d0199661 Merge branch 'audio-cleanup' into 'next'
Audio cleanup

See merge request STJr/SRB2!1101
2020-08-09 20:49:28 -04:00
James R
a808294c0c Merge branch 'kill-cd-support' into 'next'
Kill CD support

See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
8301e4f93c Merge branch 'word-delet' into 'next'
Word delete and backspace in console

See merge request STJr/SRB2!1092
2020-08-09 20:46:37 -04:00
James R
8394bf6055 Merge branch 'opengl-skydome-fixes' into 'next'
Move the sky dome code out of r_opengl.c, fix issues with shaders

See merge request STJr/SRB2!1071
2020-08-09 20:45:01 -04:00
James R
23f218117c Merge branch 'http-mserv' into 'next'
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
James R
46a4bd2d08 Merge branch 'lmaogalog' into 'next'
Make old analog functional again

See merge request STJr/SRB2!1098
2020-08-09 20:13:04 -04:00
GoldenTails
23edfd6d09 Fix string drawing functions so they account for V_NOSCALEPATCH effectively multiplying the width of the screen 2020-08-09 11:03:02 -05:00
James R
5153338bf5 Merge branch 'kill-dos' into 'next'
Remove support for DOS

See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
James R
cd30f0e933 Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES
Each server in the server list requires a node. It's also MAXNETNODES-1 because
the first node is yourself.

(cherry picked from commit 1484f0484f6c22382b2cae955a93c01f83d54655)
2020-08-08 15:13:21 -07:00
James R
54e446199d Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
Jaime Passos
9772bbeda1 Fix buffer overrun in I_ClipboardPaste 2020-08-08 15:36:01 -03:00
Jaime Passos
2a0e47e28f Remove LUA_PATCH_SAFETY 2020-08-08 14:56:04 -03:00
Jaime Passos
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
Jaime Passos
74dfa9f700 Shader code cleanup 2020-08-07 18:17:05 -03:00
Steel Titanium
dff0e87e03 Kill CD support 2020-08-07 17:06:19 -04:00
Steel Titanium
2d39af8604 Remove all this unused playlist related code 2020-08-07 16:44:16 -04:00
Steel Titanium
5c53157192 Remove every musserv and sndserv def'd code 2020-08-07 16:40:46 -04:00
James R
cc677d2d50 Merge branch 'com-buf-insert-text-optional-player' into 'next'
Make the player optional for COM_BufInsertText and COM_BufAddText.

See merge request STJr/SRB2!1093
2020-08-05 19:53:28 -04:00
James R
cc508d0ba3 Merge branch 'ogl-model-lighting-shader' into 'next'
Add capability to use model lighting with shaders enabled

See merge request STJr/SRB2!1073
2020-08-05 19:50:31 -04:00
James R
1c9633504d Merge branch 'hide-followmobj' into 'next'
Hide Metal Sonic's jet fume in first person

Closes #204

See merge request STJr/SRB2!1099
2020-08-05 19:47:13 -04:00