stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-30 14:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
3805 commits 60 branches 11 tags 94 MiB
Commit graph

3206 commits

Author SHA1 Message Date
TehRealSalt
4364caa4ea Merge branch 'master' into net-screen 2018-10-09 21:15:30 -04:00
Sal
2fc3195448 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
5435737258 Some code cleanup & minor adjustments 2018-10-09 21:11:00 -04:00
TehRealSalt
94c92c2262 x2 distance, fix priority 2018-10-09 18:04:25 -04:00
toaster
52dc945804 4 -> 5 2018-10-09 23:02:21 +01:00
Monster Iestyn
8196c59557 Merge branch 'master' into next 2018-10-09 22:55:55 +01:00
toaster
e248cf9421 Sal's request 2018-10-09 22:44:43 +01:00
toaster
a8a1f1b444 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
66d00b7cc6 HitEm sound for K_ExplodePlayer 2018-10-09 22:24:44 +01:00
toaster
83bfca8009 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg 2018-10-09 21:09:52 +01:00
toaster
76eebe6cf7 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
7900af2a0a Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
431ccce0e4 Merge branch 'master' into new-engines 2018-10-09 15:35:50 -04:00
TehRealSalt
8836cdeeee Merge branch 'master' into new-engines 2018-10-09 15:34:26 -04:00
Sal
b349063431 Merge branch 'sal-cleanup' into 'master' 
Sal cleanup

See merge request KartKrew/Kart!23
 2018-10-09 15:33:52 -04:00
TehRealSalt
aa12bbf039 Fix tabbing 2018-10-09 15:28:52 -04:00
Monster Iestyn
c469fc242f 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
Sryder
497314fdc4 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
TehRealSalt
8132dd6be5 Merge branch 'master' into net-screen 2018-10-09 14:41:59 -04:00
Sryder
44726e1db7 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
5811ff521c Many adjustments 
- Volume of your own engine is lower than default
 - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V
 - Starting countdown and drop dash revs up your engine now
 - Doubled sound distance
 2018-10-09 14:07:05 -04:00
TehRealSalt
3a1d58ceb6 Reduce update frequency to match the sfx length better 2018-10-08 22:35:17 -04: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
TehRealSalt
a6a229dea8 boostcam scales based on previous boost 2018-10-08 16:20:30 -04:00
TehRealSalt
a41cddc94a use cvar mins 2018-10-08 14:49:48 -04:00
TehRealSalt
7838a29f3d Scale chat in splitscreen 
Only covers things on P1's screen now
 2018-10-08 14:38:29 -04:00
TehRealSalt
1807466474 Simpler loop 2018-10-08 13:58:16 -04:00
toaster
1324e0bfcd * Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!) 
* Optimise the repeated strlen usage into a single call, which is stored for later.
 2018-10-08 18:50:17 +01:00
Monster Iestyn
12e0222929 Merge branch 'drwhoandthesleepingweather' into 'master' 
Dr. Who And The Sleeping Weather

See merge request STJr/SRB2!288
 2018-10-08 09:36:18 -04:00
Monster Iestyn
1049f3451a Merge branch 'sp-savegame-continue-crash-fix' into 'master' 
SP savegame continues icon crash

See merge request STJr/SRB2!290
 2018-10-08 09:20:45 -04:00
Monster Iestyn
1115f41f8e Merge branch 'zlib-split' into 'master' 
Makefile: Split zlib and libpng

See merge request STJr/SRB2!285
 2018-10-08 07:20:27 -04:00
TehRealSalt
640e0e09c6 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
TehRealSalt
9e51c10337 Fix Hyudoro arrows being visible 2018-10-08 00:16:27 -04:00
TehRealSalt
3101eb1a18 Don't let chat/console eat inputs from anyone besides player 1 2018-10-08 00:14:29 -04:00
TehRealSalt
42766db48c Merge branch 'master' into net-screen 2018-10-07 23:26:56 -04:00
Sal
36696b1fbb Merge branch 'noclip-cam' into 'master' 
Noclip cam

See merge request KartKrew/Kart!32
 2018-10-07 23:15:06 -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
