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
0fc113e6dd
actnum is now a 2 character long string
...
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
518676c2a4
P, not K
2018-06-03 21:07:36 -04:00
TehRealSalt
6d57d39e12
SUPER CHARGED KARMA ITEMS
...
They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha
(also calls P_CheckRacers when someone spectates)
2018-06-03 20:58:52 -04:00
TehRealSalt
0906978a2a
Remove collide debug stuff
2018-06-03 18:58:50 -04:00
TehRealSalt
4c0f64ff4f
Merge branch 'master' into sonicitems
2018-05-31 19:47:50 -04:00
TehRealSalt
7d021ae1e6
Splitscreen-friendly voting screen
2018-05-31 18:49:19 -04:00
TehRealSalt
eadd7381eb
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
dcd8c87c6f
But hey, what if I also made color & skin save to the config too!
...
Does this make up for it? :V
2018-05-30 16:59:53 -04:00
TehRealSalt
36b52e1c67
Merge remote-tracking branch 'refs/remotes/srb2public/next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/m_misc.c
2018-04-07 18:43:59 -04:00
TehRealSalt
e5798f7490
Rename fake item to eggman monitor
2018-03-13 21:07:08 -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
517fcd4366
Better gamepad axis support
2018-03-11 18:07:28 -04:00
TehRealSalt
f97ec30493
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
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
Sryder
0454293bae
Hopefully a few more fixes and sanity changes for map voting
2018-02-23 01:53:30 +00:00
Sryder
dbc27e9c9e
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
Alam Ed Arias
99552c2ba2
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
TehRealSalt
3e7fbad490
Porting over some things from sonicitems
2018-02-13 16:48:09 -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
2af4f0451a
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
2889687d1d
New invincibility effect, grow/shrink stuff
...
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt
ec84b46bb4
P != M
2018-02-08 18:14:56 -05:00
TehRealSalt
85a81ed087
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 17:13:06 -05:00
TehRealSalt
8c2bdfd006
Belp
...
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -05:00
TehRealSalt
cbff4bbf44
So much
...
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
TehRealSalt
b20e2d55eb
Everything
...
Been a while since I synced :V
2018-02-03 23:47:47 -05:00
toasterbabe
5adfdf9516
cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this.
2018-01-30 22:48:53 +00:00
TehRealSalt
58da420e30
Setup vote is a XCMD now
...
But now the rest of voting can get desynced easily now... this is
increasingly getting more and more fucked.
2018-01-30 16:42:44 -05:00
TehRealSalt
202ad11b43
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-01-29 19:20:23 -05:00
TehRealSalt
1e01e65a8b
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-29 19:15:25 -05:00
TehRealSalt
41f09816ce
Functional, ready for netgame!
2018-01-27 23:52:01 -05:00
TehRealSalt
cc0c99640f
Work so far
...
Crashes, but baseline's there
2018-01-27 01:17:08 -05:00
TehRealSalt
403e14e971
Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks
...
# Conflicts:
# src/g_game.c
# src/m_cheat.c
# src/p_user.c
2018-01-24 16:24:36 -05:00
TehRealSalt
f6cfcd4f89
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu
...
No more weapon number buttons, button constants reordered, and BT_JUMP
renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff
we didn't need. Spectator-only support for looking up/down soon.
Keyboard defaults are just what I use, plan on adjusting it further
after more feedback
2018-01-24 02:45:06 -05:00
TehRealSalt
8b88a2ebd8
Spectating is properly implemented now
...
- Spectate button works
- Spectating & objectplace controls are usable now
- New spectator HUD
2018-01-22 22:18:57 -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
abfefd3d51
No more analog mode
...
It doesn't work well in SRB2Kart :V
Also fixed the player setup name field's _ being 8 px too far to the
right
2018-01-16 21:58:48 -05:00
TehRealSalt
db09f7b3d6
Lots of changes
...
- Menus now have all of the Kart cvars
- Removed any cvars that aren't useful for Kart from the menu (they
still exist in the console, though)
- Removed SP and NiGHTS Mode options from the main menu
- "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples
of 50, or the terms "Relaxed", "Standard", and "Turbo"
- Many gametype options (game speed, frantic, mirror, & karma comeback)
are now changed on map load instead of instantly
- New cvar, "kartminimap", for disabling the minimap
- The maxplayers cvar now actually matches up with our 16 player limit
- Game now keeps track of matches played. Has a condition type
associated with it, as well.
- Game checks for unlocks and saves gamedata when finishing a match,
even in MP
- Removed most of the normal emblems, added a single emblem for Green
Hills. Didn't know what to do with extra emblems and such so I just left
them (FOR NOW c:<)
2018-01-15 22:31:14 -05:00
Monster Iestyn
f1b8e122a2
Fix missing semicolon
2018-01-12 20:05:09 +00:00
Monster Iestyn
602701d6dd
G_DoPlayDemo: prepend srb2home to the demo name (if an external file) so that demos in custom home paths can be loaded
2018-01-11 16:55:42 +00:00
TehRealSalt
f2fb100515
Stupidly minor "Sonic Robo Blast 2" -> "SRB2Kart"
2018-01-02 23:15:13 -05:00
TehRealSalt
42ddd32406
Merge remote-tracking branch 'refs/remotes/srb2public/master'
2018-01-02 22:59:43 -05:00
TehRealSalt
d92e2d89dd
Y'know what let's just completely get rid of this prefcolor restriction
...
Kart doesn't really need this if we're taking the MK8 Yoshi/Shy Guy
approach to just letting you pick whatever colors. It's just plain
annoying to set your color in the menu, then go into splitscreen and see
that none of it actually carried over :V
2018-01-01 18:12:44 -05:00
Monster Iestyn
afcdb5cd1e
Merge branch 'restartaudio' into 'master'
...
Add command to restart the audio system
Closes #27
See merge request STJr/SRB2!214
2017-12-27 16:47:50 -05:00
Steel Titanium
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
Steel Titanium
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
TehRealSalt
0dfd7fc41e
some joystick fixes
...
Turns out P3/P4 controllers are broken (and still are)
2017-12-24 08:20:58 -05:00
TehRealSalt
5db276173e
Merge remote-tracking branch 'origin/quads' into quads
...
# Conflicts:
# src/k_kart.c
2017-12-18 21:11:59 -05:00