52a24e0bc4
Allow AI Tails to carry the player
2019-11-18 13:30:07 +08:00
bf4dbead74
Update to latest script version
2019-11-18 11:22:27 +08:00
8a7b3d7022
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-17 23:57:18 -03:00
4439d29ed7
Shift showping display up a bit
2019-11-17 18:54:23 -08:00
b05dec5294
Shift ping display in scores HUD up, so it aligns with the bottom of player name
2019-11-17 18:53:17 -08:00
22421b1031
Snapping for showping, so it doesn't jump way up on non-green
2019-11-17 18:52:05 -08:00
ac7d07c9da
Prevent mines from sliding upon touching the ground
2019-11-18 10:35:56 +08:00
b4987636fe
Add missing checks for PF_FINISHED in HUD code
2019-11-18 03:27:39 +01:00
76831595ce
Merge branch 'master' into cobalt-ai
2019-11-18 10:13:16 +08:00
2584241a44
Better ping implementation.
2019-11-17 20:22:47 -05:00
635e121bfc
Restore old sound effect
2019-11-17 21:33:59 -03:00
64939816fb
Fireball
2019-11-17 21:25:17 -03:00
24744d07e4
Disable exitmove by default
2019-11-17 23:52:51 +01:00
688bf0158d
Disable Tails carrying for players who completed the level
...
To avoid trolls...
2019-11-17 23:46:34 +01:00
6c98a150be
Show the exit icon for finished players
2019-11-17 23:44:48 +01:00
4cc1b2b327
Disable the GL sprite shadows behind a #define.
...
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
2019-11-17 22:18:46 +00:00
cf53e255eb
Remove tester console prints
2019-11-18 05:31:26 +08:00
5cafed5c72
Make rollout rocks more friendly
2019-11-18 05:30:14 +08:00
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
ef5558af97
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
0c98fb746c
Add some NiGHTS animations which default to normal player sprite2s to the existing player->panim set list, which makes Tails' tails appear due to how P_DoTailsOverlay is coded (assuming the skin is Tails, requiring them to have SPR2_NFLY available).
2019-11-17 18:04:02 +00:00
8ce054a7c8
Align to base rather than top.
2019-11-17 15:55:22 +00:00
5909b85627
Fix overlapping on You Can Now Become Super Sonic screen.
2019-11-17 15:20:20 +00:00
76897b560f
Update end tally and sound test to accomodate new title font.
2019-11-17 14:56:05 +00:00
fdd681ab72
Since I had to tweak this branch to do the scrapped changing-to-title-music-at-a-different-time thing (since it was too late, and too late is WAY worse than too early): Have the credits music fade out over a shorter time when going to the title screen (vs going to evaluation), as opposed to stopping entirely.
2019-11-17 14:14:38 +00:00
5dc494da16
Mapname lowercase support ( #146 )
...
* Moved levelname parsing to before where uppercase conversion occurs.
* Extended titlecard font range.
* Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
* Don't convert to uppercase when rendering the titlecard name.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-11-16 20:36:25 -05:00
144502729a
Merge branch 'sprinfo-bruh-moment' into 'master'
...
Freed before read, oops!
See merge request STJr/SRB2Internal!470
2019-11-16 12:54:21 -05:00
8adf564c41
Merge branch 'clearer-nodes-command' into 'master'
...
Make the "nodes" command clearer
See merge request STJr/SRB2Internal!477
2019-11-16 12:53:31 -05:00
d3fe116298
Merge branch 'fix-default-snac' into 'master'
...
defaultname, defaultskin and defaultcolor changes
See merge request STJr/SRB2Internal!479
2019-11-16 12:52:48 -05:00
82ad6685a6
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
6595d20709
Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start
2019-11-15 17:31:53 -08:00
8b3e4d122b
Show player number instead of node when someone joins
2019-11-16 01:42:02 +01:00
53f5d7ffc3
Don't confuse node with player in commands
...
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
2019-11-15 16:07:15 -08:00
12e8c11382
Update hw_main.c
2019-11-15 19:40:58 -03:00
55c42d9cb7
Small mistake
2019-11-15 19:36:25 -03:00
5b0730839b
Move scope of wipelumpname
2019-11-15 19:09:02 -03:00
41835e07ea
I don't get it
2019-11-15 19:04:40 -03:00
7ba7620059
Shadowed declaration and unused parameters
2019-11-15 18:58:45 -03:00
aff55ee27b
Fix crash when using the -connect startup paramater ( Resolves #292 )
2019-11-15 16:57:47 -05:00
f55b0f52ca
Accidental missing (void)
2019-11-15 18:53:32 -03:00
c15ee65015
LEVELWIPES
2019-11-15 18:21:12 -03:00
29501a992b
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
d95a1e2ff3
Make the "nodes" command clearer
...
Because literally anyone who isn't a dev has
no idea what those fucking numbers even mean...
Before:
$nodes
00 - Sonic - 01 - 666.66.420.42:5029
01 - Tales - 00 - self
02 - Nukes - 255
03 - Ammie - 255
04 - Fangs - 255
05 - Metal - 255
After:
$nodes
00 - Sonic - node 01 - 666.66.420.42:5029
01 - Tales - node 00 - self
02 - Nukes
03 - Ammie
04 - Fangs
05 - Metal
2019-11-15 17:50:40 +01:00
98712ad703
Resolve #291 .
2019-11-15 16:39:30 +00:00
efa609d366
Ending music and associated.
...
* Play the good or bad ending track, instead of perfect silence.
* Fade out the credits music over 5 seconds when the credits go to the evaluation (timed to have finished just before the "you unlocked this!" jingle).
2019-11-15 15:58:25 +00:00
52bd4b05e1
* Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times.
...
* If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
2019-11-15 15:20:36 +00:00
892f6eca27
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
ff62a0732a
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
d91d07da5b
Fix Metal Sonic not correctly flipping with gravity. (Doesn't require a new Metal recording.)
2019-11-15 13:10:41 +00:00
66001cc73c
Resolve #288 .
...
* Fix off-by-one error I caused in the skin randomisation selection.
* Clean up signcolour set to never go outside of valid entry range.
* Fix the preventing-console-spam mechanism for invalid sprites viewed in-game by only setting the state's sprite/frame to S_UNKNOWN's if the object's sprite/frame is currenly equal to the state's.
2019-11-15 12:47:21 +00:00
56e5e3a01e
Deobfuscate the R_ParseSpriteInfo call
2019-11-14 19:56:26 -08:00
aa158cccd9
Freed before read, oops!
2019-11-14 19:28:33 -08:00
88fb22d688
Yeah, yeah...
2019-11-14 22:14:40 -03:00
76488d835f
F_WipeColorFill
2019-11-14 21:31:20 -03:00
cc5c70ce7b
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:50:09 -03:00
d0fac1988a
Merge branch 'rotsprite_toast' into 'master'
...
Fix incorrect offsets of cached rotsprites
See merge request STJr/SRB2Internal!468
2019-11-14 18:49:12 -05:00
6be45ec241
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:24:42 -03:00
46e8bf2f30
Fix incorrect offsets of cached rotsprites
2019-11-14 23:22:18 +00:00
d36086ba33
Clang warning
2019-11-14 15:12:50 -08:00
80fd112009
Merge branch 'papersign2' into 'master'
...
Paper sign tweaks
See merge request STJr/SRB2Internal!460
2019-11-14 18:07:34 -05:00
6c6d89ca57
Merge branch 'flickies_not_in_walls' into 'master'
...
Flickies not in walls
See merge request STJr/SRB2Internal!461
2019-11-14 18:07:19 -05:00
031a352f72
Merge branch 'titleflash' into 'master'
...
Improved title screen flashes
See merge request STJr/SRB2Internal!462
2019-11-14 18:07:05 -05:00
3d8043ff64
Merge branch 'map-by-name' into 'master'
...
LJ saved me from self destruction by bad code
See merge request STJr/SRB2Internal!463
2019-11-14 18:06:52 -05:00
b0786f12de
Merge branch 'coop-item-respawn' into 'master'
...
Allow item respawn in co-op again
See merge request STJr/SRB2Internal!466
2019-11-14 18:06:32 -05:00
d95a93b537
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
07ea748d96
Merge branch 'soundsystemfix' into 'master'
...
Sound system startup fix
Closes #281
See merge request STJr/SRB2Internal!465
2019-11-14 17:50:41 -05:00
8f6890025c
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
f4beb4a56f
Disable monitor respawning in co-op
2019-11-14 22:27:02 +01:00
18dc6013ed
Disable item respawn in NiGHTs levels
2019-11-14 21:21:42 +01:00
3352f914d7
Merge branch 'rotsprite_i' into 'master'
...
Sprite rotation (resolves #183 )
Closes #183
See merge request STJr/SRB2Internal!430
2019-11-14 14:58:13 -05:00
15da6c153a
Woops, condition was accidentially inverted... but also I decided this looks nicer instead.
2019-11-14 19:09:17 +00:00
cccf1c8a7b
Disable perfect bonus in multiplayer
2019-11-14 19:25:19 +01:00
278ddcf770
Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast
2019-11-14 17:15:34 +00:00
8506d420a6
Optimise
2019-11-14 14:12:36 -03:00
afe28b0a0a
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
...
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 17:03:02 +00:00
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
cb4820c505
Oh. Sorry.
2019-11-14 12:42:45 -03:00
ffd9cfebe6
Allow item respawn in co-op again
...
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
4292c5fc0b
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
2019-11-14 12:27:22 -03:00
261041dc69
Resolve #281 . (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.)
2019-11-14 14:19:13 +00:00
da1b4f2277
Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.)
2019-11-14 12:52:34 +00:00
b38a1ec313
Save bans when cleared too
...
(Why doesn't it work for I_Quit?)
2019-11-13 17:37:53 -08:00
761bd41eb5
I'm a dumbass who makes extremely consequential typoes (and since the typo is no longer in effect, the supergold can be brightened some more)
...
https://cdn.discordapp.com/attachments/244035368595357697/644316971738857483/srb20060.gif
2019-11-13 23:27:01 +00:00
7776c59cdd
Warn if the gametype is not valid at all!
2019-11-13 14:31:44 -08:00
359d8a2c25
Optimizations from LJ and generic functions
2019-11-13 14:26:28 -08:00
3afe152a86
Sev wanted no darkness during the initial animation... I think this is an acceptible compromise!
...
https://cdn.discordapp.com/attachments/428262628893261828/644295409283497995/srb20058.gif
2019-11-13 22:02:06 +00:00
39d80e1cba
https://cdn.discordapp.com/attachments/244035368595357697/644293089049182218/srb20057.gif
...
* Make the white flash a little easier on the eyes by putting the full-screen fade behind the title wing/ring, then drawing multiple overlaid colormapped versions of them on top of each other.
* Darken the pre-flash screen.
2019-11-13 21:52:35 +00:00
a3de6d21c4
* Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it.
...
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
2019-11-13 20:14:08 +00:00
14477748be
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
7cfc7b38c5
Merge branch 'forceskin_bs' into 'master'
...
MP Charsel menu fixes
See merge request STJr/SRB2Internal!457
2019-11-13 14:00:11 -05:00
750e826310
Merge branch 'skinusablua' into 'master'
...
Skin UsabLua
See merge request STJr/SRB2Internal!458
2019-11-13 13:59:36 -05:00
1d7ce8d955
Merge branch 'radiomode2' into 'master'
...
Radio Mode fixes
See merge request STJr/SRB2Internal!459
2019-11-13 13:58:26 -05:00
510f36fbdf
Merge branch 'map-by-name' into 'master'
...
New map command
See merge request STJr/SRB2Internal!424
2019-11-13 13:45:36 -05:00
ec44b24f72
Ok, I'm really paying for my hubris. Corrected a faulty optimisation in my fix.
2019-11-13 17:06:54 +00:00
527195c214
I should be more careful when commiting, lmao. (Just a little bit of tying off loose ends for peace of mind.)
2019-11-13 16:59:29 +00:00
fc8392dac4
Typo (my fault).
2019-11-13 16:54:51 +00:00
b4da50b7fb
When you have the skin to set to in A_SignPlayer be "next skin", it's possible the initial skin to pick is a not-available character. This commit prevents that.
2019-11-13 16:51:50 +00:00
471ae8ecb4
Paper sign tweaks.
...
* Add "twinkling" and "landing sounds to paper signpost.
* Fix whitespace on definitions.
* It says locvar2 is unused in the comment for A_SignSpin, but it's used for the "doesn't have a spawnpoint" thing. Make it deathstate instead, so the object doesn't disappear.
2019-11-13 16:33:53 +00:00
9caf98aa0b
nevermind
2019-11-13 13:20:55 -03:00
69fe096140
reset rollangle
2019-11-13 13:03:02 -03:00
lachwright