TehRealSalt
e5183523a5 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -04:00
TehRealSalt
842430dbdb Rocket Sneakers appear beside you 2018-10-07 18:53:46 -04:00
Steel Titanium
027e6e8e3c Change win_snd.c also 2018-10-07 15:00:48 -04:00
Steel Titanium
232a7ae7b7 Change order of the ifdef 2018-10-07 14:52:25 -04:00
Steel Titanium
def090c9f0 Move the ifdef 2018-10-07 14:45:03 -04:00
Sryder
e4f2a3d7b6 Merge branch 'skill-option' into 'master' 
-skill launcher option

See merge request KartKrew/Kart!34
 2018-10-07 12:25:06 -04:00
Sryder
d3e489e986 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
42307c0ea0 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
toaster
b1e02467bf Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more! 2018-10-07 15:00:58 +01:00
Sryder
eebde386cf Merge branch 'frameperfectegg' into 'master' 
Frame Perfect Egg

See merge request KartKrew/Kart!31
 2018-10-07 09:39:45 -04:00
Sryder
64ceed280a 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
da4853f4d5 Merge branch 'droptweaks' into 'master' 
Droptweaks

See merge request KartKrew/Kart!27
 2018-10-07 09:37:02 -04:00
toaster
2f061a531a 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
Sryder
fb6c329870 Fix the crashing bug hopefully 
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
 2018-10-07 10:37:45 +01:00
Sryder
02597e0bf9 Fix compiler warnings. 2018-10-07 09:26:18 +01:00
TehRealSalt
8ba3f88553 Don't need thissec 2018-10-06 23:37:27 -04:00
TehRealSalt
ff7b402dc5 OGL support 2018-10-06 19:25:59 -04:00
Sryder
d072dd2725 I think that should be NULL, not 0 actually. 2018-10-07 00:22:23 +01:00
Sryder
7b417b573c Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound. 
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
 2018-10-07 00:15:42 +01:00
Sryder
725a65c1f7 Call SDL_RWclose after an SDL_RWFromMem call to close the RWops. 2018-10-07 00:15:11 +01:00
toaster
031f142459 You got it, Sal 2018-10-06 21:53:39 +01:00
TehRealSalt
3d7a1d44d5 Do clipsolid for doorclosed only while your camera is outside of the sector 2018-10-06 16:22:36 -04:00
toaster
41ad3de999 Access to map hell maps in record attack. Currently dependent on 50 emblems. 
Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
 2018-10-06 21:08:09 +01:00
TehRealSalt
ea6bdca949 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
2effb6adc3 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
Monster Iestyn
1ec601af6b Draw a star for continues if invalid skin numbers are somehow supplied 2018-10-05 22:42:36 +01:00
TehRealSalt
cc2af8a329 Merge branch 'master' into net-screen 2018-10-05 16:13:25 -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
Sal
352c824ee1 Merge branch 'chat-changes' into 'master' 
Chat changes

See merge request KartKrew/Kart!26
 2018-10-05 11:47:45 -04:00
Sryder
d1daa99289 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
df824eb370 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
3417f57e92 -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
TehRealSalt
34aa3762c9 -splitscreen launcher option 
Now you can join a game in splitscreen mode from a launcher
 2018-10-04 23:55:28 -04:00
Steel Titanium
b812a6a4ab Really fix DD compiling this time. 2018-10-04 22:56:11 -04:00
Steel Titanium
fc5d969642 Fix DD compiling 2018-10-04 22:44:26 -04:00
Steel Titanium
49cb1ffe9f Restore deleted endif 2018-10-04 22:38:59 -04:00
TehRealSalt
d51e4c3140 Scale explosions properly 2018-10-04 22:09:12 -04:00
TehRealSalt
c5e30aa018 Don't allow non-keyboard keys to screenshot/gif in menus 2018-10-04 22:06:56 -04:00
TehRealSalt
85ed88ac20 Merge branch 'master' into net-screen 2018-10-04 20:16:25 -04:00
TehRealSalt
376656343a Revert "Attempt to not let the camera into thok barriers" 
This reverts commit 9f42e74fe2.
 2018-10-04 20:08:29 -04:00
TehRealSalt
7de16e2528 Foolish 2018-10-04 20:06:55 -04:00
Steel Titanium
79f5f4885c Split zlib and libpng 2018-10-04 19:47:19 -04:00
TehRealSalt
639a170c78 Merge branch 'master' into sal-cleanup 2018-10-04 18:51:45 -04:00
TehRealSalt
6bae5e952b Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -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
Sryder
8afdda8249 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
744c41bc8a Edit the text remaps 
Lighter sky, lighter pink, steel is now called steel-blue
 2018-10-04 14:30:54 -04:00
