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

492 commits

Author SHA1 Message Date
toaster
0adfc93327 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal
f5a9ae016a Merge branch 'karma-touchups' into 'master' 
Karma touchups

See merge request KartKrew/Kart!59
 2018-10-25 14:06:22 -04:00
toaster
a7940d068b Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
 2018-10-25 10:46:18 +01:00
TehRealSalt
268fa6337e Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt
db6e1f9b94 Extra safety 
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
 2018-10-24 21:18:15 -04:00
TehRealSalt
67de207278 Turn cam on wall hit 2018-10-24 21:05:02 -04:00
TehRealSalt
f3d838b2b5 Merge branch 'master' into karma-touchups 2018-10-24 17:21:34 -04:00
TehRealSalt
bb70f08e0c Give karma items their own hitbox size 
Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V
 2018-10-24 17:16:32 -04:00
toaster
d9ad9fba8b Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/info.c
#	src/p_inter.c
 2018-10-24 22:15:08 +01:00
Sal
ec80cfc3d2 Merge branch 'new-spb' into 'master' 
New SPB

See merge request KartKrew/Kart!56
 2018-10-24 16:04:29 -04:00
Sal
87d51cc491 Merge branch 'howdyalikethemcherries' into 'master' 
How'd'ya like them cherries

See merge request KartKrew/Kart!53
 2018-10-24 16:01:47 -04:00
Sal
5a6524fc93 Merge branch 'some_scaling_stuff' into 'master' 
Two scale things I noticed.

See merge request KartKrew/Kart!51
 2018-10-24 16:01:39 -04:00
TehRealSalt
3c4b3342c5 Remove the local dontdraw 
Not only did I not implement this for everything, but I also REALLY like seeing other player's. If it's a problem, then let's just turn down the fuse and/or tics
 2018-10-23 19:45:35 -04:00
TehRealSalt
e11fe766ef fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
toaster
83fcfc45c1 SOC_COAT and SOC_SMOK. 
To make the MT_PETSMOKER make vaping clouds for Volcanic Valley instead, apply MTF_OBJECTSPECIAL on the spawnpoint.

Since I had to compile, I ALSO discovered SOC_PALM's palmtree was already hardcoded as well!!!! Gosh dang inconsistencies...
 2018-10-23 20:44:54 +01:00
toaster
3abcf552b0 D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.) 2018-10-22 22:36:04 +01:00
toaster
b3392d0e33 Rusty Rig plus minor touchups to what I did already (I haven't made a new exe this stuff is simple enough, and I'll test it when I do the balloon panic stuff) 2018-10-22 21:56:14 +01:00
toaster
11a3eb5122 Hardcoding start! toast's stuff specifically. 
* Marble Zone!
	* Torch decoration.
	* Incense burner decoration.
* CD Special Stage 1!
	* The UFO, now with improved death animation!
	* Turns out I duplicated sounds that already existed in sounds.kart. When we touch up the files later, yalls can remove both `DSFUFOx`'s from it.
 2018-10-22 00:34:47 +01:00
TehRealSalt
d189fdf1c6 Karma SPB instead of confusing Mine gfx 2018-10-20 21:02:25 -04:00
toaster
c51edfa1d5 There's no spike or moon, but there sure is fruit, and that fruit is slightly awkward in that it pops out of existence when it slows down! 
Instead, I've made it flicker out of existence on a second-long timer.

This is the *absolute* last in-game thing I'm doing before the original freeze deadline. Hardcoding and menu pokes are all that remain of my code development...
 2018-10-20 23:32:38 +01:00
mazmazz
bf93dace76 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
toaster
df4e12ac15 No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal) 2018-10-19 21:53:02 +01:00
TehRealSalt
d93f09ccf4 Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
79ba8f0dc1 Merge branch 'you_can_sometimes_have_too_many_rings' into 'master' 
You can sometimes have too many rings

See merge request KartKrew/Kart!47
 2018-10-19 15:50:37 -04:00
Sal
d64295a19f Merge branch 'sweet-new-kicks' into 'master' 
Sweet new kicks

See merge request KartKrew/Kart!39
 2018-10-19 15:49:51 -04:00
TehRealSalt
a0c32e771c Huge restructuring & more fine-tuned speed, following, & turn behavior 2018-10-18 19:51:36 -04:00
TehRealSalt
2ae44ab10e New SPB 
May not make it to R1, but oh well
 2018-10-18 04:43:50 -04:00
toaster
0172d5191e Disable rings, NiGHTS wing-emblems, special placement patterns, and team rings. 
Also, tweak the hoop spawning routine to correctly P_SetTarget the hnexts and hprevs, since I'm mucking around in there.
 2018-10-17 19:27:45 +01:00
toaster
12d67e62bc Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen 2018-10-16 22:13:45 +01:00
toaster
6469956d6a Final weather stuff. 
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
 2018-10-14 22:32:34 +01:00
toaster
1142fddc71 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
TehRealSalt
b2a9193e3b Merge branch 'master' into sweet-new-kicks 2018-10-10 13:43:05 -04:00
TehRealSalt
043c43f48f Merge branch 'master' into net-screen 2018-10-09 21:15:30 -04:00
toaster
0adfccf7da Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg 2018-10-09 21:09:52 +01:00
TehRealSalt
511944a1f1 Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
1bce22cf72 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
TehRealSalt
d5c06b31ad Fix Hyudoro arrows being visible 2018-10-08 00:16:27 -04:00
TehRealSalt
7a6a2f8946 Merge branch 'master' into net-screen 2018-10-07 23:26:56 -04:00
Sal
85430da37f Merge branch 'thinkerclean' into 'master' 
Nuke a bunch of iteration things that have no purpose in SRB2Kart.

See merge request KartKrew/Kart!25
 2018-10-07 23:14:53 -04:00
TehRealSalt
68a06a14c8 Rocket Sneakers appear beside you 2018-10-07 18:53:46 -04:00
toaster
2ad2cbcc0a Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more! 2018-10-07 15:00:58 +01:00
toaster
49472858d9 Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with frameperfectegg. 
Also includes some adjustments to:
* Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better.
* Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop.
* Correctly wipe k_eggmanblame when it is appropriate to do so.
 2018-10-07 11:40:06 +01:00
TehRealSalt
37b5a9327c Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00
TehRealSalt
b33ad2ad2a Merge branch 'master' into net-screen 2018-10-04 20:16:25 -04:00
TehRealSalt
1955ff0dd0 Merge branch 'master' into sal-cleanup 2018-10-04 18:51:45 -04:00
toaster
5006a54bf7 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-03 21:04:34 +01:00
toaster
6691f39117 Incorrect comment starting location. 2018-10-03 17:16:23 +01:00
toaster
7032b2773a Complete the disabling of the traditional shield mechanism (oversight from initial commit). 2018-10-03 17:14:25 +01:00