Commit graph

3477 commits

Author SHA1 Message Date
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
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
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
TehRealSalt
1bce22cf72 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
Sal
2f43e56774 Merge branch 'noclip-cam' into 'master'
Noclip cam

See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -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
Sryder
db332478d5 Merge branch 'skill-option' into 'master'
-skill launcher option

See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
Sryder
9e1584fbb0 Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue. 2018-10-07 15:35:54 +01:00
toaster
e3c052e1d0 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg
# Conflicts:
#	src/p_inter.c
2018-10-07 15:17:31 +01:00
Sryder
b46aa4201e Merge branch 'frameperfectegg' into 'master'
Frame Perfect Egg

See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
Sryder
ce2980f228 Merge branch 'colors' into 'master'
Edit Pink, Navy, and Jet, add brown text

See merge request KartKrew/Kart!28
2018-10-07 09:39:22 -04:00
Sryder
b631a8436d Merge branch 'droptweaks' into 'master'
Droptweaks

See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04: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
f026615dfe Don't need thissec 2018-10-06 23:37:27 -04:00
TehRealSalt
d8cf9327a6 OGL support 2018-10-06 19:25:59 -04:00
TehRealSalt
8d39d4be31 Do clipsolid for doorclosed only while your camera is outside of the sector 2018-10-06 16:22:36 -04:00
TehRealSalt
3ed027a4f7 Remove R_DoorClosed
This function has caused me, so much unexpected pain because of just how out of the way it is, and NOTHING else uses it
2018-10-06 15:13:57 -04:00
toaster
977130dbf6 Halt frame-perfect egg crash.
(The code is slightly modified from what I put in bug-reports as a potential fix, but I'm glad I was on the right track.)
2018-10-05 23:24:26 +01:00
Sal
1c3ad7d12a 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
Sal
10c194d95b Merge branch 'chat-changes' into 'master'
Chat changes

See merge request KartKrew/Kart!26
2018-10-05 11:47:45 -04:00
Sryder
2488e3a6d9 Merge branch 'vsync-default-off' into 'master'
Disable VSync by default

See merge request KartKrew/Kart!29
2018-10-05 10:44:48 -04:00
Latapostrophe
d4bc7d14ba Say-team (key and command) now depend of G_GametypeHasTeams(), so you'll only have to modify this function to have say-team work in the gametypes of your choice. 2018-10-05 12:13:11 +02:00
TehRealSalt
bd812b6ece -skill launcher option
Requested by Sev(?), for map editing; sets kartspeed using the same name as Doom's difficulty launcher option
2018-10-04 23:58:44 -04:00
Sal
b9550051da Merge branch 'toast_misc' into 'master'
toast misc

Closes #11

See merge request KartKrew/Kart!19
2018-10-04 22:41:27 -04:00
TehRealSalt
083862b38b Scale explosions properly 2018-10-04 22:09:12 -04:00
TehRealSalt
f1c7eb4907 Don't allow non-keyboard keys to screenshot/gif in menus 2018-10-04 22:06:56 -04:00
TehRealSalt
99ce5f5700 Revert "Attempt to not let the camera into thok barriers"
This reverts commit 6f10f15627.
2018-10-04 20:08:29 -04:00
TehRealSalt
697d625a41 Foolish 2018-10-04 20:06:55 -04:00
TehRealSalt
1955ff0dd0 Merge branch 'master' into sal-cleanup 2018-10-04 18:51:45 -04:00
TehRealSalt
a67e375fe9 Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
TehRealSalt
3b2728054d Always move the camera
According to wolfs, this improves fps. Let's confirm, shall we?
2018-10-04 17:50:50 -04:00
Sryder
eeb6003595 Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty. 2018-10-04 21:08:47 +01:00
TehRealSalt
0a693789d6 Edit the text remaps
Lighter sky, lighter pink, steel is now called steel-blue
2018-10-04 14:30:54 -04:00
TehRealSalt
d1dc8a24f3 Dream is green, Olive is yellow 2018-10-04 14:28:38 -04:00
TehRealSalt
d65b02b176 Moved colors around yet again for nicer invincibility effect
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
2018-10-03 21:18:07 -04:00
TehRealSalt
c99d9e7253 Edit Pink, Navy, and Jet 2018-10-03 20:48:44 -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
304b8b343e Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely. 2018-10-03 20:56:43 +01:00
toaster
e94465689e * Modify PIT_GrenadeRing to place less-complicated checks near the start of the function.
* Add the customary LUA_CallAction call to A_GrenadeRing.
* Revamp A_MineExplode into using a blockmap iterator. Having tested it it might be less laggy in some situations, but I think the drawing is causing the bulk of the problems here.
2018-10-03 20:51:15 +01:00
toaster
9e2e7e553d Update A_GrenadeRing to also take the mapheader scale into account. 2018-10-03 20:23:59 +01:00
Latapostrophe
bfd88c59c6 Allow client to open chat and scroll even if muted. 2018-10-03 20:09:32 +02:00
TehRealSalt
8a11e97330 Merge branch 'master' into noclip-cam 2018-10-03 13:45:20 -04:00
toaster
cdc6a87ada Improve A_MineExplode.
* Re-order the conditions within it such that it quickly checks for shootability and absence of scenery BEFORE it performs the more costly range or parentage checks.
	* Make its explosion radius take mapscale into account. (This is the only off-topic change made in this branch. I have made it here because half of this commit, which doing the other half in a seperate branch would conflict with, is on-topic.)
2018-10-03 17:27:58 +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
toaster
5e8799a965 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