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

4136 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
05ac0bb337 Fix player Z snap to floor on moving platform ~FF_EXISTS 
* Track player's old floorz by mo->floor_sectornum and floor_ffloornum
* Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum
* Ceiling variants of the above
 2018-09-08 00:34:56 -04:00
Digiku
8d015bd7cc Merge branch 'flicky-things' into 'master' 
Flicky Thing Types

See merge request STJr/SRB2Internal!154
 2018-09-06 16:02:19 -04:00
mazmazz
fbd6b2c826 Flicky colors indexing fix 2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4 Compiler errors 2018-09-06 13:16:50 -04:00
mazmazz
4dcf3835e3 Stray comments 2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0 Make default flicky home radius 384 2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763 Limit random fish color to SRB2's defaults 2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e Change default radius to 448 
* Put default radius back in FLICKY_CENTER states
 2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33 Impose home radius on aimless flickies; improve randomness of flickyhitwall angle 2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4 Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE) 2018-09-06 10:32:26 -04:00
mazmazz
c61cbcdf22 Erase default home radius from states and impose default on home check 2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2 Re-organize flags for FLICKY_CENTER 
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
 2018-09-06 10:17:41 -04:00
mazmazz
2d86dddb00 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
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
Monster Iestyn
cd8a46b3a1 Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround 2018-09-04 17:04:24 +01:00
Monster Iestyn
82e46d101c Merge branch 'public_next' 
# Conflicts:
#	src/r_main.c
 2018-09-04 15:53:07 +01:00
Monster Iestyn
6774933263 Merge branch 'addfile-verify-fix' into 'next' 
Addfile command verify fix.

See merge request STJr/SRB2!272
 2018-09-03 17:17:46 -04:00
Digiku
816a81b396 Merge branch 'nightsplus-le' into 'master' 
NiGHTS Linedef Executor Triggers

Closes #102

See merge request STJr/SRB2Internal!142
 2018-09-02 18:10:50 -04:00
Monster Iestyn
4bd725e7b8 Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Monster Iestyn
44c4534231 Merge branch 'homremoval-nongreenfix' into 'master' 
Fix for HOM removal in non-green resolutions

See merge request STJr/SRB2!273
 2018-09-01 20:53:49 -04:00
Steel Titanium
4b690b20d3 Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
Monster Iestyn
7fc4d864a8 Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Steel Titanium
277bec55c2 Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Digiku
b24a04989e Merge branch 'nights-nofastattract' into 'master' 
NiGHTS: Dummy out faster item attract

See merge request STJr/SRB2Internal!183
 2018-08-30 17:26:42 -04:00
mazmazz
dcca56bc04 Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
Digiku
2b18908fe4 Merge branch 'nights-inufixes' into 'master' 
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer

See merge request STJr/SRB2Internal!156
 2018-08-30 09:12:55 -04:00
mazmazz
f8588739b8 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
ede540a259 Merge branch 'hud-cleaning' into 'master' 
Hud cleaning

See merge request STJr/SRB2Internal!170
 2018-08-29 16:22:48 -04:00
Monster Iestyn
a9882bfda4 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
d130c48787 Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00
Monster Iestyn
3c65251bb6 Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz
c43c15ff10 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
Digiku
cc828ce709 Merge branch 'nightsplus-laplogic' into 'master' 
NiGHTS: Track player mare lap variables

See merge request STJr/SRB2Internal!143
 2018-08-29 10:58:05 -04:00
mazmazz
2ee3228ee4 Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Digiku
ce1127e5c9 Merge branch 'nights-bumper-fix' into 'master' 
NiGHTS: Fix player positioning when touching Bumper

See merge request STJr/SRB2Internal!165
 2018-08-29 06:02:24 -04:00
Digiku
66b4d0f929 Merge branch 'op-nights-bumper' into 'master' 
Objectplace: Place NiGHTS Bumpers with the player's fly angle

See merge request STJr/SRB2Internal!166
 2018-08-29 06:01:27 -04:00
Digiku
8389cb9f03 Merge branch 'nights-nightserizeangle' into 'master' 
NiGHTS: Reset player another/flyangle on De/Nightserize

See merge request STJr/SRB2Internal!139
 2018-08-29 04:27:02 -04:00
Digiku
e5a1db2870 Merge branch 'intermission-bonuslivesmax' into 'master' 
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
 2018-08-29 04:25:03 -04:00
Digiku
33ba87fea1 Merge branch 'le-ringspheres' into 'master' 
Line Execs: Make Ring triggers accept spheres in NiGHTS levels

See merge request STJr/SRB2Internal!163
 2018-08-29 04:24:47 -04:00
Digiku
3c43ce46c6 Merge branch 'sphere-ring-concurrence' into 'master' 
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently

See merge request STJr/SRB2Internal!167
 2018-08-29 04:24:23 -04:00
Monster Iestyn
2d7263c7f1 Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 2018-08-28 19:31:08 +01:00
Monster Iestyn
3ea826f279 Merge branch 'master' into next 2018-08-26 21:10:41 +01:00
Monster Iestyn
69b0a86e4a Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master' 
Yo Screen So Wide y Is Invalid

See merge request STJr/SRB2!271
 2018-08-26 16:07:06 -04:00
toaster
b26828805e Missed one! 2018-08-26 12:38:53 +01:00
Monster Iestyn
7c321b4248 Merge branch 'v_video_killed_the_r_radio_star' into 'master' 
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
 2018-08-25 16:43:25 -04:00
Monster Iestyn
7f0d75f741 Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' 
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
 2018-08-25 16:43:14 -04:00