TehRealSalt
1cb2c22cbd Dream is green, Olive is yellow 2018-10-04 14:28:38 -04:00
TehRealSalt
fef3c63740 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
ad64279d28 Edit Pink, Navy, and Jet 2018-10-03 20:48:44 -04:00
toaster
fdf398d003 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-03 21:04:34 +01:00
toaster
dcdbf911a5 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
60a26fcaa4 * 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
4c1a068bd7 Update A_GrenadeRing to also take the mapheader scale into account. 2018-10-03 20:23:59 +01:00
Latapostrophe
4aea053c2f Allow client to open chat and scroll even if muted. 2018-10-03 20:09:32 +02:00
TehRealSalt
738ee90d8a Merge branch 'master' into noclip-cam 2018-10-03 13:45:20 -04:00
TehRealSalt
bb9e77f2a1 Add a few more splitscreen checks here 2018-10-03 13:43:36 -04:00
toaster
d7892266e4 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
a16b9cfc1f Incorrect comment starting location. 2018-10-03 17:16:23 +01:00
toaster
ecfe8e5070 Complete the disabling of the traditional shield mechanism (oversight from initial commit). 2018-10-03 17:14:25 +01: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
Sryder
76e0ff6dc7 Merge branch 'waypastpoint' into 'master' 
Ghetto waypoint improvements

See merge request KartKrew/Kart!21
 2018-10-02 18:20:17 -04:00
TehRealSalt
d2ec4d2be5 Only play one player's roulette sounds at a time 
Don't stack the sounds :WutFace:
 2018-10-02 14:10:38 -04:00
toaster
2f082d8265 Revert "Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better" 
This reverts commit 8aff76b8c3.
 2018-10-02 16:52:02 +01:00
