stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-27 13:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
11015 commits 173 branches 41 tags 307 MiB
Commit graph

11015 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
4b7d16283d Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
James R
72437ae357 Define BETAVERSION as a suffix to the version string 2020-09-01 15:38:27 -07:00
James R
045a5d3dd1 Update patch.pk3 asset hash 2020-09-01 15:26:13 -07:00
SteelT
9393efc9cc 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
db6bd42eb1 Allow the game to continue even if the STARTUP lump is somehow missing 2020-09-01 14:46:03 -04:00
Steel Titanium
4509cd3798 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat 2020-09-01 13:54:27 -04:00
James R
b2226e95d6 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e593610862 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
6c2370f894 Kill NOHS 
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
 2020-08-31 16:06:40 -07:00
James R
2aab765b36 Fix NOGME compiling 
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
 2020-08-31 16:04:09 -07:00
Steel Titanium
9a1d6e0db9 Fix some build errors 
(cherry picked from commit cb9004e4cfa94251ab0d31f19fee187fc4e9abcc)
 2020-08-29 18:08:41 -07:00
James R
679bfa21ed Fix stupid NONET 2020-08-29 17:51:59 -07:00
James R
a6e59cbb24 Do not do master server things when NOCURL 
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
 2020-08-29 17:45:28 -07:00
James R
1f38db4629 C90? 2020-08-29 17:21:54 -07:00
Steel Titanium
b20352141e Fix compile error 2020-08-29 20:04:11 -04:00
Steel Titanium
0bd71d9980 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
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
Steel Titanium
3ef8024697 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
4eaa7e969f Add new STARTUP lump, for the splash screen 2020-08-28 17:11:38 -04:00
Steel Titanium
a3039a781a New STJR Intro, replaces the old PURE FAT intro 2020-08-28 17:10:54 -04:00
Tatsuru
48d6ae8e53 Decolorize players as intended 2020-08-24 23:53:21 -03:00
Louis-Antoine
cb06d05692 Fix bonus items sometimes overriding apples in Snake minigame 2020-08-24 00:34:44 +02:00
Hannu Hanhi
dd7d1e40b1 Add tic and ui times to render stats 2020-08-23 20:09:55 +03:00
GoldenTails
d15be1696a Forgot to check if the file was important, whoops! 2020-08-21 04:00:54 -05:00
GoldenTails
2c5f23bacb Fix a bug where adding the same mod multiple times counted to the mod limit 
A one line fix. Seriously.
 2020-08-21 03:30:22 -05: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
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
4734b9d728 Stop treating apostrophes, parenthesis and curly braces as separate arguments 2020-08-13 21:11:45 -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