MascaraSnake
5892de3011
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
MascaraSnake
aba7e8f9ab
Merge branch 'clearbans-please' into 'master'
...
Write empty file on clearbans
See merge request STJr/SRB2Internal!464
2019-11-14 14:35:03 -05:00
toaster
6986e7b0a1
Woops, condition was accidentially inverted... but also I decided this looks nicer instead.
2019-11-14 19:09:17 +00:00
Louis-Antoine
c5003cb494
Disable perfect bonus in multiplayer
2019-11-14 19:25:19 +01:00
toaster
d93b70ff26
Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast
2019-11-14 17:15:34 +00:00
Jaime Passos
2fa2ebe4a7
Optimise
2019-11-14 14:12:36 -03:00
toaster
a4efd441af
* 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
Jaime Passos
499c724f9f
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
644aebac80
Oh. Sorry.
2019-11-14 12:42:45 -03:00
Louis-Antoine
7ca4184cb2
Allow item respawn in co-op again
...
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
Jaime Passos
0a44158db9
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
toaster
763b49e83f
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
toaster
35b6e8ca94
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
James R
7815b876b9
Save bans when cleared too
...
(Why doesn't it work for I_Quit?)
2019-11-13 17:37:53 -08:00
toaster
5a26b684ad
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
James R
9290fa7e20
Warn if the gametype is not valid at all!
2019-11-13 14:31:44 -08:00
James R
85b6b307e8
Optimizations from LJ and generic functions
2019-11-13 14:26:28 -08:00
toaster
594974f287
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
toaster
6d7b448f49
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
toaster
b0505e268e
* 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
MascaraSnake
91f3bdc091
Minor capitalization fix in ZB config
2019-11-13 21:07:06 +01:00
MascaraSnake
aeedb86d8c
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
MascaraSnake
a6af55717f
Merge branch 'forceskin_bs' into 'master'
...
MP Charsel menu fixes
See merge request STJr/SRB2Internal!457
2019-11-13 14:00:11 -05:00
MascaraSnake
6543ac5680
Merge branch 'skinusablua' into 'master'
...
Skin UsabLua
See merge request STJr/SRB2Internal!458
2019-11-13 13:59:36 -05:00
MascaraSnake
3f3078b401
Merge branch 'radiomode2' into 'master'
...
Radio Mode fixes
See merge request STJr/SRB2Internal!459
2019-11-13 13:58:26 -05:00
MascaraSnake
a4fd9de000
Merge branch 'revert-ea085a4c' into 'master'
...
Update libs (revert revert revert buffalo buffalo buffalo)
See merge request STJr/SRB2Internal!436
2019-11-13 13:56:34 -05:00
MascaraSnake
302e122d64
Merge branch 'map-by-name' into 'master'
...
New map command
See merge request STJr/SRB2Internal!424
2019-11-13 13:45:36 -05:00
toaster
02530840e9
Ok, I'm really paying for my hubris. Corrected a faulty optimisation in my fix.
2019-11-13 17:06:54 +00:00
toaster
df87eb664c
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
toaster
d185eee68f
Typo (my fault).
2019-11-13 16:54:51 +00:00
toaster
f43044d77b
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
toaster
28a573fac3
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
Jaime Passos
50fbefe9b3
nevermind
2019-11-13 13:20:55 -03:00
Jaime Passos
4f760c885f
reset rollangle
2019-11-13 13:03:02 -03:00
Jaime Passos
611bd4f8b4
actually,
2019-11-13 13:00:57 -03:00
Jaime Passos
249d563dd6
make S_PLAY_NIGHTS_PULL use A_RollAngle
2019-11-13 12:57:22 -03:00
Jaime Passos
3e759a2b75
rename rollaxis to rotaxis
2019-11-13 12:47:30 -03:00
Jaime Passos
ae630a9a23
Rotation axis (will rename internally later)
2019-11-13 12:36:44 -03:00
toaster
0999bb7678
Update SFX definition to credit VAdaPEGA specifically, given we've made most credits more specific now too.
2019-11-13 15:02:06 +00:00
toaster
a921e9c7d8
* Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention).
...
* Use thinstring for Authors field on the screen.
2019-11-13 13:44:00 +00:00
MascaraSnake
d648a2ad87
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
James R
6ee9c029e4
Warn if the first argument is an option
2019-11-12 18:29:42 -08:00
James R
83d31c782b
Get map name from multiple arguments
...
(This means you don't need quoting.)
2019-11-12 17:42:54 -08:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
James R
f7e879da06
So you don't like macros?
2019-11-12 16:10:00 -08:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
MascaraSnake
00b8fc42b0
Merge branch 'a_skullattack-hang' into 'master'
...
GFZ3's boss hangs when dodging
See merge request STJr/SRB2Internal!403
2019-11-12 18:25:58 -05:00
MascaraSnake
9b4d0de22b
Merge branch 'atz-hazards' into 'master'
...
Azure Temple Zone hazards, round 2
See merge request STJr/SRB2Internal!437
2019-11-12 18:05:44 -05:00
MascaraSnake
1db991bbdb
Merge branch 'metalrecording' into 'master'
...
Metal battle, recording, and playback improvements
Closes #283 and #215
See merge request STJr/SRB2Internal!431
2019-11-12 17:49:53 -05:00
toaster
f7c5774b7e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00