toaster
c4f0fdb783
Perfect bonus support for non-NiGHTS special stages
2019-08-02 22:52:53 +01:00
toaster
8d56133425
Fix old Special Stage failure sounds not always playing.
2019-08-02 20:02:55 +01:00
Monster Iestyn
af38c0e227
Merge branch 'bustables_misc' into 'master'
...
Bustables and landing events
Closes #157 and #162
See merge request STJr/SRB2Internal!262
2019-08-02 13:16:53 -04:00
Monster Iestyn
94c1873b8c
Merge branch 'anglestuff' into 'master'
...
Spring angles and ring angles
See merge request STJr/SRB2Internal!266
2019-08-02 13:10:23 -04:00
Monster Iestyn
8520243ab6
Merge branch 'emeraldfixes' into 'master'
...
Special stage related fixes
See merge request STJr/SRB2Internal!269
2019-08-02 13:08:20 -04:00
Monster Iestyn
146271e49d
Merge branch 'maniaspheresfix' into 'master'
...
MANIASPHERES de-hardcode
See merge request STJr/SRB2Internal!268
2019-08-02 13:06:52 -04:00
Monster Iestyn
ee64d98e39
Merge branch 'spring-things' into 'master'
...
Additional spring flags
See merge request STJr/SRB2Internal!256
2019-08-02 13:06:38 -04:00
Monster Iestyn
2503c2f392
Merge branch 'followmobj_scale' into 'master'
...
Smiles tail scale
See merge request STJr/SRB2Internal!273
2019-08-02 13:05:50 -04:00
Monster Iestyn
aab3a029f2
Merge branch 'diagonalrings' into 'master'
...
Diagonal spring ring fixes
See merge request STJr/SRB2Internal!267
2019-08-02 13:03:11 -04:00
Monster Iestyn
42a36de459
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code.
...
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 16:51:44 +01:00
sphere
d2c3b88020
Merge remote-tracking branch 'origin/master' into spring-things
2019-08-02 15:11:13 +02:00
toaster
f2349c5ce4
fixed sphere's CA2_MELEE stasis issue
2019-08-02 13:18:57 +01:00
Monster Iestyn
ac058529c5
Whoops the second
2019-08-01 20:48:24 +01:00
Monster Iestyn
67f7c9d7d9
Whoops, forgot this part
2019-08-01 20:17:15 +01:00
Monster Iestyn
0821f7fb21
Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening
...
...which should hopefully stop that issue where you just teleport back to the ground. Assuming this works as expected.
Also this is untested lol.
2019-08-01 18:56:00 +01:00
toaster
8fa0641e99
Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too)
2019-08-01 18:12:26 +01:00
toaster
39c15e71b0
Was reviewing old merge requests as a procrastination technique, and discovered that the followmobj's scale was being inaccurately handled for Smiles' tails! Fixed that...
2019-08-01 08:01:29 -04:00
toaster
f0fd9f7656
Ok, now the MobjThinker Lua hook is neutralised properly as well.
2019-08-01 11:35:04 +01:00
Steel Titanium
e2cd85d4da
I dunno how that got here
2019-07-31 20:57:08 -04:00
Steel Titanium
3177b27a11
Changes
...
Kill off the hack
2019-07-31 20:51:55 -04:00
toaster
7cb02985f4
* Added boss enable linedef (type 449).
...
- Frontside x offset = boss ID (determined via parameter for all bosses)
- Noclimb flag = disable mode
- Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced.
- The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated.
- All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled.
* Add multi-boss support via parameter for:
- All bosses' MT_BOSSFLYPOINT search
- Boss 5's waypoint search
- Oldbrak's waypoint search (this one's for you, jood)
2019-07-31 23:17:17 +01:00
Steel Titanium
d6dacaaab2
ALL CAPS
...
Woops forgot to do this
2019-07-31 00:49:14 -04:00
Steel Titanium
58b56b2867
New ring sparkles
2019-07-31 00:47:42 -04:00
Steel Titanium
c93fb440e5
use VERSIONSTRING
2019-07-30 20:56:03 -04:00
toaster
2ae07bdf3b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc
...
# Conflicts:
# src/p_user.c
2019-07-30 18:14:52 +01:00
toaster
7bff305672
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
...
* Move it into lua_script.h, so it's available to everything that needs it.
2019-07-30 17:57:57 +01:00
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