TehRealSalt
4364caa4ea
Merge branch 'master' into net-screen
2018-10-09 21:15:30 -04:00
toaster
49cf05a268
Merge branch 'karmegg' into 'master'
...
Karmegg
See merge request KartKrew/Kart!36
2018-10-09 17:47:11 -04: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
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
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
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
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
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
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
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
TehRealSalt
3d7a1d44d5
Do clipsolid for doorclosed only while your camera is outside of the sector
2018-10-06 16:22:36 -04: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
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
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
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
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
