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

3613 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d2e8a71ff8 Merge branch 'democam' into 'master' 
If I were a bad Democam, I wouldn't be sittin' here discussin' it with ya now would I?!

See merge request KartKrew/Kart!48
 2018-10-19 15:50:28 -04:00
Sal
de1d9770b9 Merge branch 'no-spectate-griefing' into 'master' 
Prevent spectate griefing

See merge request KartKrew/Kart!43
 2018-10-19 15:50:18 -04:00
Sal
46400a08ef Merge branch 'sp_fixes' into 'master' 
Singleplayer fixes (no, not record attack, the *other* one)

See merge request KartKrew/Kart!46
 2018-10-19 15:50:06 -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
Sal
ef9ab0290e Merge branch 'unlock-hard' into 'master' 
Hard Mode is an unlockable

See merge request KartKrew/Kart!40
 2018-10-19 15:49:32 -04:00
Sal
3e2f4f2404 Merge branch 'remove-prints' into 'master' 
Remove most gameplay prints

See merge request KartKrew/Kart!42
 2018-10-19 15:49:01 -04:00
TehRealSalt
2121bbae84 No more vanilla democam, for real 2018-10-17 19:10:23 -04:00
TehRealSalt
c7d40482af Merge branch 'master' into democam 2018-10-17 18:17:42 -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
TehRealSalt
1a698f65bb < 2018-10-17 13:38:31 -04:00
toaster
efc37b002b Some token efforts to make singleplayer mode (accessible only via -warp and map mapxx -force) not COMPLETELY broken. 
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
 2018-10-17 13:40:17 +01:00
TehRealSalt
93f5c5c1f0 Prevent point grief 
(Needs tested)
 2018-10-16 20:56:04 -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
TehRealSalt
c4a249366c Merge branch 'master' into no-spectate-griefing 2018-10-16 16:38:35 -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
43656e0704 == --> >= 2018-10-16 12:23:05 -04:00
TehRealSalt
0aa7e5a638 Smoother 
NOW this is good enough to ship
 2018-10-15 23:13:59 -04:00
TehRealSalt
bda7d70c15 Quick fix for banana cheat not showing all unlockables 
Plus, this is generally better, as a mod could let you unlock stuff "out-of-order"
 2018-10-15 22:02:10 -04:00
TehRealSalt
c2f7529be0 Fix the earlier attempt at patching over this 2018-10-15 19:05:23 -04:00
TehRealSalt
0717db3f31 Prevent spectate griefing 
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
 2018-10-15 18:41:34 -04:00
TehRealSalt
876f5517a1 remove all hit msgs & cv_hazardlog 2018-10-15 17:40:25 -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
TehRealSalt
055d9ecc69 restore 2018-10-14 17:54:18 -04:00
TehRealSalt
3186af9e51 Remove most gameplay prints 
A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
 2018-10-14 17:45:28 -04: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
toaster
801f21f36f Fix to itembar visual length problem 2018-10-13 23:38:29 +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
665d2c1f2c Hard Mode is an unlockable 
Unlocks at 30 emblems, or 100 matches played
 2018-10-13 17:54:53 -04: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