thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9741 commits 1 branch 12 tags 205 MiB
Commit graph

907 commits

Author SHA1 Message Date
Nev3r
be3234a4e8 Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead. 2019-12-11 10:13:52 +01:00
Nev3r
3214ad0b3a Fix NiGHTS bumpers height. 2019-12-10 18:53:49 +01:00
Nev3r
842afa8d67 Move mobj spawn Z calculating to a separate function. 2019-12-10 18:03:15 +01:00
toaster
3b7b788e4c Revert paperprojection, but keep it as a #define in case someone fixes it in a patch. 2019-12-07 10:22:10 +00:00
MascaraSnake
fffd385151 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
415b6663c9 Actually fix F12 issues 2019-12-07 02:27:48 +08:00
lachwright
e2d4c9e8a7 Hopefully fix F12 issues 2019-12-07 01:52:40 +08:00
Alam Ed Arias
8a37eaeaa0 Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
MascaraSnake
0dd9a3a58b Merge branch 'nullplayerslopelaunch' into 'master' 
Fix slope launch with NULL player causing SIGSEGV.

See merge request STJr/SRB2Internal!595
 2019-12-04 17:07:04 -05:00
MascaraSnake
2908335e17 Merge branch 'tokenultimate' into 'master' 
Fix tokens not spawning in ultimate mode

See merge request STJr/SRB2Internal!594
 2019-12-04 17:06:43 -05:00
toaster
415e172059 Fix slope launch with NULL player causing SIGSEGV. 2019-12-04 12:13:27 +00:00
toaster
efa87d95ce Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion. 2019-12-03 23:21:36 +00:00
Alam Ed Arias
b869d29580 Fixup compiling errors 2019-12-02 12:12:26 -05:00
toaster
7252546100 Fix the flung Brak not being removed on deathpits. 2019-11-30 10:29:51 +00:00
MascaraSnake
a0c10542dd Merge branch 'brakyeet' into 'master' 
This Black Eggman? ***YEET*** (resolves #399)

Closes #399

See merge request STJr/SRB2Internal!575
 2019-11-30 05:21:55 -05:00
toaster
bffeb25e5b Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly. 2019-11-30 10:12:45 +00:00
toaster
e3c8f7bcd3 This Black Eggman? ***YEET*** 
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
 2019-11-29 21:55:25 +00:00
MascaraSnake
4a5b746533 Merge branch 'sleepwalkin' into 'master' 
Sleepwalkin (resolves most of #382)

Closes #382

See merge request STJr/SRB2Internal!567
 2019-11-28 16:08:40 -05:00
MascaraSnake
0e1da4e4b1 Merge branch 'campokes' into 'master' 
Camera pokes (resolves #359, #363, and #383).

Closes #359, #363, and #383

See merge request STJr/SRB2Internal!566
 2019-11-28 14:21:18 -05:00
toaster
4d4aca1082 Change required for Tails' tails to behave like falling sprite. 2019-11-27 13:54:13 +00:00
toaster
300159143a Fix camera not being flipped when camera is stopped due to game design hack reasons (resolves #383). 2019-11-27 13:37:03 +00:00
LJ Sonic
3eea61558e Merge branch 'exit-move-lj' into 'master' 
No more drowning with exitmove now.

See merge request STJr/SRB2Internal!563
 2019-11-27 08:17:22 -05:00
MascaraSnake
742b4eb142 Merge branch 'paperprojection' into 'master' 
Papersprite projection tweak

See merge request STJr/SRB2Internal!535
 2019-11-25 16:53:48 -05:00
MascaraSnake
b52c71b6e2 Merge branch 'minusflip' into 'master' 
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
 2019-11-25 16:43:49 -05:00
toaster
4c276b86de Fix a bunch of shit with MP special stages! 
* Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347).
* Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
 2019-11-25 14:33:15 +00:00
toaster
155b29694c Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was! 
Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.
 2019-11-24 16:42:13 +00:00
lachwright
86ff608cfd Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
Louis-Antoine
2db9a95189 Prevent drowning after completing the level 2019-11-19 22:44:33 +01:00
toaster
d5d892004f As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303. 2019-11-19 15:59:24 +00:00
James R
b57253f8cc dist is unused 2019-11-18 15:53:30 -08:00
MascaraSnake
66cc8046a5 Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
MascaraSnake
5324107edf Merge branch 'jester-fireball' into 'master' 
Mario fireball by Jester (resolves #296)

Closes #296

See merge request STJr/SRB2Internal!487
 2019-11-18 15:56:33 -05:00
MascaraSnake
18d0f2bd90 Merge branch 'nightstail' into 'master' 
NiGHTS tail

See merge request STJr/SRB2Internal!482
 2019-11-18 15:41:52 -05:00
lachwright
2bbd25d207 Important fixes & mine lob speed reduction 2019-11-18 22:57:26 +08:00
Jaime Passos
743f04e2ca Fireball 2019-11-17 21:25:17 -03:00
lachwright
69fd8e9ac2 Remove tester console prints 2019-11-18 05:31:26 +08:00
lachwright
814ee200fa Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
toaster
4d693d5331 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
toaster
4af83b0b01 * 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
MascaraSnake
43938ef56d 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
0c304eefce 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
9a0a85ba67 Merge branch 'secretstuff' into 'master' 
The letter

See merge request STJr/SRB2Internal!438
 2019-11-14 17:49:23 -05:00
Louis-Antoine
c0fb5489df Disable item respawn in NiGHTs levels 2019-11-14 21:21:42 +01: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
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
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
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
MascaraSnake
aefe87f19a Merge branch 'elementalgoop' into 'master' 
THZ goop and Elemental (Resolve #260, I hope?)

Closes #260

See merge request STJr/SRB2Internal!419
 2019-11-11 11:42:19 -05:00
MascaraSnake
79b6f4247d Merge branch 'spinny-sign' into 'master' 
Papersprite end signpost

See merge request STJr/SRB2Internal!442
 2019-11-11 11:39:56 -05:00