James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								605ea2c668
								
							
						 | 
						
							
							
								
								Update version to 2.2.7 RC1
							
							
							
							
							
						 | 
						
							2020-09-01 15:38:51 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								1922a78a3b
								
							
						 | 
						
							
							
								
								Define BETAVERSION as a suffix to the version string
							
							
							
							
							
						 | 
						
							2020-09-01 15:38:27 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa8f07af41
								
							
						 | 
						
							
							
								
								Update patch.pk3 asset hash
							
							
							
							
							
						 | 
						
							2020-09-01 15:26:13 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									SteelT
								
							 
						 | 
						
							
							
							
							
								
							
							
								35c57b744d
								
							
						 | 
						
							
							
								
								Merge branch 'replace-purefat' into 'next'
							
							
							
							
							
							
							
							New STJR Intro and related changes (resolves #202)
Closes #202
See merge request STJr/SRB2!1132 
							
						 | 
						
							2020-09-01 15:00:48 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								861118ac53
								
							
						 | 
						
							
							
								
								Allow the game to continue even if the STARTUP lump is somehow missing
							
							
							
							
							
						 | 
						
							2020-09-01 14:46:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca08a7675c
								
							
						 | 
						
							
							
								
								Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat
							
							
							
							
							
						 | 
						
							2020-09-01 13:54:27 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								d78befc713
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2020-08-31 16:10:05 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4b7257ec9
								
							
						 | 
						
							
							
								
								Fix NOHW compiling
							
							
							
							
							
						 | 
						
							2020-08-31 16:09:41 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								7cbc9add07
								
							
						 | 
						
							
							
								
								Kill NOHS
							
							
							
							
							
							
							
							(cherry picked from commit a79316b375) 
							
						 | 
						
							2020-08-31 16:06:40 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								1818693d71
								
							
						 | 
						
							
							
								
								Fix NOGME compiling
							
							
							
							
							
							
							
							(cherry picked from commit d52a35e5b6) 
							
						 | 
						
							2020-08-31 16:04:09 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce666acdda
								
							
						 | 
						
							
							
								
								Fix some build errors
							
							
							
							
							
							
							
							(cherry picked from commit f25235d1eb) 
							
						 | 
						
							2020-08-29 18:08:41 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6c914c7b2
								
							
						 | 
						
							
							
								
								Fix stupid NONET
							
							
							
							
							
						 | 
						
							2020-08-29 17:51:59 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								d31fb748b2
								
							
						 | 
						
							
							
								
								Do not do master server things when NOCURL
							
							
							
							
							
							
							
							(cherry picked from commit b681b6e9e6) 
							
						 | 
						
							2020-08-29 17:45:28 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								c188d6eb5d
								
							
						 | 
						
							
							
								
								C90?
							
							
							
							
							
						 | 
						
							2020-08-29 17:21:54 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								08aa1a5ad7
								
							
						 | 
						
							
							
								
								Fix compile error
							
							
							
							
							
						 | 
						
							2020-08-29 20:04:11 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								13033c521b
								
							
						 | 
						
							
							
								
								Attempts to make the intro a bit more shorter
							
							
							
							
							
							
							
							Make the scene time be 5 seconds long max
Use the standard fade which is much shorter in length. 
							
						 | 
						
							2020-08-29 19:28:16 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								f013b73dd5
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into next
							
							
							
							
							
						 | 
						
							2020-08-28 19:52:25 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								f52b66fdf5
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								2165d747cb
								
							
						 | 
						
							
							
								
								Merge branch 'default-warningmode' into 'master'
							
							
							
							
							
							
							
							Use WARNINGMODE by default
See merge request STJr/SRB2!1122 
							
						 | 
						
							2020-08-28 22:49:24 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0ec718aae
								
							
						 | 
						
							
							
								
								Make the intro shorter as I felt it was a bit too long
							
							
							
							
							
							
							
							Change the code a bit so less magic numbers. 
							
						 | 
						
							2020-08-28 20:08:46 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f06ff44cc
								
							
						 | 
						
							
							
								
								Add new STARTUP lump, for the splash screen
							
							
							
							
							
						 | 
						
							2020-08-28 17:11:38 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a37f39ca8
								
							
						 | 
						
							
							
								
								New STJR Intro, replaces the old PURE FAT intro
							
							
							
							
							
						 | 
						
							2020-08-28 17:10:54 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec3dffbb94
								
							
						 | 
						
							
							
								
								Makefile: add WINDOWSHELL=1 for the Windows detect
							
							
							
							
							
						 | 
						
							2020-08-20 20:19:50 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								d330ad6b01
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								288a6c1431
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								f30e52f967
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd4ab28a84
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce98fc16bd
								
							
						 | 
						
							
							
								
								Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
							
							
							
							
							
						 | 
						
							2020-08-18 16:45:00 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								63ba605f52
								
							
						 | 
						
							
							
								
								Is it GCC is it gcc, is it????
							
							
							
							
							
							
							
							(cherry picked from commit 246e71a463) 
							
						 | 
						
							2020-08-18 16:37:19 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b04a1a45f
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a27628232
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								d082e42d48
								
							
						 | 
						
							
							
								
								Cast UINT16 for unlockable_t.height -> alphaKey
							
							
							
							
							
						 | 
						
							2020-08-18 11:19:16 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zwip-Zwap Zapony
								
							 
						 | 
						
							
							
							
							
								
							
							
								12b4b7f708
								
							
						 | 
						
							
							
								
								Fix Ringslinger weapon ring penalty missnapment
							
							
							
							
							
						 | 
						
							2020-08-18 11:42:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								57019ae532
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe4f311da5
								
							
						 | 
						
							
							
								
								.
							
							
							
							
							
						 | 
						
							2020-08-14 22:38:15 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								4acc3e6d0c
								
							
						 | 
						
							
							
								
								Strip a few more instances of SONIC ROBO BLAST 2 KART
							
							
							
							
							
						 | 
						
							2020-08-14 22:18:51 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c914095c0
								
							
						 | 
						
							
							
								
								Is this SRB2Kart server?
							
							
							
							
							
						 | 
						
							2020-08-14 22:13:28 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								c660a86b8d
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								065471392c
								
							
						 | 
						
							
							
								
								Disable showjoinaddress by default
							
							
							
							
							
						 | 
						
							2020-08-14 21:05:23 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1a745db1f
								
							
						 | 
						
							
							
								
								REMOVE THE LAST OF CV_ALLCAPS
							
							
							
							
							
						 | 
						
							2020-08-14 21:01:41 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								39da55bce3
								
							
						 | 
						
							
							
								
								dumbass doesn't test changes before pushing directly to next
							
							
							
							
							
						 | 
						
							2020-08-14 08:25:12 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								b771ff2426
								
							
						 | 
						
							
							
								
								Add http-mserv to fuck
							
							
							
							
							
							
							
							(cherry picked from commit 8e493bddc3) 
							
						 | 
						
							2020-08-09 23:34:16 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								79469d401c
								
							
						 | 
						
							
							
								
								Fix cmake using wrong libs if internal libs is turned on
							
							
							
							
							
							
							
							Use '\0' instead, just in case
(cherry picked from commit 47d70e1ae6) 
							
						 | 
						
							2020-08-09 20:28:33 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa18f819b0
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a85046b22
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								8bef076b83
								
							
						 | 
						
							
							
								
								Merge branch 'audio-cleanup' into 'next'
							
							
							
							
							
							
							
							Audio cleanup
See merge request STJr/SRB2!1101 
							
						 | 
						
							2020-08-09 20:49:28 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								f9e74e8ba2
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a49ffa217
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								66d36d4fdf
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								42dbdd8c4a
								
							
						 | 
						
							
							
								
								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 | 
						
						
							
							
							
								
							
							
						 |