Commit graph

3432 commits

Author SHA1 Message Date
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
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
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
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
Sal
399cf59b8a 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
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
Latapostrophe
4aea053c2f Allow client to open chat and scroll even if muted. 2018-10-03 20:09:32 +02: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
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
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
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
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
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
Sryder
5322caa435 Merge branch 'invert_dynamic_slopes' into 'master'
Flip dynamic slope toggle

See merge request KartKrew/Kart!17
2018-09-29 16:51:35 -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
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
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