Commit graph

76 commits

Author SHA1 Message Date
TehRealSalt
10d09d3dd8 Tiny menu header tweaks
Screenshot Options has its own header, intermission "Result" header is automatically centered
2018-06-14 20:46:07 -04:00
TehRealSalt
8f9595b72f Readd voting cheating, just in an entirely different way
Will need tested for desyncs, since it adds some RNG into the vote ticker. Which may or may not matter.
2018-06-13 21:58:21 -04:00
TehRealSalt
5f4c0bb052 Different, nicer way of doing fakeouts
Means it can no longer cheat, but I never saw it cheat in action anyway.
2018-06-13 21:47:27 -04:00
TehRealSalt
d5f311681f Voting fakeouts
The voting cursor can land early, or go up a position, on vote end. Not only is this hilarious and makes it more unpredicatable, it also makes it easier for the game to pick a vote and move on to the next level .

(I bet people will mistake this for a bug on release :V)
2018-06-12 22:10:26 -04:00
TehRealSalt
d1e206072a Minor vote screen fixes 2018-06-12 19:05:11 -04:00
TehRealSalt
9b3751b30c Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
TehRealSalt
e39de53fa2 Use strlen for all of the valid zone title/act num checks 2018-06-05 17:28:46 -04:00
TehRealSalt
ce14c13699 Multiplayer cursors in voting 2018-06-05 02:11:47 -04:00
TehRealSalt
0fc113e6dd actnum is now a 2 character long string
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
7d021ae1e6 Splitscreen-friendly voting screen 2018-05-31 18:49:19 -04:00
TehRealSalt
00e913bbcc Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
2018-03-31 00:44:03 -04:00
TehRealSalt
7516a1dc0c Doing one more step to totally ensure that matchesplayed is unlocking stuff 2018-03-30 12:16:15 -04:00
TehRealSalt
375f9a9291 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
2018-03-12 00:58:13 -04:00
TehRealSalt
6650e6c49c Maybe fixed dedicated? 2018-03-05 19:55:39 -05:00
TehRealSalt
ce74a4c964 Attempted to fix how voting handles no votes
I don't know exactly what it did previously since I never actually
observed what happens, but now in dedicated servers it will wait for
time to run out, then if there's no votes by that time it will just go
onto nextlevel
2018-03-01 17:05:36 -05:00
TehRealSalt
0ed75724e6 Some offset adjustin' 2018-02-27 21:17:34 -05:00
TehRealSalt
acb98b50c7 Another minor voting thing 2018-02-27 20:52:12 -05:00
TehRealSalt
29e4c6764d Fixed an odd bug 2018-02-27 20:46:01 -05:00
Sryder
dbc27e9c9e It's SINT8 not INT8 2018-02-23 01:04:52 +00:00
TehRealSalt
ccae121c26 Quick fix 2018-02-20 18:18:10 -05:00
TehRealSalt
275132da5f Minor but important fixes 2018-02-17 01:53:44 -05:00
TehRealSalt
581e231a3e sonicitems porting, Part 2
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt
00d2038d61 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c

(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
2018-02-11 12:18:25 -05:00
TehRealSalt
51029b2880 Remove comment 2018-02-10 19:56:05 -05:00
TehRealSalt
bfd7915a01 Random picking animation 2018-02-10 19:02:15 -05:00
TehRealSalt
8f74b1afcd Faster 2018-02-09 21:14:14 -05:00
TehRealSalt
9088e3dbab Slight adjustment 2018-02-09 16:04:52 -05:00
TehRealSalt
98fa8c1409 Added axis support 2018-02-08 21:24:44 -05:00
TehRealSalt
32ee651f43 /me tears away a piece of drywall
What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
2018-02-08 00:45:59 -05:00
TehRealSalt
2c09dd1df1 Minor fixes 2018-02-07 22:45:40 -05:00
TehRealSalt
b20e2d55eb Everything
Been a while since I synced :V
2018-02-03 23:47:47 -05:00
TehRealSalt
116ef8065f welp 2018-01-29 21:39:13 -05:00
TehRealSalt
2cb96bf16c Adjust for taller thinstring 2018-01-29 19:22:08 -05:00
TehRealSalt
202ad11b43 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:20:23 -05:00
TehRealSalt
5b9a9faae7 Minor adjustments for a taller thin font 2018-01-28 20:37:53 -05:00
TehRealSalt
52d835cded Remove a really minor 1-tic discrepancy 2018-01-27 23:55:43 -05:00
TehRealSalt
41f09816ce Functional, ready for netgame! 2018-01-27 23:52:01 -05:00
TehRealSalt
5efac6401f Getting there.
Should *theoretically* be functional... if it didn't crash on vote end.
I'm like 90% sure I'm missing a patch unload somewhere...
2018-01-27 20:59:29 -05:00
TehRealSalt
cc0c99640f Work so far
Crashes, but baseline's there
2018-01-27 01:17:08 -05:00
TehRealSalt
672c4b5298 Record best lap time in Record Attack
- Record Attack replays now save best lap time
- Removed instances of NiGHTS Attack
- Removed a lot of unlockable that have no use in Kart (ultimate mode,
perfect bonus, score emblems, etc)
- Removed all methods of activating ultimate mode
2018-01-21 19:15:26 -05:00
TehRealSalt
5a7458be98 Merge remote-tracking branch 'refs/remotes/origin/attack-is-back' into zarrotsu 2017-10-17 23:56:55 -04:00
ZTsukei
f21d817053 Correcting the weird level names post-level 2017-10-17 20:04:48 -04:00
ZTsukei
89f239b601 Merge branch 'zarrotsu' of http://git.magicalgirl.moe/KartKrew/Kart into zarrotsu 2017-10-17 18:24:10 -04:00
ZTsukei
4387455d9c Fixing post-map name being weird 2017-10-17 18:23:50 -04:00
TehRealSalt
e770f82ad7 Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back 2017-10-17 16:36:29 -04:00
TehRealSalt
a0d488402c Didn't fix the y_inter.c conflicts correctly 2017-10-17 16:23:38 -04:00
TehRealSalt
5fe2f4928f Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
# Conflicts:
#	src/doomdef.h
#	src/sdl/i_main.c
#	src/sdl/i_video.c
#	src/y_inter.c
2017-10-17 15:53:34 -04:00
TehRealSalt
4ed0511013 Some cleanup
No longer save score/rings, use the Race tally as a placeholder
replacement for the butchered vanilla one
2017-10-16 20:23:26 -04:00
Alam Ed Arias
01602fa1f1 Build: fixup warnings in Debug builds 2017-09-28 16:54:26 -04:00
Alam Ed Arias
2ccd397d11 Build: kill GCC 7's implicit-fallthrough warning 2017-09-28 09:39:47 -04:00