toaster
4b9d5f251e Fix incorrect alignment of selected-level Ruby in vote drawer. 2018-10-02 16:51:17 +01:00
Alam Ed Arias
348f4dc2cd Merge branch 'master' into next 2018-10-02 09:14:59 -04:00
TehRealSalt
527642323e Splitscreen spectator info 2018-10-02 02:23:13 -04:00
TehRealSalt
7590153b67 Finish music in splitscreen now depends on the best player's rank 
In offline splitscreen it should now always pick the win theme (the one that's timed with the signpost), and in online splitscreen it should now pick the best ranked local player (previously it'd always play the OK theme, unless if you time over'd)

Will also be extremely relevant for SMK-style cooperative grand prix!
 2018-10-02 02:10:20 -04:00
TehRealSalt
506c70ce27 Don't scale player arrows in splitscreen 2018-10-02 01:28:48 -04:00
TehRealSalt
ac521015ff Don't draw the challenger screen multiple times 
Another minor bug that could only crop up in online splitscreen
 2018-10-02 01:26:13 -04:00
TehRealSalt
66c1b9d598 If multiple players are just joining, don't count them in the player count 
Prevents awkward situations where only the last player of your node gets added immediately and not the others. Shouldn't affect anything otherwise?
 2018-10-02 01:25:10 -04:00
TehRealSalt
f5eee19d9b Online splitscreen voting 
Forgot I added in that quick edit to make it not send anything in splitscreen mode, oops!
 2018-10-02 01:22:45 -04:00
TehRealSalt
24c615108f Merge branch 'master' into net-screen 2018-10-01 19:46:25 -04:00
TehRealSalt
58b52adf7e Address toast review 
- Re-add highlighting to the header text, and shift it back up slightly
- Move the viewpoint loop break out of a while and into the main loop
 2018-10-01 19:23:38 -04:00
toaster
445013b0f9 Wrong bracket level for flashing-set. 2018-10-01 22:44:17 +01:00
toaster
147b7a5786 Modified SPB to not route through P_DamageMobj (so wehave more control over the shield dropping/item obliteration, given Sryder picking up his own Thundershield...) 2018-10-01 21:48:52 +01:00
toaster
d42736fe3d Include srb2.org in the credits per Rob's wishes. 2018-10-01 21:23:00 +01:00
Sryder
033667a0ee Merge branch 'keysmash' into 'master' 
(Mic)key('s Dick) Smasher

See merge request KartKrew/Kart!18
 2018-10-01 14:58:31 -04:00
Latapostrophe
49acbe9bee Fix /me and sayteam, except sayteam now actually doesn't do anything anymore. 2018-10-01 20:23:56 +02:00
toaster
c9da6cd856 Minor HUD offset tweak for splitscreen eggnum. 2018-10-01 18:10:12 +01:00
toaster
d0e629a8e2 Correct some inconsistencies I missed in the previous commit. 2018-10-01 13:51:23 +01:00
TehRealSalt
e6fd41339a DrawFill supports splitscreen offset flags 2018-10-01 08:41:44 -04: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
toaster
14a5ffbfd8 Based on netgame comments last night, update the tab rankings info to show less information in race. 2018-10-01 12:52:54 +01:00
toaster
f1267f8ae1 Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost. 2018-10-01 12:27:35 +01:00
TehRealSalt
96506359f1 Goodbye cvar 2018-10-01 07:21:02 -04:00
toaster
0ec952d019 Add a SECTIONRACE map flag. So far, all it does is prevent the number of laps from exceeding the map default, but it's a base to work off of if we want to add any other changes specifically for section races in future. 2018-10-01 12:12:48 +01:00
toaster
487a2ecf2e Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-01 11:46:13 +01:00
TehRealSalt
71e40f68cd Foolish error 2018-09-30 21:47:04 -04:00
TehRealSalt
73100b22d5 Please don't punish offline practice 2018-09-30 21:46:12 -04:00
TehRealSalt
a4f3d4867d Change dummysplitplayers into splitplayers, unhide it, and set it when joining and not just hosting 
Silly oversight
 2018-09-30 18:07:05 -04:00
TehRealSalt
9cf379f091 kartdebugnodes 2018-09-30 17:47:56 -04: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
TehRealSalt
5132c31e0f I have no idea if this is an actual problem or not, but this was in the back of my mind from day 1 2018-09-30 17:17:33 -04:00
TehRealSalt
bc807dccc4 Sorta messy menu to set splitscreen 
Now this branch is completely functional!
 2018-09-30 17:09:59 -04:00
TehRealSalt
ad06b3c62f Proper G_GametypeHasSpectators for netgame splits 2018-09-30 16:35:05 -04:00
TehRealSalt
4da5c165f4 Fix all of the joining ghost issues or desyncing 
The answer was so obvious! Just add a XD that just calls CL_RemovePlayer! Duh!
 2018-09-30 16:20:01 -04:00
TehRealSalt
56ec3d0465 Probably should do this too... 2018-09-30 12:19:26 -04:00
TehRealSalt
7d8891f057 Instead of directly using CL_RemovePlayer, do a silly loop around 
Hopefully I don't have to keep this, just have to see if it works
 2018-09-30 12:12:12 -04:00
TehRealSalt
d705d2a606 Temporary testing measure 
set splitscreen = 3 on host or connect
 2018-09-30 11:22:56 -04:00
TehRealSalt
f858b2aa11 RIP, didn't commit this 2018-09-30 11:22:31 -04:00
TehRealSalt
847924a47a Let's try what that comment suggests. 2018-09-30 11:22:10 -04:00
TehRealSalt
5628ffe360 HUD debugger (no cvar yet) 2018-09-30 11:21:41 -04:00
TehRealSalt
fc93e5812d Add a message for when multiple players on one node get removed 
Example:

Chrome has been kicked (Go away)
Shadow has left the game (Joined with Chrome)
Kryne has left the game (Joined with Chrome)
Vyce has left the game (Joined with Chrome)
 2018-09-30 01:51:49 -04:00
TehRealSalt
3c567b39f1 Minor splitscreen+netgame fixes 
Mainly related to drawing Battle arrows or Hyudoro
 2018-09-30 01:23:59 -04:00
TehRealSalt
1d6215030e Online splitscreen 
It WORKS, including kicking players in splitscreen
 2018-09-30 00:51:03 -04:00
Sryder
005e3ce514 Merge branch 'hack_the_de_damnit' into 'master' 
Fix dehacked list incongruence

See merge request KartKrew/Kart!20
 2018-09-29 16:52:41 -04:00
toaster
ab59504be0 Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit 2018-09-29 20:28:27 +01:00
toaster
1be13e8e2d Fix dehacked list incongruence. 2018-09-29 16:43:00 +01:00
toaster
2c1db167da Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again. 
Also, sounds.
 2018-09-29 16:18:16 +01:00
toaster
21ba9921da Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of TYLER52) 2018-09-28 20:10:22 +01:00
toaster
8ccaa1fcee Flip dynamic slope toggle. 2018-09-28 12:58:07 +01:00
TehRealSalt
68bf1f60f3 "TICRATE*1"?! 2018-09-27 18:44:14 -04:00
TehRealSalt
7c5d47deb5 No mashing in Record Attack 2018-09-27 18:42:42 -04:00
TehRealSalt
7de6a63207 Talk key is a two-way toggle for non-keyboard binds 2018-09-27 18:32:48 -04:00
TehRealSalt
6d798f00e7 Yet another scale fix 2018-09-27 18:26:37 -04:00
TehRealSalt
5419ac82ee 1 more fix 2018-09-27 17:21:06 -04:00
TehRealSalt
30005ad39b Scale fixes 2018-09-27 17:17:04 -04:00
TehRealSalt
cf5c0a7a6a New bindable keys 
You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads

They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
 2018-09-27 16:55:21 -04:00
toaster
169411e3da Disable cv_joinnextround behind #define VANILLAJOINNEXTROUND. 2018-09-27 21:38:19 +01:00
toaster
fb102f8131 Fix dash-dust spawning not happening when drop-dashing, despite its function being called. 2018-09-27 18:39:54 +01:00
toaster
7f5b5ecb60 Spring *panels* now use sfx_kc2f again (but pogo spring *items* still do sfx_kpogos, in case you were worried). 2018-09-27 18:32:07 +01:00
toaster
e4f6015b50 Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.) 
This fixes #11.
 2018-09-27 18:11:43 +01:00
