MascaraSnake
15bba9e1b0
Merge branch 'hoop_drawdist' into 'master'
...
Only apply NiGHTS draw distance to hoops
See merge request STJr/SRB2Internal!370
2019-10-12 03:10:53 -04:00
MascaraSnake
0f562d27d7
Merge branch 'fastgoop' into 'master'
...
Increased THZ goop speed by 25%
Closes #229
See merge request STJr/SRB2Internal!367
2019-10-12 03:10:26 -04:00
lachwright
3600e1b140
Allow rollout rock's splash sound delay reduction to occur above water
2019-10-12 04:41:50 +08:00
lachwright
a01373741b
Don't spam splash sounds on the rollout rock
2019-10-12 04:35:51 +08:00
lachwright
2daeb81f36
Create new linedef special type 153: Dynamically Sinking Platform
2019-10-12 04:23:11 +08:00
MascaraSnake
68599ccc63
Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag
2019-10-11 21:02:11 +02:00
Steel Titanium
25971de368
Attempt to fix the offset issues.
...
Better than the previous commit, but not quite there yet.
2019-10-10 15:50:06 -04:00
toaster
1560453797
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
...
# Conflicts:
# src/p_map.c
2019-10-10 17:51:29 +01:00
MascaraSnake
354429ca39
Merge branch 'intro-sky-fix' into 'master'
...
Fix the sky on the intro cutscene not scrolling.
Closes #220
See merge request STJr/SRB2Internal!353
2019-10-10 02:36:53 -04:00
MascaraSnake
7fedde9811
Merge branch 'promiscuousplanes' into 'master'
...
Headbumps and associated
Closes #242
See merge request STJr/SRB2Internal!360
2019-10-10 02:36:10 -04:00
MascaraSnake
c17a3227a0
Merge branch 'bumperstuff' into 'master'
...
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
Closes #246
See merge request STJr/SRB2Internal!365
2019-10-10 02:35:33 -04:00
MascaraSnake
a138c0ebf2
Merge branch 'acz_touchups' into 'master'
...
ACZ touchups
Closes #209 , #208 , and #158
See merge request STJr/SRB2Internal!359
2019-10-10 02:34:46 -04:00
MascaraSnake
7ceef506fc
Merge branch 'specialstage_water' into 'master'
...
Don't deplete special stage timer in water if you have water protection
See merge request STJr/SRB2Internal!364
2019-10-10 02:33:05 -04:00
Steel Titanium
4af432e658
Basic outline color support.
...
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
2019-10-10 02:00:52 -04:00
lachwright
b2529136e0
Reduce speed sneaker's top speed factor to 1.67x
2019-10-09 21:39:51 +08:00
lachwright
d553b6a011
Add sounds to rollout rock in lava
2019-10-09 15:06:50 +08:00
lachwright
82fcdf4d43
Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound)
2019-10-09 14:24:27 +08:00
Steel Titanium
18bf8aa6e4
WIP: New character select name font
2019-10-09 00:28:01 -04:00
toaster
43e13b38c9
Change one of the Pyrefly captions.
2019-10-08 19:45:43 +01:00
toaster
1155a7c3a0
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
...
# Conflicts:
# src/p_mobj.c
2019-10-08 19:43:43 +01:00
toaster
4870107974
Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V )
2019-10-08 16:38:53 +01:00
James R
34bddc1ce7
Merge remote-tracking branch 'origin/master' into next
2019-10-07 18:19:48 -07:00
James R
91d3f7e2cc
Merge branch 'fix-fixedrem' into 'next'
...
Make FixedRem less laggy by just using the modulo operator.
See merge request STJr/SRB2!503
2019-10-07 21:16:33 -04:00
James R
b32a0315eb
Merge branch 'fix-MF_NOCLIPTHING' into 'next'
...
Fix MF_NOCLIPTHING
See merge request STJr/SRB2!467
2019-10-07 21:14:49 -04:00
James R
92dd9d2066
Forgot includes
2019-10-07 18:11:00 -07:00
James R
88615f58cf
Merge branch 'lua-error-print-fix' into 'master'
...
Lua: Fix some errors not working properly.
See merge request STJr/SRB2!510
2019-10-07 21:09:00 -04:00
James R
2f521f2eb1
ferror does not return errno, are you stupid?
...
Use M_FileError to return the proper error description, or "end-of-file".
2019-10-07 18:04:42 -07:00
MascaraSnake
bc794a2227
Players can jostle free from Pterabytes
2019-10-08 00:00:41 +02:00
MascaraSnake
788415a4db
Don't apply autobrake to Pterabyte-carried players
2019-10-07 22:33:06 +02:00
MascaraSnake
0fceb66e71
Make the Pyrefly glowing and damaging in its fire-spawning state
2019-10-07 22:23:52 +02:00
MascaraSnake
ce5d0691ac
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
2019-10-07 19:12:03 +02:00
MascaraSnake
8062422f13
Fixed wrong sound being played by Pyreflies with Ambush
2019-10-07 19:11:36 +02:00
lachwright
3412eb655a
Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability)
2019-10-07 22:51:13 +08:00
lachwright
77dd5260ab
Allow rock to disappear if unridden for 12 seconds
2019-10-07 22:22:51 +08:00
toaster
46a1d6897c
Address checkbox 1 and 2 of #235 .
...
* If using twinspin and have melee ability too, go into melee landing when hitting the ground.
* Only have melee go directly forward if standing/idle, otherwise use drawangle.
2019-10-07 15:03:28 +01:00
lachwright
c64997bfe5
Add Ambush and Flip flag behaviors
2019-10-07 20:55:58 +08:00
toaster
d84564d9f2
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
2019-10-07 13:08:49 +01:00
lachwright
95f6e2008f
Better rollout behavior in lava
2019-10-07 15:25:32 +08:00
MascaraSnake
2113774a6a
Don't deplete special stage timer in water if you have water protection
2019-10-07 09:01:17 +02:00
lachwright
bfb9bac5bd
Collision polish
2019-10-07 14:51:32 +08:00
MascaraSnake
fe2f383997
Fixed a typo
2019-10-07 08:36:40 +02:00
lachwright
bed9dff077
Readability changes
2019-10-07 13:36:36 +08:00
lachwright
306779fac0
Readability changes
2019-10-07 13:35:10 +08:00
lachwright
7850d43725
Let ridden rollout rocks collide with other players
2019-10-07 13:14:23 +08:00
James R
6fd645ef27
A-arrows on Record Attack level select
...
Menu code sucks, did you know?
2019-10-06 14:45:42 -07:00
James R
0be3743450
Key handler to allow selecting map by arrow keys in Record Attack
...
Enter still goes to the platter.
2019-10-06 14:11:16 -07:00
Jaime Passos
7746767735
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
MascaraSnake
058ed632de
Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players.
...
Springs and gas jets are exempt because all hell might break loose otherwise.
2019-10-06 19:53:54 +02:00
toaster
9b94fd3752
* Add rudimentary support for MF2_LINKDRAW in GL.
...
* Allow MF_ENEMY objects to flash, just as they do in Software.
2019-10-06 16:31:13 +01:00
toaster
a2f8b84b5a
Good catch by MS.
2019-10-06 16:17:11 +01:00