Commit Graph

87 Commits

Author SHA1 Message Date
TehRealSalt 9b3751b30c Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
TehRealSalt adc1fa38f5 This print doesn't work for some reason?!
It keeps replacing actnum with zonttl, but ONLY if zonttl is set. Weird as heck, can't figure out why, commenting out for now.
2018-06-06 20:25:28 -04:00
TehRealSalt babc8be5da Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -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 dd05edfcc0 Merge remote-tracking branch 'srb2public/next' 2018-06-04 16:58:35 -04:00
Monster Iestyn ef174f7b43 Merge branch 'opengl-mappalette-fix' into 'master'
OpenGL: Map Specific Palette Fix

See merge request STJr/SRB2!247
2018-06-03 15:09:23 -04:00
TehRealSalt efc64e70ab Record Attack sets all of kart's gameplay variables now 2018-05-30 17:22:31 -04:00
TehRealSalt 762a8f6087 Merge remote-tracking branch 'srb2public/next' 2018-05-30 17:11:02 -04:00
Sryder 092e709235 OpenGL Map Specific palettes working
This makes OpenGL stop using a specific function that doesn't really do anything for it anymore. It looks like it was used for a hack that would change the colour of polygons for the flashpal equivalent in DOOM.
I made it so ST_DoPaletteStuff doesn't set the flashpal in OpenGL as it already does its own hacky overlay and doing that would cause all the textures to be flushed more mid-level, it could be enabled for more correct flashpals, but they still wouldn't effect fog or lighting.
This means the palette will be set when going to the title screen, and twice when starting a map, (causing the OpenGL cached textures to also be flushed at those times)
2018-05-17 22:17:20 +01:00
Steel Titanium 0bef99f566 Fix console typo 2018-05-17 13:57:19 -04:00
TehRealSalt e16bf1cf75 WIP karma item stuff 2018-03-26 20:36:16 -04:00
Sryder 07c7bc05c5 Fix the item box related crashes
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
Sryder 71c1a5b7e2 Use the constant, not a magic number 2018-03-13 02:54:49 +00:00
Sryder be0e5fe627 Comment out calls to CV_SetValue for cv_analog 2018-03-12 03:18:45 +00:00
Monster Iestyn 1fe79a0d71 Fix movies not recording the "extension" to special stage intro fades 2018-03-05 19:08:53 +00: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 85a81ed087 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -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 6f1dda7b7a Instead of player->laptime, lets add curlap
Since lap time will only ever be used locally, it makes more sense to
just use one variable instead of a player struct variable
2018-01-21 21:03:44 -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 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
TehRealSalt 96fde413f4 Commiting directly to master? Oh nooooo
A forgotten include...
2018-01-01 20:17:34 -05:00
TehRealSalt 7a5bd7c597 Closer to done HUD tweaking?
Splitscreen in Battle is left
2017-12-23 19:14:06 -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
TehRealSalt 349b27e0de Change splitscreen into UINT8, fix HUD slightly more 2017-12-18 20:59:04 -05:00
Wolfy ea49a4c009 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads 2017-12-18 04:57:57 -06:00
Wolfy 2e26e79934 Fix 3P and 4P configuration screens
They don't crash anymore!
2017-12-18 04:56:38 -06:00
TehRealSalt 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
TehRealSalt 1f958091df OpenGL rendering 2017-12-17 16:33:21 -05:00
TehRealSalt 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
TehRealSalt fc9d426660 More stuuuuff 2017-12-17 01:21:24 -05:00
TehRealSalt db1f584c13 MobjScale setting for map headers
Replacement for Oldbrak mode, lets you set any scale instead of only
1/2, also modified some of Kart's scale shenanigans to be compatible.

Requested by Sev for Dimension Heist
2017-12-16 15:38:15 -05:00
TehRealSalt f5650eba09 Wipeout & minor tweaks
- SMK-style wipeout
- Using goldshroom removes some of its timer again
- Karma item boxes follow the player more closely
- "ATTACK OR PROTECT" no longer appears when you die if you've already
seen it
- Lua support for our SOC actions
- Fixed KARTSTUFF_LIST for Lua/SOC
- "Battle" is now an accepted word in level headers for setting
TOL_MATCH
- Default map numlaps is now 3 instead of 4
- Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu
flags, needs to be set manually now
2017-12-10 20:58:34 -05:00
wolfy852 732cef777f Merge in battle, unfuck the code 2017-11-21 01:23:06 -06:00
TehRealSalt ac55f0ea4d Okay, battle mode items respawn, for real now 2017-10-24 21:22:09 -04:00
TehRealSalt d3387f816b Battle Mode item respawning 2017-10-24 17:04:22 -04:00
TehRealSalt 31a13e245c BATLLE MODE
AAAAAA
2017-10-22 03:06:35 -04:00
TehRealSalt 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
TehRealSalt 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
TehRealSalt cce7b4374a Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back 2017-10-17 00:45:30 -04:00
TehRealSalt 9c0437bcd1 Thought I heard something about camera changing, it hasn't, so I decided to port work I did for internal
Basically:
1.) farther camera defaults
2.) different camera settings save
3.) cam_dist automatically increases with splitscreen (& analog mode,
but that's irrelevant for kart :p)

(IIRC someone said that this branch is fine to commit directly to,
please feel free to revert immediately if this isn't the case :V)
2017-10-16 23:52:13 -04:00
TehRealSalt 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
ZTsukei a1f2f5b675 New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all. 2017-09-01 13:01:59 -04:00
Sryder 6c4e4bc457 Fix music not updating correctly 2017-03-11 00:09:10 +00:00
Sean Ryder be3acfff0b Fix warnings
Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
ZTsukei 0a782bf79e Fixed thwomp sectors, Added Magnet Item. 2017-02-18 13:39:50 -05:00
Sryder 68d439a783 Merge branch 'upstream/next' into zarrotsu_vanillamerge
# Conflicts:
#	src/Makefile
#	src/doomdef.h
#	src/hardware/hw_main.c
#	src/p_mobj.c
#	src/p_user.c
#	src/r_segs.c
#	src/sdl/i_video.c
#	src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
ZTsukei 580f909c6c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
Monster Iestyn 22020dda03 Merge branch 'savegame-hotfixes' into 'next'
Savegame hotfixes

Yes, this another netgame related fix! Named this "savegame hotfixes" rather than "ERCZ hotfix" or the like in advance of the fact we probably need a general branch for other $$$.sav fixes?

Anyway, fixes included in by this branch:
* ERCZ's lava falls now act as expected rather than being stuck in place for the map's duration, fixing all other known desynchronisation issues known in the map for the time being (yay)
* Changing sector tags in a map no longer causes joiners to netgames to have their SRB2 application stop responding etc
* Player names should no longer turn red in the console in gametypes outside of CTF/Team Match if a resynch occurs (not $$$.sav related, but it's related to netplay so I lumped it in anyway)

See merge request !150
2017-01-07 18:32:07 -05:00