stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
8111 commits 171 branches 41 tags 312 MiB
Commit graph

8111 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
76488d835f F_WipeColorFill 2019-11-14 21:31:20 -03:00
Jaime Passos
cc5c70ce7b Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:50:09 -03:00
toaster
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
Jaime Passos
6be45ec241 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
toaster
46e8bf2f30 Fix incorrect offsets of cached rotsprites 2019-11-14 23:22:18 +00:00
James R
d36086ba33 Clang warning 2019-11-14 15:12:50 -08:00
MascaraSnake
80fd112009 Merge branch 'papersign2' into 'master' 
Paper sign tweaks

See merge request STJr/SRB2Internal!460
 2019-11-14 18:07:34 -05:00
MascaraSnake
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
MascaraSnake
031a352f72 Merge branch 'titleflash' into 'master' 
Improved title screen flashes

See merge request STJr/SRB2Internal!462
 2019-11-14 18:07:05 -05:00
MascaraSnake
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
MascaraSnake
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
Jaime Passos
d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
MascaraSnake
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
MascaraSnake
8f6890025c Merge branch 'secretstuff' into 'master' 
The letter

See merge request STJr/SRB2Internal!438
 2019-11-14 17:49:23 -05:00
Louis-Antoine
f4beb4a56f Disable monitor respawning in co-op 2019-11-14 22:27:02 +01:00
Louis-Antoine
18dc6013ed Disable item respawn in NiGHTs levels 2019-11-14 21:21:42 +01:00
MascaraSnake
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
MascaraSnake
89f1e1ce61 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
15da6c153a Woops, condition was accidentially inverted... but also I decided this looks nicer instead. 2019-11-14 19:09:17 +00:00
Louis-Antoine
cccf1c8a7b Disable perfect bonus in multiplayer 2019-11-14 19:25:19 +01:00
toaster
278ddcf770 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
8506d420a6 Optimise 2019-11-14 14:12:36 -03:00
toaster
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
Jaime Passos
10d1b63ff2 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
Jaime Passos
cb4820c505 Oh. Sorry. 2019-11-14 12:42:45 -03:00
Louis-Antoine
ffd9cfebe6 Allow item respawn in co-op again 
Why was it even disabled anyway.
 2019-11-14 16:37:09 +01:00
Jaime Passos
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
toaster
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
toaster
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
James R
b38a1ec313 Save bans when cleared too 
(Why doesn't it work for I_Quit?)
 2019-11-13 17:37:53 -08:00
toaster
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
James R
7776c59cdd Warn if the gametype is not valid at all! 2019-11-13 14:31:44 -08:00
James R
359d8a2c25 Optimizations from LJ and generic functions 2019-11-13 14:26:28 -08:00
toaster
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
toaster
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
toaster
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
MascaraSnake
1f7e5aa150 Minor capitalization fix in ZB config 2019-11-13 21:07:06 +01:00
MascaraSnake
14477748be Merge branch 'stopclock' into 'master' 
Stop the clock!

See merge request STJr/SRB2Internal!450
 2019-11-13 14:39:59 -05:00
MascaraSnake
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
MascaraSnake
750e826310 Merge branch 'skinusablua' into 'master' 
Skin UsabLua

See merge request STJr/SRB2Internal!458
 2019-11-13 13:59:36 -05:00
MascaraSnake
1d7ce8d955 Merge branch 'radiomode2' into 'master' 
Radio Mode fixes

See merge request STJr/SRB2Internal!459
 2019-11-13 13:58:26 -05:00
MascaraSnake
8fe0cb91eb Merge branch 'revert-96aa11c8' 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
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
toaster
ec44b24f72 Ok, I'm really paying for my hubris. Corrected a faulty optimisation in my fix. 2019-11-13 17:06:54 +00:00
toaster
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
toaster
fc8392dac4 Typo (my fault). 2019-11-13 16:54:51 +00:00
toaster
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
toaster
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
Jaime Passos
9caf98aa0b nevermind 2019-11-13 13:20:55 -03:00
Jaime Passos
69fe096140 reset rollangle 2019-11-13 13:03:02 -03:00