TehRealSalt
3d582bc98f Viewpoint key improvements 
- Don't cycle through exiting players
- Don't cycle through karma players in Battle
- Disable console print on switch, it's already got a HUD element
 2018-09-26 21:35:57 -04:00
TehRealSalt
1a37335675 ESC rebind works on both bound keys 2018-09-26 20:51:25 -04:00
TehRealSalt
a223375cc0 Remove the commented out SALLYALTRAINBOW define 
The relative luminance tweak fixes what it was meant to fix, but without changing the core functionality
 2018-09-26 20:40:26 -04:00
toaster
8aff76b8c3 Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better 2018-09-25 22:37:04 +01:00
toaster
a85682983b Manual has more pages and less terrible large-size support. 2018-09-25 22:33:22 +01:00
toaster
eb4a967d8e Merge branch 'minimap_in_demos' into 'master' 
Show minimap in demo playback

See merge request KartKrew/Kart!16
 2018-09-23 18:14:09 -04:00
toaster
c9e994ae07 smoll to tiny 2018-09-23 23:07:38 +01:00
toaster
c0a16be662 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell 
# Conflicts:
#	src/info.c
#	src/info.h
#	src/sounds.c
#	src/sounds.h
 2018-09-23 23:07:16 +01:00
Sal
9c10a85596 Merge branch 'itemdrop' into 'master' 
Itemdrop

See merge request KartKrew/Kart!11
 2018-09-23 17:51:28 -04:00
toaster
de91eb9793 You're right, this works fine 2018-09-23 22:34:59 +01:00
toaster
a1ad4d79d0 Turns out Playing() evaluates to false when playing back demos. Who knew? 2018-09-23 19:58:15 +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
toaster
8bc1a217fe Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-09-23 12:58:06 -04:00
toaster
d2d6e67f48 Forgot I did this optimisation! Updated for the new colours. 2018-09-23 16:39:07 +01:00
toaster
73116f2b60 The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with #ifdefing. 2018-09-23 16:13:58 +01:00
toaster
fa65cbb43e Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up. 2018-09-23 13:34:49 +01:00
toaster
c5e16f183e Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders). 
Also, correct a minor copypaste failure in one of the I_Errors' messages.
 2018-09-23 13:23:03 +01:00
toaster
2e158f2c21 Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic... 2018-09-23 13:22:00 +01:00
toaster
659810cd81 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
 2018-09-23 11:47:29 +01:00
TehRealSalt
9f42e74fe2 Attempt to not let the camera into thok barriers 
Doesn't really work right now; it'll still go into thok barriers and get caught up at its floor height
 2018-09-22 22:46:06 -04:00
