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
11060 commits 1 branch 12 tags 205 MiB
Commit graph

323 commits

Author SHA1 Message Date
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
LJ Sonic
325867ea59 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

See merge request STJr/SRB2!1018
 2020-07-04 07:09:43 -04:00
LJ Sonic
ac070380c1 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
Zippy_Zolton
74ece42ee2 Jet Jaw Sounds 2020-06-25 00:38:07 -05:00
sphere
97ebb50e12 Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. 2020-06-21 16:01:24 +02:00
Zippy_Zolton
9c194f4186 Thanks for the feedback, I have fixed your issues. 2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7 New Debris for CEZ3 2020-06-20 02:02:13 -05:00
MascaraSnake
b068a37d14 Merge branch 'udmf-next' into udmf-polyobjects 
# Conflicts:
#	src/p_polyobj.c
 2020-05-16 11:18:47 +02:00
lachwright
645c324d51 Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
lachwright
b4648e4c78 New GFZ3 laser 2020-05-06 09:01:02 +08:00
MascaraSnake
db717f1cf7 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
James R
71f4433b98 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
7f190f35f2 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
James R
9820a7384f Reset rollangle on TNT explosion 
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
 2020-01-31 14:32:47 -08:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
James R
e831a61df5 Merge branch 'clear-sign-sprite' into 'next' 
Add generic signpost sprite for skins that don't have one

See merge request STJr/SRB2!626
 2020-01-16 19:57:54 -05:00
Tatsuru
445269ce14 Expose colorization to mappers and SOC 2020-01-11 20:40:57 -03:00
Tatsuru
8d5153a595 This is stupid 2020-01-09 12:15:26 -03:00
lachwright
95ca48ada7 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
86ff608cfd Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
MascaraSnake
6ac467896b Merge branch 'drtminus' into 'master' 
drt minus

See merge request STJr/SRB2Internal!495
 2019-11-22 16:09:58 -05:00
lachwright
eb80360850 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
lachwright
a9326be8d7 Add GFZ debris; reorganize wood debris index 2019-11-21 01:05:22 +08:00
MascaraSnake
04fbb5dbd3 Merge branch 'cobalt-ai' into 'master' 
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
 2019-11-18 17:26:28 -05:00
MascaraSnake
66cc8046a5 Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
toaster
420656a716 As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite. 2019-11-18 22:05:05 +00:00
toaster
7bcaa5c359 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai 
# Conflicts:
#	src/p_map.c
 2019-11-18 21:33:51 +00: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
ecd021abdf Merge branch 'fhzenemytweaks' into 'master' 
Hardcode DrT's FHZ improvements (resolves #295).

Closes #295

See merge request STJr/SRB2Internal!483
 2019-11-18 15:21:59 -05:00
lachwright
cd38e4ba1a Add flight indicator 2019-11-18 15:17:27 +08:00
lachwright
3fb5870445 Prevent mines from sliding upon touching the ground 2019-11-18 10:35:56 +08:00
Jaime Passos
743f04e2ca Fireball 2019-11-17 21:25:17 -03:00
lachwright
814ee200fa Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
toaster
e936b0d893 Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha 2019-11-17 20:34:25 +00:00
toaster
9c221d2362 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +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
9a0a85ba67 Merge branch 'secretstuff' into 'master' 
The letter

See merge request STJr/SRB2Internal!438
 2019-11-14 17:49:23 -05: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
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
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03: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
Jaime Passos
b078b8791a Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00