James R
|
bdb44e6ce1
|
Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined
|
2020-09-19 18:34:52 -07:00 |
|
SteelT
|
90302330ed
|
Merge branch 'make-float-strings-great-again' into 'next'
Can we just do this please? Thanks.
See merge request STJr/SRB2!1142
|
2020-09-11 11:47:04 -04:00 |
|
SteelT
|
9f09e32520
|
Merge branch 'remove-bt_use-deprecation' into 'next'
Remove BT_USE and PF_USEDOWN warning
See merge request STJr/SRB2!1138
|
2020-09-10 16:06:20 -04:00 |
|
SteelT
|
a033f482be
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
SteelT
|
c2e6c0c0ad
|
Merge branch 'png-conversion-fixes' into 'pictureformats'
Optimize PNG conversion
See merge request STJr/SRB2!1143
|
2020-09-10 15:47:58 -04:00 |
|
Jaime Passos
|
0750d273a6
|
Attempt to use the PNG image's palette, if it is present
|
2020-09-10 03:16:21 -03:00 |
|
Jaime Passos
|
4e437076c1
|
Use color look-up table for PNG conversion
|
2020-09-10 02:10:31 -03:00 |
|
Jaime Passos
|
f24647dc4d
|
Change method of color look-up table generation
|
2020-09-10 01:43:46 -03:00 |
|
GoldenTails
|
c61eeb9238
|
Can we just do this please? Thanks.
|
2020-09-09 22:19:14 -05:00 |
|
GoldenTails
|
8ae5f3030f
|
Remove BT_USE and PF_USEDOWN warning
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
|
2020-09-06 00:30:05 -05:00 |
|
James R
|
4959aa5614
|
Merge branch 'credits-227' into 'next'
Update credits
See merge request STJr/SRB2!1136
|
2020-09-06 01:20:50 -04:00 |
|
James R
|
9a1099ec17
|
Update SuperPhanto's name with real name per request
|
2020-09-02 17:59:53 -07:00 |
|
James R
|
7bec06856f
|
Add SuperPhanto to the art credits
|
2020-09-01 18:51:47 -07:00 |
|
James R
|
c7c9ae3847
|
Disable update alert if this is a prerelease
|
2020-09-01 16:22:29 -07:00 |
|
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 |
|
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 |
|