thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-26 13:01:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
23092 commits 2 branches 14 tags 206 MiB
Commit graph

23092 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
132dd5828a * For testing purposes, show Encoremaps on the level select icons. 
* HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit...
* Encoremap maces per Oni's request and Sal's suggestion
 2018-08-10 21:11:45 +01:00
mazmazz
b7f3f12dd6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:51:20 -04:00
Monster Iestyn
20ea372306 Merge branch 'polyobj-sky-plane-crash-fix' into 'master' 
Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146
 2018-08-10 15:40:43 -04:00
Monster Iestyn
593c41f34f Merge branch 'leveltitle-tinkering' into 'master' 
Leveltitle tinkering

See merge request STJr/SRB2Internal!134
 2018-08-10 15:30:26 -04:00
mazmazz
79d5c553c3 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:10:26 -04:00
Monster Iestyn
827da4098d Merge branch 'master' into polyobj-sky-plane-crash-fix 2018-08-10 20:06:12 +01:00
Monster Iestyn
c670b20c25 Merge branch 'master' into change-colormap-ldef 2018-08-10 20:05:04 +01:00
Monster Iestyn
710d940a9b Merge branch 'master' into horizon-line-hom-fix 2018-08-10 20:04:39 +01:00
mazmazz
ef49700a49 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
Monster Iestyn
3e80f4a59b Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
 2018-08-10 20:03:59 +01:00
mazmazz
5e5ec4a71a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker 2018-08-10 15:03:07 -04:00
mazmazz
4da48384e8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof 2018-08-10 15:02:43 -04:00
mazmazz
9f41426008 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes 2018-08-10 15:00:41 -04:00
mazmazz
b680dafdb4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things 2018-08-10 14:58:27 -04:00
Monster Iestyn
1952653f5b Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
toaster
eac0af999d More control over what stuff get Encore mapping applied to it, with sensible defaults so you don't have to do much to your map to get it to be supported! 
* Objects!
	* Gone is the arcane, difficult-to-remember list of random flags. Say hello to MF_DONTENCOREMAP!
	* Alternatively, if the object has a skincolour applied to it, it isn't encoremapped either. (Useful for ghosts, for example.)
* Sectors!
	* The autodetecting of sneaker and spring panels is now much more intelligent, and only avoids remapping the plane(s) the effect is availible upon.
	* Sector special group 2 no. 15 is now "Invert Encore Remap". It inverts the above detection.
* Linedefs!
	* The "Transfer Line" linedef flag can now also be used to deny Encore remappings on linedef textures.
	* Right now it applies to every pixel drawn specifically belonging to that linedef, but if people decide it needs changing, we CAN make it apply to midtextures only (like linedef types 900-910).
 2018-08-10 19:31:30 +01:00
Monster Iestyn
877ac62895 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
Digiku
2f7cfcc7b8 Merge branch 'hardcoding-nights-spheredamage' into 'master' 
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157
 2018-08-10 13:50:57 -04:00
Digiku
e1e00ecb88 Merge branch 'nights-invertloopfix' into 'master' 
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138
 2018-08-10 13:49:42 -04:00
mazmazz
b3de1a5f6c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_setup.c
#	src/p_user.c
 2018-08-10 13:44:47 -04:00
mazmazz
052bd347bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_setup.c
 2018-08-10 13:35:59 -04:00
mazmazz
9591ac92ec Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00
MascaraSnake
72796d3d62 Merge branch 'hardcoding-time-again' into 'master' 
Hardcoding time again

See merge request STJr/SRB2Internal!130
 2018-08-10 13:14:53 -04:00
mazmazz
9e8784a376 SETSPHERES console command for debugging/cheating 
Fixed sphere spill bug where no spheres spill if player->rings is 0
 2018-08-10 13:06:53 -04:00
toaster
b64c587786 Merge branch 'sonicitems' into encore 2018-08-10 15:39:08 +01:00
toaster
bc3fcc8ed0 Fix issue where random boxes would become invisible after respawning in race. 2018-08-10 15:38:32 +01:00
toaster
670ad8cbd1 Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/st_stuff.c
 2018-08-10 15:35:00 +01:00
toaster
435784d6c0 Wolfs flagged up midi variable stuff in his review so far, so this is a correction in that vein. 2018-08-10 14:25:24 +01:00
mazmazz
cf48944384 Make bigger default Flicky follow trigger from 128 radius to 320 radius 2018-08-10 04:24:14 -04:00
mazmazz
f8a3343500 Track player's previous mare rings with player->finishedrings. 
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
 2018-08-10 04:05:20 -04:00
mazmazz
7a8cdf06f4 Reset player->rings on denightserize and on new mare 2018-08-10 04:01:33 -04:00
mazmazz
37b50ca5a4 Tag damage fix error 2018-08-10 02:34:21 -04:00
mazmazz
674b9e918f Correct player->spheres deduction upon losing spheres 
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.
 2018-08-10 02:18:34 -04:00
mazmazz
c2f81eaf8f MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation 2018-08-10 02:18:24 -04:00
mazmazz
f7a32c9fad MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries 2018-08-10 02:18:20 -04:00
mazmazz
4d4e52d981 Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option 2018-08-09 23:14:14 -04:00
TehRealSalt
d351cd535a Orbinaut x4 2018-08-09 22:52:22 -04:00
mazmazz
205678cb9a NiGHTS drill meter penalty when mashing jump button 
Thanks Inuyasha (KS) for code
 2018-08-09 22:15:13 -04:00
TehRealSalt
b6807fc78f Lap start animation 2018-08-09 21:52:02 -04:00
mazmazz
9d8af5da01 Snappier NiGHTS pickup attraction 
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
 2018-08-09 21:24:01 -04:00
toaster
471796d8a3 Fix all actionable comments in my review of sonicitems. 2018-08-09 22:59:52 +01:00
mazmazz
3463ec212a A_FlickyCenter implementation - now Flickies can be attracted to players! 
* Changed default movement to attraction, vs. aimless
* Flickies spawned from this will always have the FLICKY_CENTER mobj as its target
    * Use P_IsFlickyCenter to identify FLICKY_CENTER mobjs versus players
* FLICKY_CENTER mobj tracer points to the spawned Flicky
* Thanks toaster for the original code~~
 2018-08-09 17:28:37 -04:00
toaster
dd31c02415 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
mazmazz
ebb150a05e MT_FLICKY_x_CENTER defs 2018-08-09 12:08:06 -04:00
toaster
e11a734b2f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00
mazmazz
7b539b51f2 Choose Flicky Fish Color by Thing Parameter 2018-08-09 04:19:18 -04:00
mazmazz
ae321f78ac Make standing flickies bounce if MTF_AMBUSH and not MTF_OBJECTSPECIAL 2018-08-09 02:55:22 -04:00
mazmazz
4d1d40aa5d Flicky stand animation fixes 2018-08-09 02:27:25 -04:00
mazmazz
999eff8eba Flicky stand implementation by MTF_AMBUSH 
* MTF_OBJECTSPECIAL: Set no gravity for flicky
 2018-08-09 02:08:25 -04:00