TehRealSalt
3949d0fcdb Obvious first commit: enable the NOCLIPCAM define again 2018-09-22 22:22:44 -04: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
bb1aaf9d54 New sparkles 2018-09-22 19:55:26 -04:00
TehRealSalt
ad8d674e5e Set nogravity on landing 
Means you can't have a finishline that moves up and down, but eh, thinking this might help the fallback measure disappearing
 2018-09-22 19:03:38 -04:00
TehRealSalt
a3b40c7577 Better particle spread 2018-09-22 19:00:30 -04:00
TehRealSalt
487e114fee raceexittime var 2018-09-22 18:59:26 -04:00
toaster
d7f8d4507a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 
# Conflicts:
#	src/sounds.c
#	src/sounds.h
 2018-09-22 23:11:14 +01:00
toaster
6cc7f97d8a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu 
# Conflicts:
#	src/m_menu.c
 2018-09-22 23:00:46 +01:00
TehRealSalt
7256e99b12 Merge branch 'master' into this-is-a-sign 2018-09-22 17:58:35 -04:00
Sal
5f78807ef0 Merge branch 'encore' into 'master' 
Encore

See merge request KartKrew/Kart!7
 2018-09-22 17:52:33 -04:00
Sal
81249a084a Merge branch 'shitsfree' into 'master' 
:shitsfree:

See merge request KartKrew/Kart!12
 2018-09-22 17:24:11 -04:00
Sal
be36d8ed84 Merge branch 'icon_update' into 'master' 
Icon Update

See merge request KartKrew/Kart!9
 2018-09-22 17:19:02 -04:00
toaster
f20710fbb4 Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops. 2018-09-22 21:05:20 +01:00
toaster
81c04480f9 List update as requested by Sal 2018-09-22 20:56:44 +01:00
toaster
3a76605772 * Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar. 
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
 2018-09-22 18:22:04 +01:00
toaster
1f2ee32a83 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes 2018-09-22 15:14:21 +01:00
toaster
e63d4740ec Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell 
# Conflicts:
#	src/info.c
 2018-09-22 14:57:33 +01:00
toaster
4fd4deff8a One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
toaster
84c2a8c28f Sign compare fix via boolean cast 2018-09-22 11:59:07 +01:00
TehRealSalt
e9d4fae5b9 Merge branch 'master' into new-voices 2018-09-21 21:13:46 -04:00
TehRealSalt
0e39bf2821 Slightly darker green backgrounds 2018-09-21 19:51:31 -04:00
Latapostrophe
f8c9ef9431 Did everything toaster suggested 2018-09-22 01:47:13 +02:00
TehRealSalt
dd6b63f9da Different timings 2018-09-21 19:44:14 -04:00
Latapostrophe
23090e82b5 Changed thundershield sound 2018-09-22 01:15:04 +02:00
TehRealSalt
3fa7f4e7b4 Address review 
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
 2018-09-21 18:40:18 -04:00
toaster
20222c47e7 Okay, seems like reducing it to 1x is enough - making it singular is overkill and means that often if the furthest one away from you is the one to yell, you'll barely hear it. At least this way you'll only hear overkill chao if you're super close to the stands and the mapper's placed way too many 2018-09-21 22:06:27 +01:00
TehRealSalt
cb3c93e56e Minor adjustments to the endsign color back table 2018-09-21 16:54:29 -04:00
toaster
80bc266f3f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 
# Conflicts:
#	src/info.c
#	src/k_kart.c
 2018-09-21 21:05:47 +01: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
4fa1860543 Merge branch 'master' into this-is-a-sign 2018-09-21 15:40:12 -04:00
TehRealSalt
06a4a5e4dc Prevent signs from disappearing 2018-09-21 15:37:30 -04:00
Steel Titanium
f88708bb75 Fix the weird indentation 2018-09-21 12:05:52 -04:00
Steel Titanium
68ec811909 Rearrange the code. 
Thanks again MonsterIestyn!
 2018-09-21 11:26:08 -04:00
Latapostrophe
58a0206783 Moved strlen(w_chat) out of the loop. 2018-09-21 17:03:09 +02:00
Steel
af58ba9ae3 Remove this that somehow slipped in. 2018-09-21 07:21:49 -04:00
Steel
be74b4e58b Fix up errors with buildbots 2018-09-21 07:16:54 -04:00
toaster
25ae5a5e7f Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later. 
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
 2018-09-21 12:12:17 +01:00
