Commit graph

2326 commits

Author SHA1 Message Date
Monster Iestyn
aba4adfabc shrunk buffer from 32 to 28 so that all of "Downloading "extremely...longname.wad"" can fit on screen at once. 2018-03-06 20:52:55 +00:00
Monster Iestyn
a66824d63f replace the 3 strncpys with a snprintf 2018-03-06 20:20:27 +00:00
Sryder
538d0de949 Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into openglquickfixes 2018-03-06 16:11:05 +00:00
TehRealSalt
7e007c2832 Restored bounce pad strafe 2018-03-06 01:31:49 -05:00
TehRealSalt
53ef60584b Adjusted Sonic's stats
(also made new characters default to 5-5 instead of using Sonic's stats)
2018-03-05 20:14:50 -05:00
TehRealSalt
6650e6c49c Maybe fixed dedicated? 2018-03-05 19:55:39 -05:00
Monster Iestyn
e3151f26dc rewrite download file screen code:
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name

note: I haven't actually tested if this works or compiles yet, I haven't the time right now
2018-03-05 22:24:03 +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
23d19e39da whoop, minor thing 2018-03-04 18:57:34 -05:00
TehRealSalt
4d62fbf509 Unlock all cheat no longer sets game modified if it can't find anything to unlock
Sound test is also in the Options menu now.
2018-03-04 18:42:06 -05:00
TehRealSalt
b29ad1e804 mobjscale: MT_FIREDITEM fix 2018-03-04 15:59:51 -05: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
1e1867fe42 General fixes
- Flame trails don't spawn if you're not on the ground
- Mobjscale: Shells are now the correct speed
- Mobjscale: Explosion's wipeout hit height scales
2018-03-04 14:28:29 -05:00
Monster Iestyn
ad1801e7f1 Merge branch 'master' into next 2018-03-04 19:10:01 +00:00
Monster Iestyn
16e60aada9 Merge branch 'linux-limbo' into 'master'
Linux limbo

See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
4fdb82c942 Merge branch 'soc-sanitizing' into 'next'
SOC sanitizing

See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
TehRealSalt
f985401ca4 Revamped race position
Should support ties for real now :V
2018-03-02 00:02:26 -05:00
TehRealSalt
94b1ce7ce3 And a few more fixes that went under my nose
For later: fix sound test in the options menu, make the cheat notif
sound only play if it can unlock something
2018-03-01 19:07:07 -05:00
TehRealSalt
1a6730fb72 Some unlockable stuff
- Secrets renamed to Extras
- Extras leads to the checklist instead of another menu
- Credits & Sound Test are on the Options menu now
- New title screen cheat for unlocking everything ("banana", or "← ↑ → →
↑ ← ↓ → Enter")
2018-03-01 19:00:16 -05:00
TehRealSalt
b0be1c7bbf Hopefully this fixes item throwing & distribution in mobjscale maps 2018-03-01 17:20:13 -05:00
TehRealSalt
d44ba3715d Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-01 17:13:57 -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
f0067d4719 Restore battle wait fade 2018-02-27 22:07:20 -05:00
TehRealSalt
a144a04abb Taunt sound simplification 2018-02-27 21:18:42 -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
TehRealSalt
adfe3337cb Race position starts 2018-02-27 20:40:06 -05:00
TehRealSalt
aa15b34a08 Actual Race starts 2018-02-27 19:53:12 -05:00
Sryder
631b96883a Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
Monster Iestyn
4a0305eec8 more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL 2018-02-23 20:40:19 +00:00
Monster Iestyn
1216c9da18 Use __linux__ instead of LINUX/LINUX64
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
2018-02-23 20:21:16 +00:00
Monster Iestyn
6e21059713 Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open 2018-02-23 20:08:02 +00:00
Sryder
0454293bae Hopefully a few more fixes and sanity changes for map voting 2018-02-23 01:53:30 +00:00
Sryder
387f6b904c I don't see a reason for this to be in caps, but it stops me compiling DEVELOP on linux so fix 2018-02-23 01:11:31 +00:00
Sryder
dbc27e9c9e It's SINT8 not INT8 2018-02-23 01:04:52 +00:00
Monster Iestyn
ad8c51ab8f removing stupid dumb useless code fish 2018-02-21 22:45:51 +00:00
TehRealSalt
cb593aa2b1 Battle Mode wins award (player count * 2) points now 2018-02-20 20:08:53 -05:00
TehRealSalt
6d3d098c3f Fixed stereoreverse, and its effects are applied to mirror mode
How long has this cvar been broken?!
2018-02-20 20:04:33 -05:00
TehRealSalt
da32f9a4ed Fixed fourth taunt sound not playing
% 4 would output 0 to 3, not 1 to 4 guys :V
2018-02-20 19:33:50 -05:00
TehRealSalt
2a23549d63 Winning positions scale with number of players
Anyone in the top 50% gets winning music & blue position, everyone below
gets the losing music & red position. For odd numbers, it rounds up.
2p: 1st wins, 2nd loses
3p: 1-2 win, 3rd loses
4p:  1-2 win, 3-4 lose
5p: 1-3 win, 4-5 lose
6p: 1-3 win, 4-6 lose
7p: 1-4 win, 5-7 lose
8p: 1-4 win, 5-8 lose (SMK)
12p: 1-6 win, 7-12 lose (modern MK)
16p: 1-8 win, 9-16 lose (max player count)
In big netgames you won't just hear the losing music all of the time now
:V
2018-02-20 19:11:09 -05:00
TehRealSalt
ccae121c26 Quick fix 2018-02-20 18:18:10 -05:00
Monster Iestyn
fb3e78c020 Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder 2018-02-20 17:06:03 +00:00
TehRealSalt
275132da5f Minor but important fixes 2018-02-17 01:53:44 -05:00
Steel Titanium
36d1259ceb Removed some redundant checks 2018-02-17 00:37:17 -05:00
Steel Titanium
d921f26e54 Don't init the sound system on dedicated servers 2018-02-17 00:01:42 -05:00
Alam Ed Arias
99552c2ba2 Merge branch 'master' into next 2018-02-14 10:29:24 -05:00
Louis-Antoine
c7320f9f82 Don't allocate memory for net commands already executed, as it would cause them to be never freed 2018-02-14 15:09:52 +01: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
3e7fbad490 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
TehRealSalt
889e547550 Updated player arrows 2018-02-11 21:47:19 -05:00
TehRealSalt
b93ec25c83 Fuck this weird tabbing 2018-02-11 12:50:42 -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
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
bc99e0963e Maybe fixed 2018-02-10 16:28:45 -05:00
TehRealSalt
dbc664d4e7 Minor fixes, mostly mobjscale and spectators 2018-02-10 16:19:22 -05:00
TehRealSalt
4348be7d80 Chaotix sound effects, new music names 2018-02-10 16:01:09 -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
819d370fb3 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-09 21:16:10 -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
70f959815a Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-08 21:24:56 -05:00
TehRealSalt
98fa8c1409 Added axis support 2018-02-08 21:24:44 -05:00
Sryder13
844b1dc2c0 Some warning fixes 2018-02-09 00:58:10 +00: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
Monster Iestyn
c42c70cb34 Merge branch 'playdemo-custom-home-fix' into 'next'
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
2018-02-08 15:29:39 -05:00
Sryder13
858a7adcb3 The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
56f1263f34 Guess what.
A typo. :V
2018-02-08 00:53:25 -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
e6c040b844 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -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
00af56aa2a Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt
6b63e44ff9 Forgotten 2018-02-05 20:23:09 -05:00
TehRealSalt
e516d09ae4 Colored boom
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt
f7813d6fef Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-05 19:43:32 -05:00
TehRealSalt
3749914588 Fix more conflicts that I forgot 2018-02-05 19:40:26 -05:00
Sryder13
29acd26846 Fix the explosion smoke ring (and warning) 2018-02-06 00:23:10 +00:00
TehRealSalt
d9c49d9527 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/info.c
#	src/info.h
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_user.c
#	src/r_things.c
2018-02-05 19:08:49 -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
Sryder13
c52475a630 New bomb explosion effect 2018-02-05 22:53:31 +00:00
Sryder13
d41d5800eb Some explosion stuff
Sphere spawns at centre and quickly grows before stopping
While sphere grows players get flung up
Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
Sryder13
68338f560b Draw Minimap at regular size
Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
Sryder13
ae55938646 Merge branch 'minimapfix' into flair 2018-02-05 03:28:09 +00:00
Sryder13
ac481ed185 Pure white and pure black shouldn't change on star colormap 2018-02-05 02:53:55 +00:00
Sryder13
b4db82336b Star colour support for MD2s 2018-02-05 02:11:17 +00:00
Sryder13
4b06594dd0 Star colormap is decided to be used per mobj with mobj->colorize
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
Sryder13
483921f1fa Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
# Conflicts:
#	src/g_game.c
2018-02-04 20:39:53 +00: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
toasterbabe
8090ea4ed0 Stop leaking names. 2018-01-30 21:25:28 +00:00
TehRealSalt
116ef8065f welp 2018-01-29 21:39:13 -05:00
TehRealSalt
aa7fab06fc Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:44:41 -05:00
TehRealSalt
32b2818ab6 Quick fix :V 2018-01-29 19:43:22 -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
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
5b9a9faae7 Minor adjustments for a taller thin font 2018-01-28 20:37:53 -05:00
TehRealSalt
0958c9c691 Minor adjustin's to the unlock list 2018-01-28 20:05:18 -05:00
TehRealSalt
37a74cbd94 Double-check legitimacy on match completion 2018-01-28 19:57:38 -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
e27a60847e Oops
Changed my mind about my prior decision to comment out crosshair
drawing, forgot to readd it when I fixed it :V
2018-01-24 17:00:22 -05:00
TehRealSalt
33350eb2a8 Spectator-only looking, fixed crosshairs 2018-01-24 16:53:20 -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
41250d1751 Commiting what I have currently, but disabled 2018-01-22 19:19:17 -05:00
TehRealSalt
8bb4259de8 Fixed brakes 2018-01-22 18:39:53 -05:00
TehRealSalt
bb6694a72b Camera adjustin's
- Look backward button works
- Increased default cam_speed, from 0.3 to 0.45. This is the highest
value that I think doesn't look overly stiff.
- Removed bobbing in first person
I was trying to do the camera angle thing that we've been talking about
for a while, but I can't get it to work well.
2018-01-22 17:08:31 -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
Monster Iestyn
0f99fdadd1 Merge branch 'next' into lua-archive-crash-hotfixes 2018-01-20 21:33:03 +00:00
Monster Iestyn
fa3998e942 Some fixes to prevent bad table key types causing Lua panic errors for joining players in netgames:
* ArchiveTables: print an error if invalid key, to alert script author potentially
* UnArchiveTables: if the key is found to be nil after reading key and value, print an error and don't set them in the table
2018-01-20 21:18:16 +00:00
Sryder13
03b194c7ea Stop players from being able to turn during any resynch, player join, or disconeccting/lag spikes. Stops us from endless drift turning or our turns being broken by lag.
Also disable the lagless camera of SRB2 as lag spikes make it look a bit wonky and jerky.
2018-01-19 02:47:10 +00:00
TehRealSalt
9339b96449 Use KARTKREW instead of CONSBACK
Less lump redundancy, no longer need the poor downscaled version :V
2018-01-16 22:32:39 -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
b600fae9ba fut 2018-01-16 18:02:16 -05:00
Monster Iestyn
0ef7aff5c0 Prevent SV_SpawnPlayer from being able to freeze the game if gametic is 0. Additionally add a sanity check to prevent the loop going on more than necessary anyway
This commit fixes -playdemo and -timedemo params for command line, allowing them to actually work again
2018-01-16 15:21:49 +00:00
TehRealSalt
86b5b21c62 Preliminary unlockables
Most of the time emblems are just set to 5 minutes so that its possible
to actually unlock everything :V
2018-01-16 00:36:44 -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
0401a8654a Merge remote-tracking branch 'refs/remotes/origin/master' into buuump
# Conflicts:
#	src/f_finale.c
2018-01-15 16:20:10 -05:00
TehRealSalt
61a4ea6962 Mobj scale fixes
- MAXSTEPMOVE is affected by mobjscale
- Minimum bump speeds (both wall & object) are affected by mobjscale
- Minimum speed required for drifting is affected by player scale
- Speedometer speeds are proportional to mobjscale
- Camera no longer scales with player scale, to make the fact that
you're either Lightning'd or Mega'd more obvious :V
- Sevvvvvv go work on Dimension Heist
2018-01-15 16:14:45 -05:00
Sryder13
d317164a22 Our quit screen is 640x400
There's a small fix for V_DrawFixedPatch that makes it account for scale when blacking out the rest of the screen, for when scale is 50% or 25%, but can theoretically work with any scale
2018-01-15 21:02:33 +00:00
Sryder13
d20b1592e9 Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into titlescreen 2018-01-15 20:41:47 +00:00
Sryder13
7746b61310 Fix pause graphic position 2018-01-15 20:40:32 +00:00
Sryder13
b53bf115e3 Loop the title screen music 2018-01-15 16:39:59 +00:00
Sryder13
1448956f26 Fix checkers position in non-green resolutions 2018-01-15 04:03:27 +00:00
Sryder13
96612ab934 Base title screen, gets screen fade working from intro->title for the fade to work 2018-01-15 03:40:25 +00:00
Sryder13
a7ba7cf276 Fix minimaps for any maps that are larger than half of the mappable area, in either direction. 2018-01-13 21:07:44 +00:00
TehRealSalt
3f1b312c77 Title screen 2018-01-13 14:24:02 -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
6b1b715502 Switched Gold 'shroom and Star's chances
Doesn't really belong in this branch, but it's also an experimental
change that needs a decent-sized netgame to test to make sure it doesn't
hurt anything. Done because Gold 'shroom is a lot harder to use as a
catch-up item now that it reduces timer whenever you use it
2018-01-08 16:51:38 -05:00
TehRealSalt
9908339989 A bunch of little things
- Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT
- Solid objects now bump players instead of stop them
- Bounce pad strength scales with object scale
- Fixed Boo stealing being inconsistent and sometimes not stealing
anything
2018-01-08 15:48:19 -05:00
Monster Iestyn
40cb22a130 probably best if we did this instead actually 2018-01-08 14:29:47 +00:00
Monster Iestyn
3bc7073918 If NOT skewing FOF walls, make sure dc_texturemid reverts to using unsloped FOF topheight/bottomheight rather than actual left side top/bottom heights 2018-01-08 14:29:39 +00:00
Monster Iestyn
a7dc20e7d2 Upper Unpegged on an FOF's control linedef now enables skewing of walls with respect to slopes
Skewing direction is decided per in-level wall by the Lower Unpegged flag on in-level linedefs themselves, since they already decide the stuff for FOF wall pegging as it is. That is unless Transfer Line is involved which moves everything to the control sector linedefs instead...
2018-01-08 14:29:30 +00:00
TehRealSalt
a1b84e8641 Rearranging some things
Player minimum bounce is set in P_HitBounceLine instead of P_BounceMove,
which is simpler and appears to give even more consistent results
2018-01-04 16:39:29 -05:00
Alam Ed Arias
82f2f2f2f9 SDL: disable check for noreturn 2018-01-04 14:29:29 -05:00
TehRealSalt
28384f465d Rewrote P_HitBounceLine
Instead of reflecting momentum (iirc), it thrusts you away prependicular
from the wall.
2018-01-04 01:49:34 -05:00
TehRealSalt
f303dec437 You know what? Let's just, try removing the weird hacky bounceback stuff :V
Might be better? (I had trouble reproducing the weird bounces before, so
I can't tell if it's completely fixed)
2018-01-03 20:20:27 -05:00
TehRealSalt
0e48e6f0b6 Merge remote-tracking branch 'refs/remotes/origin/master' into buuump 2018-01-03 20:02:53 -05:00
TehRealSalt
76013dad19 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/doomdef.h
2018-01-03 16:27:36 -05: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
e57b9f3f77 Minimum wall bump speed copied from K_KartBouncing 2018-01-02 13:06:49 -05:00
TehRealSalt
96fde413f4 Commiting directly to master? Oh nooooo
A forgotten include...
2018-01-01 20:17:34 -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
TehRealSalt
4d207e9037 NOFOURPLAYER as a compile option 2018-01-01 13:18:38 -05:00
TehRealSalt
4a23c4704d Rendering fixes ahoy!
- Fix squished sky in Software 3P/4P
- Fix reversed sky in OpenGL Mirror Mode
- Fix MD2 culling in Mirror Mode
2017-12-29 14:50:16 -05:00
TehRealSalt
c70a2f51aa Tweeeeeaks
- MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples
- Made some Battle-related messages only happen in netgames
- Messed with the timing on the intro
2017-12-28 18:37:25 -05:00
Alam Ed Arias
1ab5273400 Merge branch 'master' into next 2017-12-27 19:34:28 -05:00
Alam Ed Arias
f647989433 MSVC: set SubSystem on DLLs to Windows 2017-12-27 19:32:38 -05:00
Monster Iestyn
d937f6fc8b Merge branch '2.1.20-preparation' into 'next'
2.1.20 preparation

See merge request STJr/SRB2!215
2017-12-27 16:53:43 -05:00
Monster Iestyn
5400beb2e3 Merge branch 'master' into next 2017-12-27 21:51:11 +00: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
Alam Ed Arias
f9388eab1b Merge branch 'master' into next 2017-12-27 15:50:31 -05:00
Monster Iestyn
fa507ee939 Merge branch 'respawnspecials-mobjtype-hotfix' into 'next'
P_RespawnSpecials mobj type hotfix

See merge request STJr/SRB2!217
2017-12-27 15:47:44 -05:00
Monster Iestyn
a87eec89ff Merge branch 'airbob-fix-backport' into 'next'
Airbob fix backport

See merge request STJr/SRB2!219
2017-12-27 15:46:39 -05:00
Steel Titanium
3856165623 Indentation cleanup 2017-12-27 13:18:20 -05:00
TehRealSalt
6d263a0dff Lots more little adjustin's 2017-12-26 21:36:03 -05:00
Alam Ed Arias
f397b5fc3f Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00
Alam Ed Arias
a29203acd8 Disable win_dbg 2017-12-26 20:24:08 -05:00
Alam Ed Arias
e2b604fdfd TCP: remove BADSOCKET 2017-12-26 19:56:50 -05:00
TehRealSalt
ab010f91b0 Last few finishing touches for the HUD
Battle Mode cards & Race countdown timers display properly
2017-12-25 10:05:36 -05:00
Monster Iestyn
6886a29e99 Merge branch 'master' into next 2017-12-24 20:06:33 +00:00
TehRealSalt
189d2f7a34 Fixed joysticks 3 & 4
fun typos
2017-12-24 15:02:41 -05:00
TehRealSalt
9c7aad2929 Okay lets ACTUALLY fix it now :V 2017-12-24 09:19:59 -05:00
TehRealSalt
ae1fc244c5 agggh more minor 2017-12-24 09:02:40 -05:00
TehRealSalt
df03c27ba4 minor 2p/4p fix 2017-12-24 08:58:04 -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
c2db0ddca2 Battle hud stuff?! 2017-12-23 20:55:23 -05:00
TehRealSalt
7a5bd7c597 Closer to done HUD tweaking?
Splitscreen in Battle is left
2017-12-23 19:14:06 -05:00
TehRealSalt
d7227a3dcc Merge remote-tracking branch 'srb2public/master' into quads 2017-12-22 21:04:56 -05:00
TehRealSalt
c38423eeb0 Merge remote-tracking branch 'srb2public/next' into quads
Update
2017-12-22 20:55:59 -05:00
TehRealSalt
508df2e269 thing 2017-12-22 16:24:20 -05:00
TehRealSalt
94a42d1bf6 Unfinished V_HORZSCREEN revamp 2017-12-22 10:16:41 -05:00
toasterbabe
a1620b709e Fix airbob sectors fucking up when below 0 z-height. 2017-12-20 21:13:24 +00:00
toasterone
ff745531b0
Merge branch 'master' into addfile-netgame-fixes 2017-12-20 20:58:45 +00:00
TehRealSalt
59976d3ce8 More post processor support, HUD tweaks, SP new game fix
Mirror Mode minimap, growing position nums, and general reorganization.
Some stuff needs more work but I'm exhausted rn
2017-12-19 01:55:33 -05:00
TehRealSalt
5ad82554db Draw over the fourth screen *properly*
Thanks Sryder, for suggesting V_NOSCALESTART
2017-12-18 22:17:16 -05:00
Sryder13
47ee5f3976 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart.git into quads 2017-12-19 03:12:30 +00:00
Sryder13
d0b4ad0ce7 Fix Minimap Icon positions for new Minimap scale 2017-12-19 03:11:51 +00: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
36439da320 Resurrect the minimap
Still kinda broken.
2017-12-18 18:07:38 -06:00
Monster Iestyn
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
LJSonik
36ce6579b7
Merge branch 'master' into download-freeze-fix 2017-12-18 21:39:16 +01:00
Louis-Antoine
47481804da Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix 2017-12-18 21:38:10 +01:00
Louis-Antoine
c8e9e779e7 Add a short comment to explain the newplayernum hack 2017-12-18 21:35:02 +01: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
6346058f35 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads 2017-12-18 01:03:14 -05: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
Wolfy
c5a4822df6 Reorganize minimap code 2017-12-17 23:12:51 -06:00
TehRealSalt
e7abd77299 Merge remote-tracking branch 'origin/quads' into quads
# Conflicts:
#	src/d_main.c
#	src/r_draw.c
2017-12-17 22:32:12 -05:00
TehRealSalt
80f62a057d SUCCESS 2017-12-17 22:27:26 -05:00
Alam Ed Arias
57a7a3bed8 Merge branch 'master' into next 2017-12-17 22:22:57 -05:00
Wolfy
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
Wolfy
32b9663202 more stuff
nothing too special here
2017-12-17 20:23:11 -06:00
TehRealSalt
d2425329ca HUD 2017-12-17 20:42:17 -05:00
TehRealSalt
654e5e482b Mess with camera distance stuff
Also fixed a bug where I made all of the screens in 3p/4p mode in OpenGL
too zoomed in
2017-12-17 17:01:19 -05:00
LJSonik
084a534f6a
Merge branch 'master' into download-freeze-fix 2017-12-17 22:48:13 +01:00
LJSonik
9c7ff6e0c3
Merge branch 'master' into resynch-fixes 2017-12-17 22:47:23 +01:00
TehRealSalt
1f958091df OpenGL rendering 2017-12-17 16:33:21 -05:00
Monster Iestyn
c7cd64583d Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case 2017-12-17 20:59:24 +00:00
Monster Iestyn
ec10367856 Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console.
This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
2017-12-17 20:57:45 +00: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
Wolfy
893dac11e1 Merge branch 'quads' of http://git.magicalgirl.moe/wolfs/Kart into quads 2017-12-17 01:05:57 -06:00
TehRealSalt
b820d47b63 Heyyyy, this fixes controls not registering :D 2017-12-17 01:48:47 -05:00
TehRealSalt
fc9d426660 More stuuuuff 2017-12-17 01:21:24 -05:00
Wolfy
50a2dc7b4d player views
4p still crashes for some reason
2017-12-17 00:09:32 -06:00
TehRealSalt
0393e24fa6 A lot lol
The importants:
- Fixed compiling
- Combined G_BuildTiccmd for all players, no more need for a function
for each
- You can actually start 3p/4p mode
2017-12-16 22:32:43 -05:00
Alam Ed Arias
baf227175b Merge branch 'master' into next 2017-12-16 18:16:15 -05:00
Alam Arias
703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix
Fix for window being offcenter
2017-12-16 18:15:00 -05:00
Alam Ed Arias
bd86f98822 Merge branch 'master' into next 2017-12-16 16:07:31 -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
Louis-Antoine
4ea5d2df01 Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix 2017-12-15 22:06:03 +01:00
Louis-Antoine
beb9b0f103 Return for both players and mobjs if they've got an empty table, instead of just mobjs 2017-12-15 22:02:34 +01:00
LJSonik
b994180927
Merge branch 'master' into net-archive-fix 2017-12-15 20:07:44 +01:00
Louis-Antoine
0b836a9841 Fix missing lua_pop in ArchiveExtVars 2017-12-15 16:31:27 +01:00
TehRealSalt
6e47a14815 Some HUD tweaks
- CHECK now works in Mirror Mode
- Lakitu flips in Mirror Mode
- CHECK now shows up in splitscreen, because why not
- Fixed a compiling error as a result of me attempting to revert wipeout
2017-12-13 18:01:26 -05:00
Monster Iestyn
ac3fef15eb Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this 2017-12-13 19:07:02 +00:00
TehRealSalt
f69270027c Reverted wipeout 2017-12-12 19:58:44 -05:00
TehRealSalt
b6d86145a9 OGL Mirror Mode
Haven't tested a whole lot but it seems okay?
2017-12-12 17:31:25 -05:00
Louis-Antoine
4e89c03b0f Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à$%@ 2017-12-12 23:08:18 +01:00
Louis-Antoine
16b8265c6e F stands for Fun. You want more Fun, don't you? 2017-12-12 22:48:08 +01:00
TehRealSalt
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
Wolfy
fb976ab26c more quad stuff 2017-12-11 00:12:38 -06: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
Wolfy
15751dfd47 initial quad stuff (does not work) 2017-12-08 01:30:39 -06:00
Wolfy
d6af8e52c1 double oops 2017-12-08 00:59:12 -05:00
Wolfy
4714e8d179 Remove hardcoded limit on admins 2017-12-07 22:45:39 -06:00
wolfy852
854e93cdc7 Unified menu items, fix some compile warnings 2017-12-03 19:00:31 -06:00
wolfy852
8de9c46b68 Merge branch 'multi-admin' into battle
# Conflicts:
#	src/k_kart.c
2017-12-03 16:32:44 -06:00
TehRealSalt
73217690ab okay THIS time i actually made sure it compiled 2017-11-30 18:25:59 -05:00
TehRealSalt
e430a3bced Mooore tweaks
- Fixed position numbers; orders by balloons first then points (before
it was doing it the other way around), and the leading players should
never display as like 3 or something if there's ties :v
- Messed with Boo & Feather frequencies to be less common in Battle
- Fixed the issue when a karma bomb steals a balloon from one of the two
last people standing, kills them, and comes back, and the game ends
anyway, giving two players the "win" bonus
- Removed karma items being able to pass their items to other karma
bombs. This never worked correctly in the first place, and I'm 95% sure
it's what's been causing people to be ghosts forever
2017-11-30 17:34:48 -05:00
TehRealSalt
1e5c016eb1 X & balloons on ranking
no i still haven't fixed the numbers yet, but the order should still be
ok :V
2017-11-29 19:35:37 -05:00
TehRealSalt
d43c731b55 3 minor tweaks
- Enemies can no longer award points
- You should no longer get karma for "bombing" someone during their
invincibility frames
- Red shells have slightly more friction in Battle
2017-11-29 18:31:17 -05:00
TehRealSalt
10e09e5719 aaaaand another little bugfix 2017-11-29 02:09:42 -05:00
TehRealSalt
2f23ff466c More tweaks to cards 2017-11-29 02:07:22 -05:00
TehRealSalt
c3ca835284 Forgot to change a line back after I finished testing something, oops 2017-11-29 01:11:30 -05:00
TehRealSalt
addfde0f09 Battle card animations
Was hoping not to waste another variable on this, but oh well
2017-11-29 01:09:46 -05:00
TehRealSalt
9b7893995f And I changed my mind again!
Even *more* extreme
2017-11-28 22:42:09 -05:00
TehRealSalt
5e2f06b4e1 Tweaking balloon-based items further
The last change was a step in the right direction and there was more
item variety going on, but the differences need to be just sliiightly
more extreme
2017-11-28 22:26:35 -05:00
TehRealSalt
bab5c60315 Further improved player setup
Now has all of the features, maybe needs spacing tweaks
2017-11-28 16:57:38 -05:00
TehRealSalt
198685582f Previous EXE: The Better Edition
- Improve balloon-based items. Much more distinguished differences
between the different ranks
- Reverted Feather strafing. You can now just... properly move in the
air, if you're using a Feather or a Bounce Pad.
- Bounce pads are now stronger while using speed items.
- Fixed the long standing bug about offroad & ziplines working when
you're on FOFs above them. This is a tricky subject, so please report
any issues you may come across related to this.
- Shells should no longer travel to Mars, nor will they  when using
bounce pads. They should now do a gentle hop.
- :WIP: new MP Player Setup screen, now shows character stats. Will
later feature the list of characters in a row of icons, and a backported
2.2 color selector with toast's permission
- Renamed "Match" to "Battle" :p
- Yet MORE minor cases where kartspeed & kartweight were being read as
fixed_t when they're freakin' UINT8's, people!
2017-11-28 01:13:23 -05:00
TehRealSalt
4288d6c668 Fix up balloon-based items 2017-11-23 22:34:36 -05:00
TehRealSalt
8638e8f4c7 Many things!
- Position faces are now drawn in Battle, categorized first by balloons,
then by points
- Balloon-based items, gives people who are worse off better items, and
people who are better off worse items.
- You can strafe while using feather or while using a bounce pad
- Reduced the strength of bounce pad thrust on items
- Increased bounce pad's minimum forward push on players
- Made Frantic Mode just a teeeeensy bit more frantic
- Fixed being able to use Feathers mid-air
- Fixed being unable to steal Feathers
- Drift sparks use frameangle instead of angle
2017-11-22 21:40:17 -05:00
wolfy852
732cef777f Merge in battle, unfuck the code 2017-11-21 01:23:06 -06:00
wolfy852
37448a3e92 Merge remote-tracking branch 'remotes/origin/battle' into multi-admin 2017-11-20 21:49:42 -06:00
TehRealSalt
888515331f More lenient checkpoints
Doesn't really belong in this branch but shut up! I'm lazy :p
2017-11-20 02:00:19 -05:00
TehRealSalt
a2767fe341 Some more minor comeback tweaks
- Comeback players are now 1 speed with -20 friction
- Bombing gives 2 karma now
- Item players should no longer be able to be hit
- Attempted to fix instances of trying to bomb someone while they can't
be touched causing you to lose all your karma and start a console
message saying you're back in the game, despite not rewarding a balloon
- Fixed a few places where kartspeed & kartweight were being read as
fixed point numbers, despite being UINT8's
- Fixed up kartstuff Lua support more, functions properly now
2017-11-19 19:39:40 -05:00
TehRealSalt
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
TehRealSalt
f601520199 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle 2017-11-17 22:01:57 -05:00
TehRealSalt
4af56c2fd6 Better Lua support(?)
Now can retrieve kartstuff, haven't tested but should be fine?
2017-11-17 22:00:10 -05:00
Sryder13
ff667b7e45 Fix the items hitting people you bump bug 2017-11-17 22:40:24 +00:00
TehRealSalt
06eca5fbb5 Minor things
- crash fix
- commented out player 2 spawning with balloons
- double checked battle exiting is 10 sec
2017-11-17 17:36:04 -05:00
TehRealSalt
cca30d1095 Lots of small tweaks & fixes, that should make Battle a LOT more bearable
- Comeback timer is now always 10 seconds instead of scaling
- Takes 10 seconds before exiting
- Flashing tics is doubled in Battle Mode
- Removed a bunch of bomb nerfs
- Bombs are back to making only 1 point per hit
- Exposed K_GetKartAccel & K_GetKartFlashing to Lua
- Item boxes should no longer drop while going up slopes
- Trading item boxes with a bomb should turn you back into a bomb
- Balloons should no longer all respawn when dying in pits in 2-player
games
- Flashing players are able to kill *thrown* shells again (shields and
trap items are still unkillable). Prevents red shells from being able to
stick to a flashing player and hurt them again as soon as they're done
flashing
- CHECK appears at a farther distance
2017-11-17 00:48:36 -05:00
TehRealSalt
3d3972fac9 Battle HUD stuff 2017-11-13 20:45:57 -05:00
TehRealSalt
b64e9a1501 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle 2017-11-13 17:02:56 -05:00
TehRealSalt
2360516e66 Yet more comeback stuff!
- You can now choose to carry an item to someone instead of bombing
- You need to bomb someone or give an item a combined total of three
times in order to come back.
- Bombing somone gives 2 points while giving items doesn't award you any
points.
- Position number still flashes after you've won, and it flashes rainbow
for people who have won and are in 1st place!
- Flashing players can no longer eat items
- Fixed kartstarsfx playing the alarm in conjunction with music
- Fixed some items no longer causing wipeout
2017-11-12 22:48:32 -05:00
TehRealSalt
005e01850d Fix magnet & star 2017-11-11 22:29:38 -05:00
Wolfy
25599ff813 Multiple admins 2017-11-10 23:34:37 -06:00
Sryder13
3eb3a74b5d Merge branch 'battle' of http://git.magicalgirl.moe/KartKrew/Kart.git into battle 2017-11-11 03:28:39 +00:00
Sryder13
1f6877e1e7 Don't allow the player to respawn on a mapthing if it will collide them with another player
Mainly effects battle where match starts are used, race will be effected at the beginning of races though
2017-11-11 03:28:20 +00:00
TehRealSalt
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
Sryder13
d480ce24a9 Stop players bumping when they're reborn 2017-11-11 01:17:42 +00:00
Sryder13
8fbdbb4c64 Fix shells spawning under FOFs
Make items dropped behind you fall on the floor properly
Fix bananas getting stuck in midair if they aren't moving
2017-11-11 00:25:57 +00:00
Steel Titanium
e61549d81f Opps, forgot to change this. 2017-11-08 14:50:27 -05:00
Steel Titanium
55c86f3e15 Successful attempt at restarting the music 2017-11-08 14:48:05 -05:00
Monster Iestyn
7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
Steel
dbbbc1cc06
Merge branch 'master' into window_center_fix 2017-11-08 00:32:23 -05:00
Steel Titanium
c1405137ec Extra tab space to make the compiler happy 2017-11-07 23:48:03 -05:00
TehRealSalt
890637c4ab Expose some functions to Lua 2017-11-07 18:35:05 -05:00
Steel Titanium
4f8b91c770 Attempt to restart music 2017-11-07 16:26:45 -05:00
TehRealSalt
cacc9ee97f Made Frantic Mode work in Battle Mode & provide more silly results
Also fixed flashing
2017-11-07 15:04:21 -05:00
TehRealSalt
01afd52ad0 Bounce pad sector type
Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 02:36:27 -05:00
TehRealSalt
7fcca8f2d1 Added feather 2017-11-07 00:57:42 -05:00
TehRealSalt
7eb9f56741 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/p_mobj.c
2017-11-06 17:44:32 -05:00
TehRealSalt
bd7e5bc313 HUD shenanigans
In battle because it messes with CHECK, and also I'm too lazy to switch
branches
2017-11-06 17:31:52 -05:00
Sryder13
8f532b48ef Various held and thrown items tweaks
"Missile" items are spawned on the ground and should follow slopes when the player is on the ground
Forwards thrown items should work in reverse gravity
Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly
Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
TehRealSalt
7eb4a958f7 More adjustments
- Comeback timer gets higher the more you get hit
- Your ghost appears over the bomb
- Speed & accel is set to worst while a bomb
- CHECK range scales with kartcc
2017-11-05 23:18:58 -05:00
TehRealSalt
8756293906 Minor fixes 2017-11-05 20:41:54 -05:00
TehRealSalt
98afcbbd5a Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle 2017-11-05 16:45:31 -05:00
TehRealSalt
9bea44e5c1 Fix this garbage 2017-11-05 16:34:12 -05:00
Sryder13
3d11e2ae28 Increase minimum bounce
Don't run xy bouncing if objects are directly ontop of each other
Don't run xy bouncing if objects are moving away from each other
Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
TehRealSalt
a0b8eff8f1 fuck OFF stepmove dick 2017-11-05 12:29:19 -05:00
Sryder13
351670513d Give explosion particle mobjs the target of who spawned it (bomb thrower, blue lightning user)
So that explosion particles can trigger voice lines (and not crash) and add points for players in battle
Also don't play voice lines when you hit yourself
2017-11-05 17:15:19 +00:00
Sryder13
10818f254b Minimum bounce speed 2017-11-05 16:46:26 +00:00
Sryder13
5054ce72e0 Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
# Conflicts:
#	src/d_player.h
#	src/k_kart.h
#	src/lua_playerlib.c
2017-11-05 14:51:52 +00:00
TehRealSalt
57b4d73ec2 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/k_kart.h
2017-11-05 02:19:05 -05:00
TehRealSalt
c0ed28e828 why didn't this merge before?? 2017-11-05 02:17:13 -05:00
TehRealSalt
d3e888cc44 Merge remote-tracking branch 'refs/remotes/origin/master' into battle
# Conflicts:
#	src/d_player.h
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_playerlib.c
2017-11-05 02:16:39 -05:00
TehRealSalt
7b01a6c46e Less strict item respawn requirement 2017-11-05 01:49:31 -05:00
TehRealSalt
a9c1b3e747 Everything.
- Player arrows now show if a player is in the item roulette
- Boo has been improved, and added back to Battle's item roulette
- The CHECK HUD item is now more accurate, and should appear more often
- Early comeback mechanic. Functional, but really unpolished
- Attempted (again) to make the first player to join in a netgame spawn
with balloons
- No longer shows respawn text on death
2017-11-05 01:43:47 -05:00
Sryder13
bb35f222c9 1 tid duration on drifting too 2017-11-04 21:58:21 +00:00
Sryder13
51af54d0ff Voices for when you hit someone else
Not totally sure on them, but it's worth a try, would make it more obvious when you hit someone with a trap item in battle anyway
2017-11-04 20:42:01 +00:00
Sryder13
33beff0d5f Slow and Fast states use 1 tic duration animation
Disable adjusting of frame speed (can be re-enabled through MAINCFG if people want it for whatever reason)
2017-11-04 17:49:14 +00:00
Sryder13
c9ddb7a4b5 Re-add lost player vibration frames
Separate sprites for fast moving frames
Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
Sryder13
81a077b9af New player frameangle used instead of mobj angle for players
Set to mobj angle except when spinning where it's set to spin
Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
Sryder13
28ec48c02c Make the bump and item throw graphics fullbright. 2017-11-04 13:33:38 +00:00
Sryder13
8315ccd475 Change player collision again, they bounce away from each other naturally
Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
Louis-Antoine
67aba2648c Fix download freezes (well, most of them) 2017-11-03 22:58:47 +01:00
TehRealSalt
1dcdaf0c44 I actually didn't do any of this right!! Whoops!!
Also made red shells dumb in battle mode
2017-11-02 21:40:06 -04:00
TehRealSalt
2cbef008c8 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/k_kart.c
2017-11-02 21:03:14 -04:00
Sryder13
e5a32eb699 New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other 2017-11-03 00:43:51 +00:00
TehRealSalt
9a822fae80 Balloon stealing! Mushroom is back! 2017-11-02 20:43:03 -04:00
TehRealSalt
d0a455c7dd More tinkering with the item list
Increased item variety (triple reds added with same chances as star &
megashroom, triple bananas are back), and the deadliest items should be
less likely due to more weight on the weak items. Doesn't add up to 20
anymore, though; will likely be fixed when balloon-based items get
implemented.
2017-11-02 01:18:16 -04:00
TehRealSalt
b7432cd154 Change draw order
Lakitu is a bottom
2017-11-02 00:41:04 -04:00
TehRealSalt
9522e1b95e CHECK indicator
Turn it off with the kartcheck console var
2017-11-02 00:35:10 -04:00
TehRealSalt
cc01d2c3f0 Balloon revamp
Supports arbitrary balloon counts now
2017-11-01 18:46:35 -04:00
TehRealSalt
4fce06d80e Dang it. 2017-11-01 16:24:40 -04:00
TehRealSalt
ec429ff425 k_poweritemtimer
Prevents you from getting stars or megashrooms too soon after one
another. Should only be set in Battle Mode only
2017-11-01 16:24:27 -04:00
Sryder13
e60b3e1b88 Move Player collision check into the regular collision checking 2017-11-01 18:40:32 +00:00
Monster Iestyn
d61105fcce Merge branch 'master' into next 2017-11-01 18:36:48 +00:00
TehRealSalt
b4a1ad4ef2 Just bumped timer 2017-10-31 16:14:17 -04:00
Monster Iestyn
2b1fb67a5f DrawMD2i: change duration and tics to INT32, fix up any related code 2017-10-30 19:12:51 +00:00
Steel Titanium
97445f941a Add command to restart the audio system 2017-10-29 01:09:34 -04:00
Steel Titanium
799a819ee9 Merge remote-tracking branch 'upstream/master' into window_center_fix 2017-10-29 00:00:11 -04:00
Alam Ed Arias
6a639dd717 Merge branch 'master' into md2-interpolation-fix 2017-10-28 18:47:20 -04:00
Alam Ed Arias
d2f922a981 Merge branch 'master' into next 2017-10-28 18:46:10 -04:00
Alam Ed Arias
cf10b55be0 Win32: pragma hell 2017-10-28 18:39:42 -04:00
Alam Ed Arias
3ecc304332 Win32: just ignore format overflows 2017-10-28 18:33:47 -04:00
Alam Ed Arias
0250040a5b Win32: all fails of DD and try more to stop format-overflow errors 2017-10-28 18:24:07 -04:00
Alam Ed Arias
a4072260db Win32: try to fix up CD printf code 2017-10-28 18:13:59 -04:00
Sryder13
48e0d64525 More changes to thrown items, higher gravity and fly faster 2017-10-28 02:44:25 +01:00
Alam Ed Arias
ce40c00b7a Build: do not error on FALLTHURs 2017-10-27 19:49:55 -04:00
TehRealSalt
4a02e166a1 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-26 19:39:02 -04:00
TehRealSalt
f271d1bd76 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-26 19:37:23 -04:00
TehRealSalt
b127c02e2c Maybe message fix 2017-10-26 19:37:13 -04:00
Sryder13
bda85bea4a Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks 2017-10-27 00:02:05 +01:00
Sryder13
a00123e663 Item Throw distance/height experimentation 2017-10-27 00:01:59 +01:00
Sryder13
bd55a295bd Skin colours for MD2s
This isn't amazing, until I implement something better (probably not until 2.2) it will have to do
2017-10-26 20:57:36 +01:00
Sryder13
8742b3b2d9 Star power translation tables
Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 20:04:05 +01:00
Sryder13
4210885ad3 Merge branch 'master' into ric-flair 2017-10-26 15:03:09 +01:00
Sryder13
be376de48f Merge branch 'master' into ric-flair 2017-10-26 15:02:24 +01:00
Wolfy
a551ecc166 Reorganize the control setup menu, update controls to reflect kart 2017-10-26 01:43:02 -05:00
TehRealSalt
69d6d43fea Everything I did today; mainly player arrows
Also some minor tweaks and bug fixes all around
2017-10-26 02:31:01 -04:00
TehRealSalt
6d18059543 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-25 20:08:25 -04:00
Sryder13
1f7caee344 Highres intro graphic 2017-10-25 23:05:19 +01:00
TehRealSalt
6c1269a6f4 Balloons message 2017-10-25 16:20:28 -04:00
Sryder13
e6ed15c066 Separate music from sound.kart so it can be added properly 2017-10-25 20:38:43 +01:00
Sryder13
f7b637663c Setup intro finally 2017-10-25 20:30:02 +01:00
Sryder13
2e2d4073b8 Bombs should check for teams in team match, not regular match 2017-10-25 15:04:08 +01:00
Sryder13
b9f6a91c37 Improve functionality of held items
Can check for falloff from ledges
place along the z properly
2017-10-25 03:37:13 +01:00
TehRealSalt
0bb3bc2b7e Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-24 22:15:20 -04:00
Sryder13
28297d9f58 Add separate boost sound for start boost
Allows us to set it to be singular, stopping really loud start boosts with many players
2017-10-25 02:47:24 +01:00
Sryder13
101a560d4e Adjust Trailing items to behave nicer
Added extra boolean for P_SlideMove forceslide, since kart's walls are almost all bouncy slidemove will almost always bounce things instead, even if we don't want it to.
2017-10-25 02:32:07 +01:00
TehRealSalt
ac55f0ea4d Okay, battle mode items respawn, for real now 2017-10-24 21:22:09 -04:00
Sryder13
e5e472edf1 Crash fix 2017-10-25 02:00:17 +01:00
TehRealSalt
0af023d8ca Merge master 2017-10-24 19:31:37 -04:00
Sryder13
65c5c94563 Maces have shadows
Maces have afterimages
2017-10-24 23:33:25 +01:00
TehRealSalt
fff4194d62 Silly little thing I just added 2017-10-24 18:01:00 -04:00
Sryder13
fe31394277 Do a quake effect when hit by non-spinout things or explosions 2017-10-24 22:58:59 +01:00
Sryder13
7f87a0275b Spawn item clash versus fake items too 2017-10-24 22:23:11 +01:00
Sryder13
f833222fe6 Shell hit sound can travel further 2017-10-24 22:21:46 +01:00
TehRealSalt
d3387f816b Battle Mode item respawning 2017-10-24 17:04:22 -04:00
Sryder13
5f60eb68a4 Edited the wrong banana object 2017-10-24 21:18:08 +01:00
Sryder13
436f7cb7c6 Tossed and shell hitting player sound
Made clash audiable from a bit further away
2017-10-24 20:59:09 +01:00
Monster Iestyn
0cc8fbdb4e Don't use interpolation code if the frame lasts instantaneously or infinitely
Also removed the + 1 from newtime, since there was never really any need for it. It just offset the interpolation so it went like (1 -> 2] instead of [1 -> 2), so you never saw the base appearance for each frame except at the end of any frames interpolating to it

Changed DrawMD2Ex's duration/tics type to INT32 so -1 comparisons work, probably want to change the signs elsewhere too but this is fine for now
2017-10-24 20:45:55 +01:00
Sryder13
59d670f902 Shadows remain even after an object dies, until the object no longer exists 2017-10-24 20:34:44 +01:00
Sryder13
fced36e601 Change sound priorities to hopefully prioritise the more important sounds more
Change singularity on a lot of the sounds so that more than one of them can be played at once
2017-10-24 18:01:43 +01:00
Sryder13
5d49a23429 Add item clash sound 2017-10-24 17:46:44 +01:00
Sryder13
0422e40649 Add graphic for throwing items
Fix missing frame of clash
2017-10-24 17:19:14 +01:00
Sryder13
c66b10dda3 Shells and Lobbed items now use afterimages for trails
Fireballs use old green shell trails for trails
Updated dehacked with new states and all the changes
2017-10-24 15:25:08 +01:00
Sryder13
07ffa8af6e Stars don't go faster when you get hit more 2017-10-24 14:04:54 +01:00
Sryder13
b87564f6eb Item clash graphics 2017-10-24 13:59:01 +01:00
Sryder13
35f9b544b1 Forgot about dud red shell 2017-10-24 13:38:42 +01:00
Sryder13
041d9c4999 Faster bump sparks 2017-10-24 13:18:41 +01:00
Sryder13
0206a42ce6 Stars in your eyes when you get hit by shells 2017-10-24 13:15:20 +01:00
TehRealSalt
4be15a9020 Bumpy 2017-10-24 00:42:06 -04:00
TehRealSalt
7b88d670d5 Respawn time is now Match-only 2017-10-24 00:06:13 -04:00
TehRealSalt
ccc2643459 Reintroduced weighted batle items
No more Boos and Mushrooms while they're broken and sucky, too
2017-10-23 22:24:10 -04:00
TehRealSalt
163eae7325 Red shells no longer target people without balloons 2017-10-23 18:59:41 -04:00
TehRealSalt
4efda9b830 Remove some redundancies from the last commit 2017-10-23 18:54:10 -04:00
TehRealSalt
4c877a6490 Move some A_ItemPop stuff into P_CanPickupItem 2017-10-23 18:38:45 -04:00
TehRealSalt
e7de9502ba Balloon error fix, and papersprite fix 2017-10-23 17:27:00 -04:00
TehRealSalt
54b8e25713 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-22 17:41:00 -04:00
TehRealSalt
a56a7cf9c0 Whoops! Wrong way! 2017-10-22 17:36:46 -04:00
Sryder13
a9c6670ee1 Green shells are faster/slower in 150cc/50cc.
Green shells now get slower as they bounce more.
2017-10-22 22:29:39 +01:00
TehRealSalt
b36fd5c5f9 Did you know: Battle Mode
- Different sizes for the balloons, depending on how many you have
- Balloons are fullbright, cast shadows, and stick closer to players
- Mega Mushrooms can now appear
- Can steal items with Boo in Battle Mode now, as intended
- Death pits make you lose only 1 balloon
- Balloons disappear properly if you use Boo
- Boo item icon should no longer appear if you're out of balloons
- You can now properly respawn in Battle Mode
- Can no longer collide with items if you are already holding one
2017-10-22 17:26:43 -04:00
Sryder13
a46093fe9d Red shell rework, they always instathrust to their top speed in their current movement direction.
When they get close their top speed starts to decrease to the player's current speed.
Movement direction ends up being adjusted in A_RedShellChase where it Thrusts towards the player at its acceleration speed.
2017-10-22 22:08:07 +01:00
TehRealSalt
f84485c680 More equal, chaotic battle item odds 2017-10-22 04:17:44 -04:00
TehRealSalt
31a13e245c BATLLE MODE
AAAAAA
2017-10-22 03:06:35 -04:00
TehRealSalt
10aa83e614 More minor adjustments
- Display the skin's realname in RA menus
- Can no longer set your skincolor to none on the RA menu
- Edited several color names to fit within 14 characters
2017-10-21 13:22:54 -04:00
TehRealSalt
a3b976b9b2 Whoops, forgot to save two files ^^; 2017-10-20 22:02:25 -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
b66fc2f5ac Ported this fix from internal 2017-10-18 18:14:49 -04:00
TehRealSalt
5a7458be98 Merge remote-tracking branch 'refs/remotes/origin/attack-is-back' into zarrotsu 2017-10-17 23:56:55 -04:00
TehRealSalt
eda571e2d3 Really minor tweaks 2017-10-17 23:55:44 -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