Commit graph

3526 commits

Author SHA1 Message Date
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
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
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
TehRealSalt
511944a1f1 Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
3aa7a9a65c Merge branch 'master' into new-engines 2018-10-09 15:35:50 -04:00
TehRealSalt
f25c74b152 Merge branch 'master' into new-engines 2018-10-09 15:34:26 -04: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
TehRealSalt
b6ff542803 Merge branch 'master' into net-screen 2018-10-09 14:41:59 -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
89d08fda84 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
445254dab6 Reduce update frequency to match the sfx length better 2018-10-08 22:35:17 -04:00
TehRealSalt
cdef7f4e1d 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
ab0c7b6ba8 use cvar mins 2018-10-08 14:49:48 -04:00
TehRealSalt
aa4c42fa98 Scale chat in splitscreen
Only covers things on P1's screen now
2018-10-08 14:38:29 -04:00
TehRealSalt
3e99d4838e Simpler loop 2018-10-08 13:58:16 -04:00
TehRealSalt
1bce22cf72 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
TehRealSalt
d5c06b31ad Fix Hyudoro arrows being visible 2018-10-08 00:16:27 -04:00
TehRealSalt
1acee694aa Don't let chat/console eat inputs from anyone besides player 1 2018-10-08 00:14:29 -04:00
TehRealSalt
7a6a2f8946 Merge branch 'master' into net-screen 2018-10-07 23:26:56 -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
TehRealSalt
b5f409fcb8 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -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
TehRealSalt
37b5a9327c Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04: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
TehRealSalt
59c4400a60 -splitscreen launcher option
Now you can join a game in splitscreen mode from a launcher
2018-10-04 23:55:28 -04:00