Commit graph

254 commits

Author SHA1 Message Date
TehRealSalt
4e69131997 Reset scores between Battle matches for now
I want to tackle the two intermission screens whenever I do the same for Race
2018-06-30 23:43:45 -04:00
toaster
ef8a5b2a7f * Properly handle gametype changes when a different-gametype level pops up on the voting screen.
* Defer the change until you're actually modifying the map, in service of the following.
	* Reset score.
	* Call that gametype change function.
* Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d.
* Fix the basic, obvious issues that'd prevent us shipping with the new level title system.
	* Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on.
	* Adjust the subttl position if it'd get overwritten.
	* Draw the gametype with the subttl.
* Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 15:14:43 +01:00
toaster
2efe86e387 * AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN!
* Super important to allow dedicated servers to continue forever without needing to add Terminal.
    * To facilitate understanding, add gametype dog-ears to the vote screen!
    * To do the above, add V_DrawDiag! Works in GL, too!!
* Unrelated shit!
    * Fix a buffer overrun in the randmapbuffer!
    * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn...
    * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 15:47:56 +01:00
SeventhSentinel
55b29504ae Fade-in intro
Also made flashing not-local, again.
2018-06-26 10:14:59 -04:00
SeventhSentinel
98dc74c3c7 Intro camera can noclip, fix several compile errors 2018-06-25 09:18:30 -04:00
SeventhSentinel
ceee74f7d6 Lakitu murder & countdown improvements
(I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-24 22:15:22 -04:00
TehRealSalt
0f8daffe2f Hundreds of tweaks
- SPB multiplier depending on 1st-2nd distance
- Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes.
- Spinout is affected by boosters, *properly*
- Can no longer strafe while spinning out on speed bumps
- Messed with how other items interact with speed bumps, again.
- Old bounce code has been ported for non-players
- Fixed Karma players being able to do anything after the round has ended.
- Fixed sneaker and spinout timer weirdness
- Fixed Mines still being hold-use
- Fixed rubber-burn turn not working
- Removed redundant k_spinout and unused k_boosting variables
- Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-19 20:20:06 -04:00
wolfy852
eca78519e4 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt
c1b1427676 SPB fixes
Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 01:51:50 -04:00
TehRealSalt
3d9f1a90e1 Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
TehRealSalt
09fa365bb1 The Lightning Update
- 30 sec cooldown on all lightning types
- Delay before Blue Lightning hits, based off of distance
- Blue Lightning can swap targets if 1st place is passed
- Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-05 21:36:48 -04:00
TehRealSalt
4fd88293ff Use strlen for all of the valid zone title/act num checks 2018-06-05 17:28:46 -04:00
TehRealSalt
23d83423cc Lots of cmd restructuring.
- cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster.
- Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now.
- Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request.
- Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 17:12:42 -04:00
TehRealSalt
a1fad489c6 actnum is now a 2 character long string
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
ec65ad380e Merge branch 'master' into sonicitems 2018-05-31 19:47:50 -04:00
TehRealSalt
e4d380d2ad I continue to be a buffoon. 2018-05-31 19:21:26 -04:00
TehRealSalt
a3fe415d8a Thaaaat was stupid of me 2018-05-31 15:39:00 -04:00
TehRealSalt
80be093e46 A couple of RA-related things
An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-30 22:53:06 -04:00
TehRealSalt
91354d86b2 Fix Star/Mega music persisting after death for splitscreen players 2018-05-30 18:38:30 -04:00
TehRealSalt
4c995e7e47 Changing from Relaxed Standard Turbo to the typical Easy Normal Hard
Reception to the naming convention has been either "don't care" or "too hard to remember"
2018-05-30 17:29:40 -04:00
TehRealSalt
fd75bbb79c Merge remote-tracking branch 'srb2public/next' 2018-05-30 17:11:02 -04:00
TehRealSalt
714992a152 Restore gc_camrotate
Sorry if this breaks everyone's configs again :V
2018-05-30 16:54:59 -04:00
Monster Iestyn
a3b345f6b1 Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode 2018-04-15 19:59:57 +01:00
TehRealSalt
9ba13c8ea4 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
7e19186491 I'm a huge idiot 2018-03-31 00:12:26 -04:00
TehRealSalt
552519faf1 reset randmapbuffer in G_DeferedInitNew 2018-03-31 00:11:03 -04:00
TehRealSalt
d438e3bc41 Doing one more step to totally ensure that matchesplayed is unlocking stuff 2018-03-30 12:16:15 -04:00
TehRealSalt
6298f4e6ee MK rules for Battle scoring
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt
eb1b84ce5c Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/info.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_mobj.c
2018-03-14 16:12:15 -04:00
Sryder
b8cb80255e Merge branch 'debug-fix' 2018-03-14 10:11:10 +00:00
TehRealSalt
79ba08ac7d 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
Sryder
dee6c2b97d Comment out calls to CV_SetValue for cv_analog 2018-03-12 03:18:45 +00:00
TehRealSalt
fc329d893b Better gamepad axis support 2018-03-11 18:07:28 -04:00
TehRealSalt
1797e3d09e Fixed mouse turning
Only works with spectating, and is affected by mirror
2018-03-11 13:12:09 -04:00
TehRealSalt
0ed9232758 Remove unused mousemove snippet 2018-03-11 12:58:33 -04:00
TehRealSalt
18ece8db5e Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype
Should make it a lot easier to add more gametypes later.
Also some minor fixes:
- Changed up how shell speed scales in mobjscale juuuust slightly, so
it's less messy
- Fixed CHECK showing spectators
2018-03-04 15:27:52 -05:00
TehRealSalt
28f5a874d4 Revamped race position
Should support ties for real now :V
2018-03-02 00:02:26 -05:00
TehRealSalt
8c3f78a925 Race position starts 2018-02-27 20:40:06 -05:00
TehRealSalt
e1a78568a3 Actual Race starts 2018-02-27 19:53:12 -05:00
Sryder
6abc6aa4d2 It's SINT8 not INT8 2018-02-23 01:04:52 +00:00
TehRealSalt
9c5a09d770 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
1a424ba756 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
TehRealSalt
62b45ff4b0 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
3db2ff37a2 One last thing: don't add whatever the game rolls for the random option
Makes it even more of a wild-card option, also makes sure that you
actually *see* all of the maps before it empties
2018-02-10 16:50:44 -05:00
TehRealSalt
a1be15134e Maybe fixed 2018-02-10 16:28:45 -05:00
TehRealSalt
e4b1bd3365 Minor fixes, mostly mobjscale and spectators 2018-02-10 16:19:22 -05:00
TehRealSalt
c542e0453c Slight adjustment 2018-02-09 16:04:52 -05:00
TehRealSalt
184ec0340b Added axis support 2018-02-08 21:24:44 -05:00
TehRealSalt
80ba8792bd P != M 2018-02-08 18:14:56 -05:00
TehRealSalt
496eac9705 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00