Commit graph

4296 commits

Author SHA1 Message Date
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
Steel Titanium
7428fb991c Remove the condition in restartaudio command.
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Steel Titanium
9b8b5ea57c Move commands and console variable into s_sound.c 2018-10-11 16:29:43 -04:00
Monster Iestyn
85b18c963f Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2018-10-11 21:25:15 +01:00
Monster Iestyn
abc083e5e8 G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt 2018-10-11 21:25:04 +01:00
Monster Iestyn
3c981c913a Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame 2018-10-11 21:24:53 +01:00
Monster Iestyn
9f710ffbe1 Be gone ye old texture hack 2018-10-11 21:08:25 +01:00
Latapostrophe
102d45f590 More stuff goes in HU_AddChatText, fixed /pm list not having the correct coords if kartspeedometer was on. 2018-10-11 21:39:19 +02: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
Monster Iestyn
6ba97b03a6 These convar externs aren't moving files, I'm just shifting them up to live with their relatives 2018-10-11 19:39:28 +01:00
Monster Iestyn
40c0e554e5 Move analog consvars to g_game.h 2018-10-11 19:39:11 +01:00
Monster Iestyn
277fd8daa8 Moved screenshot/movie consvar externs to m_misc.h 2018-10-11 19:38:11 +01:00
Monster Iestyn
865da5f351 cv_controlperkey probably belongs in g_input.h too 2018-10-11 19:37:48 +01:00
Monster Iestyn
940b393aae Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts 2018-10-11 19:37:24 +01:00
Monster Iestyn
7681a15f59 Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8 2018-10-11 17:05:23 +01:00
Monster Iestyn
fc90876a0e Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
...that was a mouthful
2018-10-11 17:05:13 +01:00
TehRealSalt
cd30ae3fb1 para 2018-10-10 17:46:23 -04:00
TehRealSalt
0f2ec53255 Removed bumping
K_KartBouncing is so flaky, I have no idea why it refuses to work.
2018-10-10 17:31:09 -04:00
Latapostrophe
4b2cb6b4e5 HU_AddChatText cleanup for future use + chat mode Window (Hidden) added. 2018-10-10 21:24:55 +02:00
TehRealSalt
b8db9581c2 Last batch of tweaks
- Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom!
 - Vibrating frames on sneakers when they aren't being used.
 - Shoe weight is less strong.
2018-10-10 14:56:50 -04:00
TehRealSalt
b2a9193e3b Merge branch 'master' into sweet-new-kicks 2018-10-10 13:43:05 -04:00
toaster
254adfc154 Merge branch 'hellattack' into 'master'
Hell Attack

See merge request KartKrew/Kart!35
2018-10-10 13:33:57 -04:00
TehRealSalt
a1a7a10ac1 Merge branch 'master' into net-screen 2018-10-09 21:16:16 -04:00
TehRealSalt
043c43f48f Merge branch 'master' into net-screen 2018-10-09 21:15:30 -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