42ddd32406
Merge remote-tracking branch 'refs/remotes/srb2public/master'
2018-01-02 22:59:43 -05:00
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
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
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
0dfd7fc41e
some joystick fixes
...
Turns out P3/P4 controllers are broken (and still are)
2017-12-24 08:20:58 -05:00
5db276173e
Merge remote-tracking branch 'origin/quads' into quads
...
# Conflicts:
# src/k_kart.c
2017-12-18 21:11:59 -05:00
349b27e0de
Change splitscreen into UINT8, fix HUD slightly more
2017-12-18 20:59:04 -05:00
d576453b56
Command_Addfile: add "too many files" and already-loaded checks and respective error messages
...
No more shall the server be kicked from their own servers for re-adding a wad by accident!
2017-12-18 21:17:37 +00:00
ea49a4c009
Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads
2017-12-18 04:57:57 -06:00
2e26e79934
Fix 3P and 4P configuration screens
...
They don't crash anymore!
2017-12-18 04:56:38 -06:00
122eb82170
Merge remote-tracking branch 'refs/remotes/origin/battle' into quads
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2017-12-18 01:02:53 -05:00
0305af3069
Merge branch 'quads' of http://git.magicalgirl.moe/wolfs/Kart into quads
...
# Conflicts:
# src/d_main.c
2017-12-17 20:30:37 -06:00
32b9663202
more stuff
...
nothing too special here
2017-12-17 20:23:11 -06:00
66a9a6bdd4
Fixed local sync fail, among a bunch of other splitscreen check fixes in other files
...
I don't know how many of the changes in d_clisrv were really necessary,
I was just franticly trying to figure out the source of the local sync
fail
2017-12-17 14:17:07 -05:00
fc9d426660
More stuuuuff
2017-12-17 01:21:24 -05:00
ffbf6e8752
Mirror Mode
...
- Added kartmirror cvar, flips the screen & player controls. The
post-processing effect is currently Software only; will need an OpenGL
implementation but I don't know enough to make that happen
- Moved adminplayer = -1 setting to SV_ResetServer instead of
SV_StartServer
2017-12-12 00:07:14 -05:00
fb976ab26c
more quad stuff
2017-12-11 00:12:38 -06:00
15751dfd47
initial quad stuff (does not work)
2017-12-08 01:30:39 -06:00
d6af8e52c1
double oops
2017-12-08 00:59:12 -05:00
4714e8d179
Remove hardcoded limit on admins
2017-12-07 22:45:39 -06:00
37448a3e92
Merge remote-tracking branch 'remotes/origin/battle' into multi-admin
2017-11-20 21:49:42 -06:00
81c723b9b5
Bounce Pad stuff
...
- K_DoBouncePad now uses mobj_t instead of player_t
- Bounce pads can now bump thrown shells
- Bounce pads now give heavier gravity to players
- The suicide command now works in all gamemodes
2017-11-19 02:37:28 -05:00
3d3972fac9
Battle HUD stuff
2017-11-13 20:45:57 -05:00
25599ff813
Multiple admins
2017-11-10 23:34:37 -06:00
c5920b431f
Lots of misc stuff
...
- Bomb overlay is invisible during comeback timer, and flickers back in
when it's almost up
- Show comeback timer on HUD
- Feather is stronger & has more gravity
- Option to use SMK star alarm instead of overlapping music
- Using P_MobjDamage normally on players now defaults to normal spinout
instead of shell's instant stop
- Some general gametype case fixes (most notably, being able to spin
people out in Race using a mushroom)
2017-11-10 21:10:01 -05:00
e61549d81f
Opps, forgot to change this.
2017-11-08 14:50:27 -05:00
55c86f3e15
Successful attempt at restarting the music
2017-11-08 14:48:05 -05:00
c1405137ec
Extra tab space to make the compiler happy
2017-11-07 23:48:03 -05:00
4f8b91c770
Attempt to restart music
2017-11-07 16:26:45 -05:00
7fcca8f2d1
Added feather
2017-11-07 00:57:42 -05:00
9bea44e5c1
Fix this garbage
2017-11-05 16:34:12 -05:00
9522e1b95e
CHECK indicator
...
Turn it off with the kartcheck console var
2017-11-02 00:35:10 -04:00
cc01d2c3f0
Balloon revamp
...
Supports arbitrary balloon counts now
2017-11-01 18:46:35 -04:00
97445f941a
Add command to restart the audio system
2017-10-29 01:09:34 -04:00
31a13e245c
BATLLE MODE
...
AAAAAA
2017-10-22 03:06:35 -04:00
a3b976b9b2
Whoops, forgot to save two files ^^;
2017-10-20 22:02:25 -04:00
94aedc1f78
Change color in menu, replay support for specific staff ghosts
...
Todo: replace the vague number with the demo's recorded player name
2017-10-20 22:01:07 -04:00
3994008d31
More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts!
...
Would be nice to have an option to directly replay a specific staff
ghost, but this should be fine for now
2017-10-17 23:14:51 -04:00
e770f82ad7
Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back
2017-10-17 16:36:29 -04:00
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
cce7b4374a
Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back
2017-10-17 00:45:30 -04:00
727d55b64e
Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
...
# Conflicts:
# src/doomdef.h
2017-10-17 00:40:38 -04:00
540bea911a
First, minor steps to Record Attack support
...
To-Do:
- fix demo desync (desync is only super noticeable on slopes, but a
message pops up when the player starts moving regardless)
- fix ghosts not appearing
- replace that dumb level tally
- remove a bunch of things that made the assumption that race & record
attack would never mix (ex: "next map x doesn't support race mode, using
map y anyway" message)
2017-10-15 02:33:28 -04:00
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
11d57fba1b
Merge branch 'master' into next
2017-05-26 23:02:06 +01:00
58236af6f7
Tweak to D_MapChange: if you failed to start a server, DON'T send a map change command
2017-05-25 16:55:59 +01:00
47e171250f
* Prevent joining a server if you have too many files loaded to add the remainder.
...
* Made the check in Got_RequestAddfilecmd more comprehensive, since I might as well. Just something to tweak a little later in internal.
2017-05-25 16:06:39 +01:00
5c302d7ffc
Partial implementation of fix for Got_RequestAddfilecmd (the other half - the limitation on the size of the filesneeded section of the serverinfo packet - will be applied in internal.)
2017-05-25 15:34:21 +01:00
2aa1215716
Fix a thing where the host adds a WAD and you have too many WADs loaded to add it.
2017-05-25 15:22:32 +01:00
TehRealSalt