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

3986 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
0ff48976b1 Impose default radius for orbiting flickies 2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89 Make default behavior: aimless flying flickies stay at Z height 2018-09-06 08:07:13 -04:00
mazmazz
6426d88141 Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine 2018-09-06 07:55:15 -04:00
mazmazz
a095b47980 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -04:00
mazmazz
123eb4bc3e MT_FLICKY_CENTER flag adjustments 2018-08-12 12:49:23 -04:00
mazmazz
200a5fccd0 Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1 2018-08-12 09:23:50 -04:00
mazmazz
e203edb450 Decouple Flicky Thing logic from spawnpoint variables; use mobj variables 2018-08-12 02:34:37 -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
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
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
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
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
mazmazz
304fdea710 Flicky stand states 2018-08-09 01:44:21 -04:00
mazmazz
41a438ece1 Mapthingnums for MT_SECRETFLICKYies 2018-08-09 01:01:20 -04:00
mazmazz
baa16c55fb Fix FlickyFly momentum on MTF_OBJECTSPECIAL 2018-08-09 00:57:35 -04:00
mazmazz
0bccca1a8b Assign mapthingnums to MT_FLICKY 
* Type # 570-585
 2018-08-09 00:17:46 -04:00
mazmazz
2526d2996e FlickyFly: Configure gravity by MTF_AMBUSH 2018-08-09 00:13:08 -04:00
Monster Iestyn
fc68174e8b Merge branch 'master' into next 2018-08-07 20:54:19 +01:00
Monster Iestyn
c666f5f182 Merge branch 'transparency_i_hardly_knew_er' into 'master' 
Transparency? I hardly knew 'er!

See merge request STJr/SRB2!264
 2018-08-07 15:29:35 -04:00
toaster
ca262dcbba Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice). 
Please note I haven't touched the ASM equivalent, given as it's not actually used.
 2018-08-07 19:12:10 +01:00
Monster Iestyn
9812df00d6 Merge branch 'master' into next 2018-08-06 15:15:35 +01:00
Monster Iestyn
8de4bb2be5 Merge branch 'lua-archive-long-string-fix' into 'next' 
Fixes for archiving/unarchiving Lua strings in netgames

See merge request STJr/SRB2!262
 2018-08-06 10:12:59 -04:00
Monster Iestyn
dcd31eadf8 Merge branch 'password-fix-hotfix' into 'master' 
Password fix hotfix

See merge request STJr/SRB2!261
 2018-08-06 09:43:54 -04:00
Monster Iestyn
2ad792ccd4 Rewrite archiving/unarchiving of Lua strings for netgames. 
This now means:
* Lua strings longer than 1024 chars can now be read properly without awful crashes
* Lua strings with embedded zeros can be written/read without truncating anything (hopefully)
 2018-08-05 22:02:20 +01:00
Monster Iestyn
ed6f6e3a75 Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server! 2018-08-05 20:17:30 +01:00
MascaraSnake
f0f8698d04 Reorganized the thing type numbers 2018-08-03 23:58:11 +02:00
Monster Iestyn
594cc953b5 Fix Cacolantern's preparing sound being played everywhere across the map 
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
 2018-08-02 16:15:30 +01:00
Monster Iestyn
502c80eaac Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
Monster Iestyn
1b6e85fda0 Merge branch 'pk3-wad-map-noreload-hotfix' into 'master' 
PK3 WAD Map NoReload hotfix

See merge request STJr/SRB2Internal!148
 2018-07-31 14:43:14 -04:00
Monster Iestyn
f6b8206660 Merge branch 'public_next' 
# Conflicts:
#	src/hardware/hw_md2.c
 2018-07-31 19:41:54 +01:00
Monster Iestyn
10668f14b8 Merge branch 'master' into next 2018-07-31 19:36:30 +01:00