Commit graph

8681 commits

Author SHA1 Message Date
toaster
69e573517f Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
toaster
d541bb7ead * Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated. 2019-07-30 17:24:21 +01:00
toaster
18e43a5cef * Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage.
* Correct a potential source of desync in P_GiveEmerald.
2019-07-30 16:44:40 +01:00
Alam Ed Arias
a8637d034e SDL2: more consts 2019-07-29 19:22:14 -04:00
Alam Ed Arias
1a643b1bd9 SDL2: more const in xpm code 2019-07-29 19:08:55 -04:00
Alam Ed Arias
ed0754382f Merge remote-tracking branch 'private/master' into newicon 2019-07-29 19:04:19 -04:00
Alam Ed Arias
b77780e1e7 Fix building with MSVC 2019-07-29 19:02:45 -04:00
Alam Ed Arias
e50dc7c779 Merge branch 'public_next' into private 2019-07-29 18:31:01 -04:00
Alam Ed Arias
963d2f5da3 Merge branch 'master' into next 2019-07-29 18:05:33 -04:00
Alam Ed Arias
66f84efd02 SDL2: fixed compiling mixer interface with MSVC 2019-07-29 17:56:35 -04:00
toaster
f141220e82 Added escape pod. Okay, now I'm truly done with this branch. https://cdn.discordapp.com/attachments/249925765423038464/605506507345362964/srb20033.gif 2019-07-29 22:13:24 +01:00
toaster
deaee586ed Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it. 2019-07-29 21:06:17 +01:00
toaster
a6a3048c8f * Fix diagonal spring ring assortments being forced up/down with slopes. 2019-07-29 21:03:28 +01:00
toaster
62c708e64a Two one liners related to angles, so doin' em in a single branch.
* If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it.
* If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.
2019-07-29 20:29:02 +01:00
toaster
47554b57e4 * Made the evaluation screen even more attractive.
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
2019-07-29 14:55:36 +01:00
Steel Titanium
98adcb1de3
Change it back to const char 2019-07-28 18:19:00 -04:00
toaster
5dc095a47d Further improvements on MI's request, just to be safe. 2019-07-28 22:53:27 +01:00
toaster
1d799630af Made it possible to just call EV_CrumbleChain(rover) in Lua 2019-07-28 22:45:20 +01:00
Steel Titanium
74cbf2b4f3
Update mac icon 2019-07-28 17:06:01 -04:00
Steel Titanium
e5b8bb52ef
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into newicon 2019-07-28 16:04:46 -04:00
Monster Iestyn
18e2c2461f Merge branch 'wavingflag' into 'master'
New CEZ scenery

See merge request STJr/SRB2Internal!257
2019-07-28 15:44:00 -04:00
toaster
384533165c * Fix crash error in GL.
* Re-enable the perplayer stuff in V_DrawFadeFill - not worth having it disabled when it'll just have to be re-enabled later.
* Remove some "consistency with software" stuff in hw_draw.c that already has equivalents
2019-07-28 17:47:57 +01:00
toaster
f47c3f40d1 Smoothen emerald rotation a tad. (Not gonna upload a new test exe, it's basically identical...) 2019-07-28 14:59:42 +01:00
toaster
bebaf6f984 * Add comments for maintenence.
* Fix not-guaranteed-to-be-set-to-zero-ness of sparklloop
* Add blackrock sparkles to good ending.
* Don't have emerald sparkles be randomised.
* Adjust credits to include Sal (credits sprites + four merged internal MRs and a bunch of public ones) and a few other known contributors, plus remove oni's name (he requested i do it a whiiile ago)
2019-07-28 11:40:19 +01:00
toaster
7569e0b184 Good morning, fix three little things.
* Made the black rock animate backwards through its anim again, to match the 2.1 and earlier intro.
* Rid branch of mixed code declaration warnings.
* Other cleanup.
2019-07-28 10:41:00 +01:00
toaster
063e350c63 A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
Steel Titanium
9813cbc857 More icon stuff 2019-07-27 01:13:54 -04:00
Steel Titanium
64bb70bef4 Fix crash with GME sounds when being freed 2019-07-27 01:13:54 -04:00
Jaime Passos
3fb113e786
Merge pull request #18 from STJr/flats-png
Merge upstream's master into flats-png
2019-07-25 16:39:00 -03:00
Steel Titanium
39f348f853 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into linedef-award-rings 2019-07-24 21:18:45 -04:00
Steel Titanium
60ffef9830 More simplified code
Also delay is in tics, per MS' request.
2019-07-24 21:18:07 -04:00
Alam Ed Arias
f67f9405bc Merge remote-tracking branch 'origin/master' into flats-png 2019-07-24 19:07:36 -04:00
Alam Ed Arias
0eb6b24415 Merge commit '45922f80d1e35aadc9da6e20fa32fa78c1044dfd' into flats-png 2019-07-24 18:17:01 -04:00
Steel Titanium
2075b525a9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx 2019-07-22 22:22:12 -04:00
Steel Titanium
c35afa2c96 Merge branch 'master' into musicplus-sdlmixerx 2019-07-22 22:20:08 -04:00
Steel Titanium
af959ee309 Some fixup 2019-07-22 22:01:05 -04:00
Monster Iestyn
cb278388f0 Merge branch 'recordattack-bg-fixes' into 'master'
Record Attack bg fixes

See merge request STJr/SRB2Internal!259
2019-07-20 11:33:06 -04:00
Monster Iestyn
0f8c046c6f On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway 2019-07-20 16:30:30 +01:00
Steel Titanium
6c2ef839c1 New award rings linedef executor 2019-07-18 22:42:46 -04:00
toaster
64517a1362 Fix !150, too 2019-07-18 00:16:01 +01:00
toaster
1d5e8e249e Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground. 2019-07-17 23:25:49 +01:00
toaster
82acf2de6b Fix Knuckles-in-quicksand messup. 2019-07-17 23:24:44 +01:00
toasterbabe
385d34e67e * Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
toaster
438c4d1d51 Fix spindash being broken in quicksand
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
2019-07-17 21:33:18 +01:00
Steel Titanium
181ecee202 Let's not use this 2019-07-16 19:26:16 -04:00
Steel Titanium
3ffb7b6192 New icons
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
Monster Iestyn
c8cfc3110f Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Monster Iestyn
6eaf7625a9 Merge branch 'master' into next 2019-07-16 18:26:46 +01:00
Monster Iestyn
3e708e62e8 Merge branch 'fix-gme-free' into 'master'
Fix crash with GME sounds when being freed

See merge request STJr/SRB2!504
2019-07-16 13:25:51 -04:00
Monster Iestyn
e50147f7f0 Merge branch 'master' into recordattack-bg-fixes 2019-07-16 17:04:42 +01:00