Commit graph

360 commits

Author SHA1 Message Date
TehRealSalt
9f05e14c99 Merge branch 'master' into democam 2018-10-17 18:17:42 -04:00
toaster
a1e1aa81b5 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
fe2af34ee5 Merge branch 'master' into next 2018-10-14 20:49:35 +01:00
Monster Iestyn
9c464742b7 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
TehRealSalt
bb3d01495a New engine sounds
9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-08 21:31:55 -04:00
Sal
b8d86bb096 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
Sal
5a80d036e7 Merge branch 'always-move-cam' into 'master'
Move camera less often

See merge request KartKrew/Kart!30
2018-10-05 11:47:55 -04:00
TehRealSalt
71efda2b20 Always move the camera
According to wolfs, this improves fps. Let's confirm, shall we?
2018-10-04 17:50:50 -04:00
toaster
cfd2b021a4 Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows.
p_inter.c -
	Everything to do with setting states for starposts
		In SRB2Kart, starposts are invisble. We don't need to loop through all thinkers just to set their states when there's no visible effect of the state-setting. In addition, it has no consequences for gameplay - starposts have long been silent here, and all checking is done regarding their health, not their state.
	Remove extremely low-traffic conditionals (MT_FLINGEMERALD collision height extension, for example)
		These objects serve no functional purpose during regular SRB2Kart gameplay. Why should every other object have to pay an admittedly minor performance hit just for them?
	Disable all mechanisms of damaging bosses or enemies with the player's physical contact
		With the exception of Sapphire Coast, no MF_ENEMY objects exist in the entirety of the standard roster. In addition, the conditions for damaging the enemies were impossible to achieve, because they required vanilla SRB2 mechanics such as "jumping", "spindashing", or "super". Therefore, they can be safely commented out.
	Disable NiGHTS-related material (excepting bumper, hoop, and wing-emblem objects)
		NiGHTS is fundamentally incompatible with regular kart gameplay and I believe was already broken. Therefore, any mechanism which enters, aids, or abets it can be safely disabled.
	Comment out Tag mechanisms
		Tag is the only vanilla multiplayer gametype which has sufficient gameplay depth and complexity (HEYOOOOOOOOO) to require dedicated thinking in and of itself in order to manage. This thinking is irrelevant to Kart's functioning, and can be neutered easily.
d_clisrv.c
	Comment out Tag mechanisms
		See p_inter.c
d_netcmd.c
	Disable several devmode commands which are irrelevant to SRB2Kart gameplay
		When investigating for references to NiGHTS material, I discovered that these remained untouched. In order to present a more coherent game, I have hidden the ones that serve no purpose for us.
	Comment out Tag mechanisms
		See p_inter.c
g_game.c
	Disable NiGHTS-related material
		See p_inter.c
	Disable some team-related material
		Teams are not present in SRB2Kart at present. Obviously we'd want to reconsider for future, but it doesn't need to be run right now.
	Everything to do with setting states for starposts
		See p_inter.c
m_cheat.c
	Disable several devmode commands which are irrelevant to SRB2Kart gameplay
		See d_netcmd.c
p_map.c
	Remove extremely low-traffic conditionals (MT_EGGSHIELD collision, for example)
		See p_inter.c
	Disable NiGHTS-related material
		See p_inter.c
p_mobj.c
	Disable P_EmeraldManager
		Power stones, despite their relevance in vanilla Match, are not in SRB2Kart's Battle. No management of nonexistent emeralds is required.
p_setup.c
	Everything to do with setting states for starposts
		See p_inter.c
p_spec.c
	Disable NiGHTS-related material
		See p_inter.c
	Everything to do with setting states for starposts
		See p_inter.c
p_telept.c
	Everything to do with setting states for starposts
		See p_inter.c
p_tick.c
	Disable some team-related material
		See g_game.c
	Disable P_EmeraldManager
		See p_mobj.c
	Do not run shields
		Shield objects are not run under the vanilla system; the Thunder Shield is a domain-specific recreation using a standard mobjthinker.
	Do not run special stages
		SRB2Kart does not have special stages.
	Comment out Tag mechanisms
		See p_inter.c
y_inter.c
	Disable some team-related material
		See g_game.c
p_user.c
	Disable NiGHTS-related material
		See p_inter.c
	Disable 2d movement for players
		2D mode? In a kart racer? :nick:
2018-10-03 17:04:41 +01:00
toaster
d0e629a8e2 Correct some inconsistencies I missed in the previous commit. 2018-10-01 13:51:23 +01:00
toaster
379772e5aa Allow respawning spectators before starttime is up because they no longer spawn in a condition that allows them to get an unfair advantage (drop dash or its ghetto 2.0-esque predecessor)
Also, some camera tweaks:
* Force chasecam when exiting, just like it's forced when you're dead and not a spectator.
* Force a horizontal camera angle aiming when spectator and dead, to avoid skybox bugs.
2018-10-01 13:25:13 +01:00
Monster Iestyn
800b3bb240 Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01:00
toaster
abfbde82f4 Here's my progress on making demoplayback camera less shit. I know what probably needs to be done to make it thorough is to replace all the consoleplayer stuff with displayplayer stuff in demoplayback, but don't feel like doing that right now. 2018-09-23 19:55:46 +01:00
Sal
8ff0e976c2 Merge branch 'new-voices' into 'master'
New voices

