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

3586 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sal
f4479b81cc Merge branch 'fix-nextlevel' into 'master' 
Fix "advancemap next" going to GHZ at the end of a cup

See merge request KartKrew/Kart!44
 2018-10-16 18:08:04 -04:00
TehRealSalt
a26e79320c Merge branch 'master' into fix-nextlevel 2018-10-16 17:05:47 -04:00
Sal
dbf7096d27 Merge branch 'nextmerge_plus_rain' into 'master' 
Next-merge plus rain

See merge request KartKrew/Kart!41
 2018-10-16 16:36:18 -04:00
Sal
922898b814 Merge branch 'engine-tweak' into 'master' 
Engine tune-up

See merge request KartKrew/Kart!45
 2018-10-16 15:46:15 -04:00
TehRealSalt
430a5dfcc1 Default sound channels 
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
 2018-10-16 13:26:03 -04:00
TehRealSalt
8102756abd 1 minor, non-engine related change I wanted to make while I was at it: 
Minor priority change to two voice lines; the "passing someone" line has the same priority as every other line, and gave it's boosted priority to the way more gameplay-important "hit 'em" line.
 2018-10-16 12:48:46 -04:00
TehRealSalt
9891080360 Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag 
Sryder's request
 2018-10-16 12:30:47 -04:00
TehRealSalt
0aa7e5a638 Smoother 
NOW this is good enough to ship
 2018-10-15 23:13:59 -04:00
TehRealSalt
c2f7529be0 Fix the earlier attempt at patching over this 2018-10-15 19:05:23 -04:00
toaster
806cb47b17 More sensible drawdist_precip_cons_t maximum (slightly more conservative than Sryder's suggestion) 2018-10-14 23:13:11 +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
Monster Iestyn
37f32fa251 Merge branch 'master' into next 2018-10-14 20:49:35 +01:00
Monster Iestyn
acdd303b46 Merge branch 'sound-handle-fix' into 'master' 
Handle fix for SDL Mixer

See merge request STJr/SRB2!301
 2018-10-14 15:46:25 -04:00
Monster Iestyn
8cb5bfe356 Merge branch 'pris_accurate-gif-delay' into 'master' 
More accurate GIF delay

See merge request STJr/SRB2!276
 2018-10-14 15:44:33 -04:00
Monster Iestyn
ae68bae4a7 Merge branch 'no-doubling-texture-heights-plz-backport' into 'next' 
No doubling texture heights plz

See merge request STJr/SRB2!296
 2018-10-14 15:43:57 -04:00
Monster Iestyn
008bb9accc Merge branch 'mi-a-bit-of-cleanup-backport' into 'master' 
MI's unimportant code cleanup

See merge request STJr/SRB2!295
 2018-10-14 15:43:32 -04:00
Sryder
394075fbe9 Fix missing commas and missed interface 2018-10-14 10:14:07 +01:00
Sryder
4132b39b9a Add an int to I_PlaySound to tell an interface which channel number SRB2 is using. 
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
 2018-10-13 23:01:11 +01:00
TehRealSalt
1885c25d8c Engine tweak 2018-10-13 17:07:30 -04:00
Monster Iestyn
9f710ffbe1 Be gone ye old texture hack 2018-10-11 21:08:25 +01:00
Monster Iestyn
34728b3031 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now 
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
 2018-10-11 20:00:45 +01:00
Monster Iestyn
a8e9805c06 Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore) 2018-10-11 20:00:34 +01:00
Monster Iestyn
5ab6eb8bd7 Remove unused "runcount" variable from p_local.h 2018-10-11 20:00:23 +01:00
Monster Iestyn
adc9d3b1ec "t" is not needed to take out fencepost cases from viewangletox 2018-10-11 20:00:05 +01:00
Monster Iestyn
bae8dd2e99 Removed unused function prototypes in d_main.h 
Also corrected what appears to be a typo in some comments above?
 2018-10-11 19:59:47 +01:00
Monster Iestyn
6fb3dcb52f Remove unused sscount variable 
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
 2018-10-11 19:59:26 +01:00
Monster Iestyn
41fbdce21e debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else 2018-10-11 19:59:09 +01:00
toaster
254adfc154 Merge branch 'hellattack' into 'master' 
Hell Attack

See merge request KartKrew/Kart!35
 2018-10-10 13:33:57 -04:00
Sal
e8bfef3944 Merge branch 'new-engines' into 'master' 
New engine sounds by VAda

See merge request KartKrew/Kart!38
 2018-10-09 21:12:05 -04:00
TehRealSalt
8489bf7613 Some code cleanup & minor adjustments 2018-10-09 21:11:00 -04:00
TehRealSalt
805b1dd0e8 x2 distance, fix priority 2018-10-09 18:04:25 -04:00
toaster
c3b8054daf 4 -> 5 2018-10-09 23:02:21 +01:00
Monster Iestyn
afd62ec071 Merge branch 'master' into next 2018-10-09 22:55:55 +01:00
toaster
1bef57576c Merge branch 'karmegg' into 'master' 
Karmegg

See merge request KartKrew/Kart!36
 2018-10-09 17:47:11 -04:00
toaster
e5386fd214 Sal's request 2018-10-09 22:44:43 +01:00
toaster
af09546b03 Spawn a poof if you get hit while karmegg. 
(I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
 2018-10-09 22:40:42 +01:00
toaster
587e11449d HitEm sound for K_ExplodePlayer 2018-10-09 22:24:44 +01:00
toaster
0adfccf7da Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg 2018-10-09 21:09:52 +01:00
toaster
56cd6cebea If you hit a one-bumper person with a karma fake, you get to come back immediately! 2018-10-09 21:09:39 +01:00
TehRealSalt
3aa7a9a65c Merge branch 'master' into new-engines 2018-10-09 15:35:50 -04:00
TehRealSalt
f25c74b152 Merge branch 'master' into new-engines 2018-10-09 15:34:26 -04:00
Sal
dac50d0a7c Merge branch 'sal-cleanup' into 'master' 
Sal cleanup

See merge request KartKrew/Kart!23
 2018-10-09 15:33:52 -04:00
TehRealSalt
7a8dc91b6a Fix tabbing 2018-10-09 15:28:52 -04:00
Monster Iestyn
7407ee6c0e Merge branch 'movechasecamera-crashfix' into 'next' 
Fix for Chicmunk's weird camera related crash

See merge request STJr/SRB2!284
 2018-10-09 15:20:06 -04:00
Monster Iestyn
9914353758 Merge branch 'tiny-joystick-fix' into 'master' 
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.

See merge request STJr/SRB2!292
 2018-10-09 15:19:41 -04:00
Sryder
a7ba0b958a Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close. 
No memory leak here, just a very tiny thing I noticed.
 2018-10-09 19:43:18 +01:00
Sryder
18fd49b1f5 Merge branch 'fix-mixed-declarations' into 'master' 
Fix the mixed declaration and code warnings

See merge request KartKrew/Kart!37
 2018-10-09 14:09:33 -04:00