James R
|
1f38db4629
|
C90?
|
2020-08-29 17:21:54 -07:00 |
|
James R
|
37c647c00e
|
Merge remote-tracking branch 'origin/master' into next
|
2020-08-28 19:52:25 -07:00 |
|
James R
|
8d9b16df8c
|
Merge branch 'makefile-detect-system' into 'master'
Detect which system the Makefile is running on to compile for
See merge request STJr/SRB2!1123
|
2020-08-28 22:49:34 -04:00 |
|
James R
|
89451d97fa
|
Merge branch 'default-warningmode' into 'master'
Use WARNINGMODE by default
See merge request STJr/SRB2!1122
|
2020-08-28 22:49:24 -04:00 |
|
James R
|
6f51c68c72
|
Makefile: add WINDOWSHELL=1 for the Windows detect
|
2020-08-20 20:19:50 -07:00 |
|
James R
|
e340d74e4d
|
Merge branch 'ringslinger-penalty-snap' into 'next'
Fix Ringslinger weapon ring penalty missnapment
See merge request STJr/SRB2!1120
|
2020-08-19 18:18:15 -04:00 |
|
James R
|
38d094d3f6
|
Merge branch 'fix-file-downloading' into 'next'
Fix bug where SRB2 would check size of disk from current directory instead of srb2home
See merge request STJr/SRB2!1121
|
2020-08-19 18:16:22 -04:00 |
|
James R
|
809ff5c467
|
Merge branch 'oops-http-mserv' into 'next'
Fix lingering issues with the http-mserv merge
See merge request STJr/SRB2!1117
|
2020-08-19 18:12:38 -04:00 |
|
James R
|
f92026f98b
|
Makefile: automatically detect system to compile for, if no system was specified
This should work for mingw and linux so far.
|
2020-08-18 18:01:59 -07:00 |
|
James R
|
9495e6354f
|
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
|
2020-08-18 16:45:00 -07:00 |
|
James R
|
f0bf06aee2
|
Is it GCC is it gcc, is it????
(cherry picked from commit ef2bff6383b16385f9874e1c9c6b66c9df794f5b)
|
2020-08-18 16:37:19 -07:00 |
|
James R
|
9147474a30
|
Merge branch 'showjoinaddress-menu' into 'next'
Add a menu option for showjoinaddress; disable it by default
See merge request STJr/SRB2!1115
|
2020-08-18 19:15:23 -04:00 |
|
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 |
|
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 |
|
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 |
|
James R
|
be14b8a564
|
dumbass doesn't test changes before pushing directly to next
|
2020-08-14 08:25:12 -07: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
|
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 |
|
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
|
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 |
|
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 |
|
James R
|
a31c8d12b4
|
Merge branch 'udmf-fixmapthingheight' into 'next'
UDMF: Fix mapthing spawn height scaling improperly with the object scale; only special…
See merge request STJr/SRB2!1096
|
2020-08-05 19:46:48 -04:00 |
|
James R
|
d8834143cb
|
Merge branch 'ogl-sector-alignment-fix' into 'next'
Fix sector flat alignment issues in OpenGL
See merge request STJr/SRB2!1094
|
2020-08-03 12:47:29 -04:00 |
|
James R
|
f5d9029d2a
|
Merge branch 'ogl-big-room-fix' into 'next'
Big room fix for OpenGL
See merge request STJr/SRB2!1089
|
2020-08-03 12:44:09 -04:00 |
|
lachwright
|
3a96142c8b
|
Hide Metal Sonic's jet fume in first person
|
2020-08-03 20:09:35 +08:00 |
|
lachwright
|
837c9bbec3
|
Make old analog functional again
|
2020-07-30 18:22:15 +08:00 |
|
Nev3r
|
b99385e159
|
Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now.
|
2020-07-30 09:45:58 +02:00 |
|
James R
|
40dc532ea2
|
Merge branch 'clarify-md5-mismatch' into 'next'
Include "is old" in the list of possible causes for a MD5 mismatch.
See merge request STJr/SRB2!1095
|
2020-07-29 21:19:23 -04:00 |
|
Nev3r
|
f791c1b4ec
|
Fix gl_linedef renaming which went off radars on the udmf branch
|
2020-07-28 20:39:11 +02:00 |
|