See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
TehRealSalt
c63518e0b2 Doing this looks more appealing to me 2018-09-22 20:15:12 -04:00
TehRealSalt
8a06e78ab6 Quick fix for other player's win/lose not playing 2018-09-22 20:14:32 -04:00
TehRealSalt
487e114fee raceexittime var 2018-09-22 18:59:26 -04:00
TehRealSalt
7256e99b12 Merge branch 'master' into this-is-a-sign 2018-09-22 17:58:35 -04:00
TehRealSalt
e9d4fae5b9 Merge branch 'master' into new-voices 2018-09-21 21:13:46 -04:00
TehRealSalt
dd6b63f9da Different timings 2018-09-21 19:44:14 -04:00
toaster
084b99a5c9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
2018-09-21 20:54:38 +01:00
TehRealSalt
ce85c2b7bd Delay falling, longer exit timer 2018-09-13 19:13:43 -04:00
TehRealSalt
a8eb4af694 Camera fixes
- Fixed camera panning for higher distances.
- Because of this, re-enabled scaling the pan amount based on distance.
2018-09-10 02:24:21 -04:00
TehRealSalt
7a91398066 Drop Dash + alternate start boosts
New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker.

Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 01:47:23 -04:00
TehRealSalt
c1b9700e28 Revert pan speed
Old one was more exciting, and gave that feeling of "you're scraping against the walls" when you try to corner really hard
2018-09-09 18:04:35 -04:00
TehRealSalt
a9f34ce8ba Camera adjustments
- reverted boostcam timing, different max dist
- zooms out based on camera momz
- drift panning is twice as slow
2018-09-08 18:45:57 -04:00
TehRealSalt
1cdf5623db weaker 2018-09-08 16:32:39 -04:00
TehRealSalt
6317ae5996 Okay do this correctly by doing a reacharound to grab the actual sfx id 2018-09-07 16:56:34 -04:00
TehRealSalt
2cc07df3d2 Minor tweakings
- Win/lose quotes are only played for your player
- Win, lose, and gloat lines are played from farther away
2018-09-07 15:50:24 -04:00
TehRealSalt
7760c7030e Tweaked boost cam, again 2018-09-06 21:58:23 -04:00
TehRealSalt
bc15392514 Boost tweaks
Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 13:02:08 -04:00
TehRealSalt
36356f8a64 Boost cam 2018-09-05 11:19:00 -04:00
TehRealSalt
1548e59b2b Change a few cvar defaults 2018-09-04 21:18:20 -04:00
TehRealSalt
733207d197 Splitscreen fix
Just changed order of operations
2018-09-04 18:27:36 -04:00
TehRealSalt
d49099693d Alternate demo replay camera
Not good, but less bad than before :V
2018-09-04 18:21:55 -04:00
TehRealSalt
381883b747 Revert a few of the changes from last commit
Ended up not liking them
2018-09-04 17:07:53 -04:00
TehRealSalt
6e328a4e73 Misc camera fixes
- Fixed remaining instances where camera position would scale with the player instead of the level; the camera should almost 100% certainly not change now when you get Grown/Shrunk
- Reset camera when switching viewpoint, to make it not look *as* weird when switching after you've finished (needs tested)
2018-09-04 16:10:59 -04:00
TehRealSalt
2a20939617 Camera panning for drifts 2018-09-04 16:08:37 -04:00
TehRealSalt
9394179c12 Camera outrunning 2018-09-04 15:11:14 -04:00
TehRealSalt
fd16ece77c Z pos smoothing 2018-09-04 02:51:00 -04:00
TehRealSalt
12bbb04fb9 This was not meant to be commited 2018-09-03 21:21:40 -04:00
TehRealSalt
c1d92a45f8 Camera now sticks close behind you, only the angle is lagged 2018-09-03 20:40:46 -04:00
TehRealSalt
a745417a3f This doesn't work
1.) I mixed it up, so opponent win/lose quotes would play globally instead of your own
2.) You can't even play skin-specific sounds globally, so it'd always be Sonic
2018-08-28 22:50:53 -04:00
TehRealSalt
118d9caad1 New voices
- Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?)
- Win/lose quotes are played at full volume for the person who said it.
- A new sound effect plays when you hit someone with voices disabled.
- Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions
- Added our skin sound constants to the dehacked list.
- Unrelated: finish line sfx plays in splitscreen
2018-08-28 16:29:50 -04:00
TehRealSalt
6fdb743a59 Correct remaining instances where step up/down scales with the object instead of the map 2018-08-27 01:07:44 -04:00
toaster
cdf5874ff5 * Exempt drop shadows from encore remapping.
* Make MT_GHOST's encoremapping depend on whether the source was encoremapped.
* Revamp how sector typegroup 2, type 15 inverts the encoremapping (so planes don't get awkwardly desynchronised).
2018-08-26 15:15:03 +01:00
toaster
000fbe8b52 Merge branch 'sonicitems' into encore 2018-08-11 22:52:24 +01:00
TehRealSalt
cc009aca4f Flashing tics length depends on speed stat
Change to speed-weight when the bump buff gets added
2018-08-11 00:12:41 -04:00
toaster
c190db903c Merge branch 'sonicitems' into encore
# Conflicts:
#	src/st_stuff.c
2018-08-10 15:35:00 +01:00
toaster
a6ca459164 Fix all actionable comments in my review of sonicitems. 2018-08-09 22:59:52 +01:00