c0bc46ca9c
A bunch of spike tweaks.
...
* Make it possible to break them in reverse gravity (resolves #348 ) by making the spikes break in a circle around the spike touched, rather than in a circle around the player.
* Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj.
* Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
d99e3f8337
Merge branch 'translucenthud-showfps-fix' into 'master'
...
Title card showfps translucency fix
See merge request STJr/SRB2Internal!522
2019-11-23 18:16:17 -05:00
5fe89e6e9b
Merge branch 'ra-wipe-fix' into 'master'
...
Fix RA fade (resolves #329 )
Closes #329
See merge request STJr/SRB2Internal!521
2019-11-23 18:16:09 -05:00
df50900ac5
Merge branch 'statusbar-stuff' into 'master'
...
No longer allow showhud to toggle FPS counter or ping bar
See merge request STJr/SRB2Internal!523
2019-11-23 18:09:59 -05:00
a24949cfa6
Merge branch 'menu-reordering' into 'master'
...
Menu reordering (also renaming secrets to extras)
See merge request STJr/SRB2Internal!511
2019-11-23 17:51:46 -05:00
33dc443b77
Merge branch 'nightsexitcam' into 'master'
...
NiGHTS exit camera tweak
See merge request STJr/SRB2Internal!519
2019-11-23 17:51:34 -05:00
01f02b142f
Merge branch 'exitcam' into 'master'
...
Exit camera fixes (Resolves #327 ).
Closes #327
See merge request STJr/SRB2Internal!518
2019-11-23 17:51:29 -05:00
9b8b463791
Merge branch 'horizonclimb' into 'master'
...
Horizonclimb (resolves #323 )
Closes #323
See merge request STJr/SRB2Internal!516
2019-11-23 17:51:17 -05:00
cd38173a7b
Merge branch 'superrun' into 'master'
...
Super runspd fix
See merge request STJr/SRB2Internal!515
2019-11-23 17:51:12 -05:00
5715727724
Merge branch 'firefuck2' into 'master'
...
Firefuck II
Closes #310
See merge request STJr/SRB2Internal!512
2019-11-23 17:51:02 -05:00
2a9db29c58
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
e850d42bc2
fix RA fade
2019-11-23 18:15:09 -03:00
97a87574b2
No longer allow showhud to toggle FPS counter or ping bar
2019-11-23 16:09:02 -05:00
aabddd69f1
Fixed a missing space in the "Speeding off to..." text
2019-11-23 18:51:32 +01:00
90c13effc0
Since I was tired of seeing NiGHTS players bump their head into the ceiling, and since similar camera enhancements have been made for the papersprite sign exit, implement a camera lock when exiting while NiGHTS.
...
https://cdn.discordapp.com/attachments/359091121789468672/647821662003396609/srb20088.gif
2019-11-23 15:40:32 +00:00
ebead10dca
Remove duplicate viewpointx/viewpointy set.
2019-11-23 15:23:42 +00:00
fa4c520ce0
Merge branch 'tailsupbruhtonium' into 'master'
...
Tails Flight Indicator Bruh Moment
Closes #331 , #330 , and #309
See merge request STJr/SRB2Internal!517
2019-11-23 10:15:16 -05:00
7956584797
Have the vertical aiming focus on the signpost's z rather than continue to focus on the player even while the camera is forced to be near the signpost. ( resolves #327 )
2019-11-23 15:11:24 +00:00
5a63e22f56
It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into `tails->target`.
...
Resolves #331 , and likely also #330 and #309 .
2019-11-23 14:43:47 +00:00
95ed442d55
Prevent Knuckles latching onto horizon special linedefs.
...
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
2019-11-23 14:20:41 +00:00
4ccb4f5c8a
Merge branch 'crossfade-fix' into 'master'
...
Fix crossfades
See merge request STJr/SRB2Internal!514
2019-11-23 04:14:07 -05:00
2c85aa9f69
Merge branch 'drtminus' into 'master'
...
drt minus
See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
7400db00b7
Merge branch 'planes-mmx-fix' into 'master'
...
Fix missing MMX check
See merge request STJr/SRB2Internal!513
2019-11-22 16:09:03 -05:00
5611f8eff4
I was reading the Sonic 3 Unlocked blog by NeoHazard when I came across a very interesting post.
...
https://s3unlocked.blogspot.com/2017/12/over-threshold.html
It turns out that in Sonic 3 & Knuckles, the threshold for crossing into the super animation is increased compared to normal gameplay. This makes a lot of sense - however, both Sonic Mania and the Taxman/Stealth mobile remakes missed this. I quickly tested and confirmed that SRB2 had the same issue, so here's the fix.
2019-11-22 21:06:25 +00:00
b24c709206
clarify comment
2019-11-22 17:50:05 -03:00
faa305a2f2
Fix crossfades
...
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
2019-11-22 17:44:42 -03:00
227f69f063
fix missing mmx check
2019-11-22 17:30:53 -03:00
6545284eaf
Merge branch 'gfz-debris' into 'master'
...
VAdaPEGA's GFZ debris
See merge request STJr/SRB2Internal!505
2019-11-22 15:27:11 -05:00
e9ca39d3bc
Merge branch 'infopoke' into 'master'
...
MS Info packet tweaks (resolves #300 )
Closes #300
See merge request STJr/SRB2Internal!499
2019-11-22 15:21:41 -05:00
de2a26bf5d
Swap statistics and tutorial options in the 1 Player menu.
2019-11-22 21:00:03 +01:00
c8c5237540
Resolve #310 .
2019-11-22 19:51:27 +00:00
07221c50ce
i'm a dumbass
2019-11-22 20:37:35 +01:00
ca74636a27
Merge branch 'dsz3target' into 'master'
...
Sea Egg targeting systems online! (resolves #303 )
Closes #303
See merge request STJr/SRB2Internal!501
2019-11-22 14:26:40 -05:00
6f82e5197d
Merge branch 'rollout-bumps' into 'master'
...
Add fun™ to rollout rocks
See merge request STJr/SRB2Internal!504
2019-11-22 14:25:39 -05:00
e3aca4b647
restore secrets = 0, not sure why i changed that
2019-11-22 20:24:57 +01:00
44fa076698
Merge branch 'radiomode3' into 'master'
...
Fix conditionset-based unlocks on the Sound Test (resolves #312 ).
Closes #312
See merge request STJr/SRB2Internal!508
2019-11-22 14:12:03 -05:00
f7c4ec1965
Merge branch 'mapvisitedupdate' into 'master'
...
Intermission fixes/cleanup
See merge request STJr/SRB2Internal!509
2019-11-22 14:11:31 -05:00
18babe3268
Merge branch 'followghost' into 'master'
...
Followmobj Record Attack fix (resolves #322 ).
Closes #322
See merge request STJr/SRB2Internal!510
2019-11-22 14:10:59 -05:00
e351d629bd
Merge branch 'playersall' into 'master'
...
Players All reliability fix (resolves #301 and #315 )
Closes #301 and #315
See merge request STJr/SRB2Internal!500
2019-11-22 14:10:39 -05:00
a3a7dc6bed
Merge branch 'remove-unused-levelwipes' into 'master'
...
(Cleanup) Remove unused levelwipes
See merge request STJr/SRB2Internal!507
2019-11-22 09:21:17 -05:00
ae8f0b42aa
Merge branch 'titlecard-event-fix' into 'master'
...
Remove D_ProcessEvents call in G_PreLevelTitleCard (resolves #317 )
Closes #317
See merge request STJr/SRB2Internal!506
2019-11-22 09:12:02 -05:00
514394a4f3
fuck autocomplete
2019-11-22 04:12:38 +01:00
143d4aa053
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
3798e886ea
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into mapvisitedupdate
2019-11-21 23:16:06 +00:00
990d9ed40c
Correct location of followmobj scale write to match read ( resolves #322 ).
...
Requires deleting all of RC1's Record Attack replays with followmobj characters, but I think you'll agree that's a reasonable price to pay.
2019-11-21 22:50:04 +00:00
7ff616b26e
Do a whole bunch of cleanup for mapvisited and intermission related things.
...
* Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission.
* Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission.
* Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission.
Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied).
Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
5a7ebb3ba6
Re-reorganize sound options.
2019-11-21 16:53:37 +01:00
b37c3a414a
Remove unneeded HAVE_MIXERX checks.
2019-11-21 16:35:27 +01:00
f13e67bf8f
Merge branch 'gametype-out-of-range' into 'master'
...
Prevent gametype changes being out of range
See merge request STJr/SRB2Internal!503
2019-11-21 09:31:05 -05:00
9db5c5875c
Merge branch 'hi-lj' into 'master'
...
Fix issue with strcasestr that causes a map command crash
See merge request STJr/SRB2Internal!502
2019-11-21 09:30:18 -05:00
toaster
