thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 22:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11178 commits 2 branches 14 tags 206 MiB
Commit graph

908 commits

Author SHA1 Message Date
James R
132dd278ca Fix "SRB2" SOC directive, though its usefulness is debatable 2019-12-17 14:11:45 -08:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Monster Iestyn
3022d559c8 Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean 2019-12-16 20:26:19 +00:00
James R
ae73e8f4e0 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
20cf020458 Fix clearing maps making the Tutorial option on the SP menu crash. 2019-12-05 13:42:08 +00: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
e36dc688dd "showconditionset" option for Unlockables and Extra Emblems. See merge request (coming shortly) for full description/prompt. 2019-11-24 14:35:31 +00:00
lachwright
86ff608cfd Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
toaster
4b9eb8fbe8 Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339). 2019-11-24 13:51:53 +00:00
MascaraSnake
62ae268a29 Merge branch 'menu-reordering' into 'master' 
Menu reordering (also renaming secrets to extras)

See merge request STJr/SRB2Internal!511
 2019-11-23 17:51:46 -05:00
MascaraSnake
6ac467896b Merge branch 'drtminus' into 'master' 
drt minus

See merge request STJr/SRB2Internal!495
 2019-11-22 16:09:58 -05:00
sphere
693d6b5ca5 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01: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
2ca069e5ba Merge branch 'titlecards' into 'master' 
Titlecards

See merge request STJr/SRB2Internal!492
 2019-11-18 16:22:32 -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
Jaime Passos
8ce00492c2 Merge remote-tracking branch 'origin/master' into titlecards 2019-11-18 17:55:47 -03: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
MascaraSnake
2df5fd3b30 Merge branch 'poledance' into 'master' 
Make ACZ3's slapstick signpost taller (resolves #267).

Closes #267

See merge request STJr/SRB2Internal!473
 2019-11-18 15:14:48 -05:00
MascaraSnake
abdfc2d237 Merge branch 'exit-move-lj' into 'master' 
Post-exit movement

See merge request STJr/SRB2Internal!486
 2019-11-18 15:10:15 -05:00
Jaime Passos
bb8b49b738 LF_WARNINGTITLE 2019-11-18 15:04:40 -03:00
Jaime Passos
75468a1d5d map header option 2019-11-18 14:08:47 -03: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
Nev3r
e3e93016cd Mapname lowercase support (#146) 
*  Moved levelname parsing to before where uppercase conversion occurs.
*  Extended titlecard font range.
*  Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
*  Don't convert to uppercase when rendering the titlecard name.


Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-11-16 20:36:25 -05:00
Louis-Antoine
d3b113c84a Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
toaster
9c221d2362 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +00:00
Louis-Antoine
28b0b7c404 Let players move after completing the level 
This only takes effect in co-op,
and can be disabled with "exitmove off"
 2019-11-15 15:35:28 +01: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
d93b70ff26 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
2fa2ebe4a7 Optimise 2019-11-14 14:12:36 -03: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
Jaime Passos
499c724f9f Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
Jaime Passos
0a44158db9 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
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
3e759a2b75 rename rollaxis to rotaxis 2019-11-13 12:47:30 -03:00
Jaime Passos
ae630a9a23 Rotation axis (will rename internally later) 2019-11-13 12:36:44 -03:00
MascaraSnake
d648a2ad87 Merge branch 'radiomode' into 'master' 
Radio mode

See merge request STJr/SRB2Internal!443
 2019-11-13 04:16:38 -05: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