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
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
c4f0fdb783
Perfect bonus support for non-NiGHTS special stages
2019-08-02 22:52:53 +01:00
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
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
8520243ab6
Merge branch 'emeraldfixes' into 'master'
...
Special stage related fixes
See merge request STJr/SRB2Internal!269
2019-08-02 13:08:20 -04:00
146271e49d
Merge branch 'maniaspheresfix' into 'master'
...
MANIASPHERES de-hardcode
See merge request STJr/SRB2Internal!268
2019-08-02 13:06:52 -04:00
ee64d98e39
Merge branch 'spring-things' into 'master'
...
Additional spring flags
See merge request STJr/SRB2Internal!256
2019-08-02 13:06:38 -04:00
2503c2f392
Merge branch 'followmobj_scale' into 'master'
...
Smiles tail scale
See merge request STJr/SRB2Internal!273
2019-08-02 13:05:50 -04:00
aab3a029f2
Merge branch 'diagonalrings' into 'master'
...
Diagonal spring ring fixes
See merge request STJr/SRB2Internal!267
2019-08-02 13:03:11 -04:00
d2c3b88020
Merge remote-tracking branch 'origin/master' into spring-things
2019-08-02 15:11:13 +02:00
f2349c5ce4
fixed sphere's CA2_MELEE stasis issue
2019-08-02 13:18:57 +01:00
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
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
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
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
b77780e1e7
Fix building with MSVC
2019-07-29 19:02:45 -04:00
e50dc7c779
Merge branch 'public_next' into private
2019-07-29 18:31:01 -04:00
963d2f5da3
Merge branch 'master' into next
2019-07-29 18:05:33 -04:00
66f84efd02
SDL2: fixed compiling mixer interface with MSVC
2019-07-29 17:56:35 -04:00
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
a6a3048c8f
* Fix diagonal spring ring assortments being forced up/down with slopes.
2019-07-29 21:03:28 +01:00
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
5dc095a47d
Further improvements on MI's request, just to be safe.
2019-07-28 22:53:27 +01:00
1d799630af
Made it possible to just call `EV_CrumbleChain(rover)` in Lua
2019-07-28 22:45:20 +01:00
18e2c2461f
Merge branch 'wavingflag' into 'master'
...
New CEZ scenery
See merge request STJr/SRB2Internal!257
2019-07-28 15:44:00 -04:00
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
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
64517a1362
Fix !150 , too
2019-07-18 00:16:01 +01:00
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
82acf2de6b
Fix Knuckles-in-quicksand messup.
2019-07-17 23:24:44 +01:00
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
438c4d1d51
Fix spindash being broken in quicksand
...
# Conflicts:
# src/p_mobj.c
# src/p_user.c
2019-07-17 21:33:18 +01:00
c8cfc3110f
Merge branch 'public_next'
2019-07-16 18:28:49 +01:00
6eaf7625a9
Merge branch 'master' into next
2019-07-16 18:26:46 +01:00
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
e50147f7f0
Merge branch 'master' into recordattack-bg-fixes
2019-07-16 17:04:42 +01:00
5ef4dda9b9
Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead.
...
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
2019-07-15 20:25:57 +01:00
049789025f
Merge branch 'titlesky-fixes' into 'master'
...
Titlemap fixes
See merge request STJr/SRB2Internal!258
2019-07-14 19:38:07 -04:00
d44a8ab78e
Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks
2019-07-14 22:36:14 +01:00
a1e6f5bdb3
remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/
2019-07-14 22:28:19 +01:00
f6842a80b4
Fixes for menus:
...
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
2019-07-14 21:58:48 +01:00
4e839596a1
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
fac6de9c2e
The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol.
...
(Neither were the CTF starts but those didn't directly cause any problems luckily)
2019-07-14 18:10:03 +01:00
79cf8eb08d
Add a blue variant of the pole banner & change some doomednums.
2019-07-14 17:30:33 +02:00
5c54022a89
Add static keyword to these variables for correctness
2019-07-14 16:23:01 +01:00
794235a848
Fix mixed code-and-declaration error
2019-07-14 16:19:48 +01:00
6cf82fbb43
Merge branch 'libopenmpt-fixes' into 'master'
...
Improved libopenmpt loading
See merge request STJr/SRB2Internal!251
2019-07-14 11:03:14 -04:00
ca7de207d4
Merge branch 'wallspike-fix' into 'master'
...
Fix wall spikes that start retracted
See merge request STJr/SRB2Internal!255
2019-07-14 10:55:10 -04:00
d30af084d7
Merge branch 'thinkerlists-fix' into 'master'
...
Thinkerlists fix
Closes #161
See merge request STJr/SRB2Internal!253
2019-07-14 10:52:56 -04:00
toaster