Jaime Passos
e40bf85a6f
lua
2019-11-18 13:50:44 -03:00
Jaime Passos
4ea3513076
Organize
2019-11-18 12:56:41 -03:00
Jaime Passos
9d17614c55
arg
2019-11-18 11:42:45 -03:00
Jaime Passos
6c98dde736
stuff
2019-11-18 11:39:54 -03:00
Jaime Passos
8a7b3d7022
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-17 23:57:18 -03:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
755683171a
Merge branch 'titlescreen-connect-crash-fix' into 'master'
...
Fix crash when using the -connect startup paramater (Resolves #292 )
Closes #292
See merge request STJr/SRB2Internal!478
2019-11-16 03:54:49 -05:00
James R
82ad6685a6
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
James R
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
Louis-Antoine
8b3e4d122b
Show player number instead of node when someone joins
2019-11-16 01:42:02 +01:00
James R
53f5d7ffc3
Don't confuse node with player in commands
...
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
2019-11-15 16:07:15 -08:00
Steel Titanium
aff55ee27b
Fix crash when using the -connect startup paramater ( Resolves #292 )
2019-11-15 16:57:47 -05:00
Louis-Antoine
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
James R
56e5e3a01e
Deobfuscate the R_ParseSpriteInfo call
2019-11-14 19:56:26 -08:00
James R
aa158cccd9
Freed before read, oops!
2019-11-14 19:28:33 -08: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
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
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