Latapostrophe
4320e0f3a8 Fix visual error related to moving the cursor on multi-line messages. 2018-09-21 12:23:00 +02:00
TehRealSalt
3b928ca979 Condense this re: wolfs 2018-09-20 22:16:04 -04:00
Steel Titanium
378495cb2b Add some stuff 2018-09-20 18:33:50 -04:00
Steel Titanium
a53f036149 Use MemAvailable instead 2018-09-20 18:30:46 -04:00
toaster
1a2f84a5ba Smaller XPM with no redundant pixels 2018-09-20 22:36:01 +01:00
TehRealSalt
e2a7146667 Reeling back on this again 
Kinda want to save it for another branch
 2018-09-20 17:11:59 -04:00
TehRealSalt
e441b2bce4 Address review 
(for anything code I did, anyway)
 2018-09-20 17:11:11 -04:00
toaster
e90139c5b3 :shitsfree: 2018-09-20 17:45:19 +01:00
Latapostrophe
73c66e3bc4 Spark radius now follows players 2018-09-20 18:31:38 +02:00
TehRealSalt
f425ba4423 Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
TehRealSalt
f207140791 Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc 2018-09-19 18:45:47 -04:00
TehRealSalt
b2099678d1 Enable noclip cam again. 
It's just... TOO good, despite the couple of issues with it
 2018-09-18 23:56:26 -04:00
TehRealSalt
8013a064ab Spark fix 
(please don't spread these fixes out across different branches :boi:)
 2018-09-18 15:51:27 -04:00
toaster
cb629303d6 Update a bunch of icons - SDL_icon.xpm and other targets' .icos. 2018-09-18 19:37:03 +01:00
toaster
a1045d232b :boi: 
(fix driftsparks, and subsequently sliptides because i copypasted most of the code for them, disappearing underwater)
 2018-09-18 17:40:39 +01:00
TehRealSalt
864f2466fe Booster+wipeout fix 2018-09-17 20:24:03 -04:00
mazmazz
20c4702986 Line exec trigger netsync: Save var2s in addition to vars 2018-09-17 14:13:31 -04:00
toaster
c00e054979 correct oversight in merge 2018-09-17 11:36:22 +01:00
toaster
123778766a Animated sky backport 2018-09-17 11:21:25 +01:00
toaster
8618d7bbec Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs 
# Conflicts:
#	src/k_kart.c
 2018-09-17 11:19:17 +01:00
TehRealSalt
69cbbde7fc Updated Dream 2018-09-17 02:48:10 -04:00
TehRealSalt
f2838f7ab3 More color tweaks 
- Renamed Grey to Nickel, and Cloudy to Grey
- Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey
- Drastically changed Navy to be more distinct from Jet
- Replaced Indigo with Pomegranate
- Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow)
- Updated color opposite table to match
 2018-09-17 02:09:22 -04:00
TehRealSalt
c9994c6ad8 Changed MD2 coloring again 
Squares the colors to get nicer looking results (https://www.youtube.com/watch?v=LKnqECcg6Gw), as well as only blending a small chunk of the skincolor to prevent desaturation from the brightest/darkest values.
 2018-09-16 23:39:18 -04:00
TehRealSalt
ac2f81e423 New color brightness formula 
Gets more accurate looking results
 2018-09-16 23:28:10 -04:00
TehRealSalt
78a4cdab9f Alternate TC_RAINBOW 
Leaving behind a commented out define for now because I dunno if I like it yet
 2018-09-16 18:10:29 -04:00
Monster Iestyn
1b7b1f3f79 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
Latapostrophe
09287df890 Radius is now a define 2018-09-16 11:16:30 +02:00
Latapostrophe
0bb24a392e Fixed crash when replacing first character. 2018-09-16 11:01:00 +02:00
Latapostrophe
ce5abdc6e3 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +02:00
TehRealSalt
7edb99b87a Revert this now that we have ESC functionality 
(I mean. I still think this feels nicer than pressing the menu button, but...)
 2018-09-15 20:13:29 -04:00
TehRealSalt
649d547209 Buff rainbow sparks 2018-09-15 19:59:39 -04:00