Steel Titanium
26689e168e
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle
2019-08-03 17:33:28 -04:00
toaster
8a0f1e7ed4
Merge branch 'ending' into 'master'
...
ENDINGS
See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
toaster
9f34a7aa82
Merge branch 'bossenable' into 'master'
...
Boss enable linedef (type 449)
See merge request STJr/SRB2Internal!272
2019-08-03 16:23:22 -04:00
toaster
97072d9faa
Merge branch 'snaptoground-fix' into 'master'
...
Snap to ground fix
Closes #165
See merge request STJr/SRB2Internal!274
2019-08-03 16:22:47 -04:00
toaster
5ef190fc69
Merge branch 'mpspec_cleanup' into 'master'
...
MP/Old Special Stage ring stuff
See merge request STJr/SRB2Internal!276
2019-08-03 16:22:23 -04:00
toaster
8f729c33d3
Merge branch 'linedef-award-rings' into 'master'
...
New award rings linedef executor
See merge request STJr/SRB2Internal!263
2019-08-03 16:21:58 -04:00
Monster Iestyn
f9037509a1
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-03 19:06:45 +01:00
Monster Iestyn
dff544404d
Merge branch 'master' into snaptoground-fix
2019-08-03 18:23:09 +01:00
Monster Iestyn
38ecd00ac9
Merge branch 'speciallosesound' into 'master'
...
Fix old Special Stage failure sounds not always playing
See merge request STJr/SRB2Internal!275
2019-08-03 13:18:40 -04:00
Monster Iestyn
c82c2ee815
Merge branch 'titlemaplua' into 'master'
...
Titlemap Lua
See merge request STJr/SRB2Internal!270
2019-08-03 13:14:46 -04:00
toaster
f3baac8577
Fix the minor issues since steel's busy
2019-08-03 08:04:02 -04:00
toaster
544a160fc3
Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1.
2019-08-03 12:25:46 +01:00
toaster
105df2395d
MI made a good argument for bossdisabled not being conditional on fromnetsave.
2019-08-03 12:09:18 +01:00
toaster
876f87e793
Have the ring bonus in MP Special Stages be based on the shared sum of all players'.
2019-08-02 23:56:25 +01:00
toaster
16c541ef1b
Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k
2019-08-02 23:51:22 +01:00
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