Commit graph

607 commits

Author SHA1 Message Date
Sryder
0f7a704444 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/p_spec.c
2019-08-10 11:41:49 +01:00
James R
374af9a322 Merge remote-tracking branch 'pub/master' into public-master 2019-07-17 12:33:20 -07:00
Sryder
20f8037351 Respawn at waypoints once first crossing the finish line. 2019-06-29 11:05:35 +01:00
James R
78bd39acd5 Someone doesn't know how pointers or WRITE macros work...
Fixes SIGSEGV when saving a replay.
2019-06-25 00:44:12 -07:00
Sryder
530214aa87 Remove now unused waypoint player variables. 2019-06-15 17:04:16 +01:00
TehRealSalt
e8edfb03fb Merge branch 'master' into rings 2019-05-29 22:15:05 -04:00
TehRealSalt
792b41c406 Merge branch 'v1' into master 2019-05-29 21:50:14 -04:00
James R
2b79547512 Fix XCode compiler errors
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
Latapostrophe
ccd0ec96a4 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
TehRealSalt
bb6fe9fc54 Merge branch 'master' into rings 2019-05-14 22:26:22 -04:00
TehRealSalt
ce39456a24 Merge branch 'v1' into new-palette 2019-05-14 21:01:32 -04:00
wolfy852
4f3fbb8da5 Fix viewpoint being reset on boost when spectating 2019-05-12 16:38:50 -05:00
TehRealSalt
dc41fe3d8d Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff 2019-05-12 17:19:49 -04:00
wolfy852
ed55a63b58 Fix rewind previews not showing for player 1 2019-05-12 14:42:39 -05:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
26adea3234 Battle, not Match 2019-05-07 01:34:49 -05:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
Sal
80226b3c39 Merge branch 'skins-fix' into 'v1'
Remove skin shit

See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
TehRealSalt
8f4d93995b Merge v1 2019-05-02 17:51:54 -04:00
TehRealSalt
b679cfe5c5 Hide this debug message 2019-05-02 12:50:05 -04:00
TehRealSalt
3fed6b6995 Disable rewind between demos, too. 2019-05-02 12:36:11 -04:00
TehRealSalt
50be0cdbee Don't keep fast-forward enabled between demos 2019-05-02 12:31:50 -04:00
TehRealSalt
00a3ea58ee Add message boxes for file add errors 2019-05-02 12:03:50 -04:00
Sal
26159aae2a Merge branch 'deadzone-bullshit' into 'v1'
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5

See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
TehRealSalt
833cf980b4 Finish this
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
2019-05-02 09:20:49 -04:00
TehRealSalt
dfe873ca1f Merge branch 'anim-fix' into skins-fix 2019-05-02 02:51:17 -04:00
TehRealSalt
ab7e747648 Fix warnings
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -04:00
TehRealSalt
2d9ae1abfd Dumbass typo 2019-05-02 02:13:44 -04:00
TehRealSalt
5a1fc6f9f4 Remove outdated comment 2019-05-02 00:49:36 -04:00
TehRealSalt
889ead7840 Fix wheel animations 2019-05-02 00:44:04 -04:00
TehRealSalt
e59a7175be Fix skin shit 2019-05-02 00:39:49 -04:00
TehRealSalt
3a707c093b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5 2019-05-01 23:30:53 -04:00
TehRealSalt
a3d2b48329 Fix up more stuff
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
toaster
e676cd89ea * Add FF_SEMIBRIGHT.
* Ranges between full brightness to half-brightness (50% of fullbright effect).
    * Has both software and GL support (I think - GL needs to be doublechecked, but I think it's just GL being murky in general).
    * Used by Rings.
* Backport FF_GLOBALANIM and FF_RANDOMANIM extensions to FF_ANIMATE from 2.2.
    * Rings use the former instead of their own hacky solution to the problem.
* Also backport FF_VERTICALFLIP, because why not.
    * Inverts sprite relative to gravity. I remember wanting this for the flipped death sprite for Jawz, but then Oni drew his own frame for that, so it doesn't matter.
* Refactor vissprite struct a tad, given I did so in internal where I pulled most of these improvements from.
    * Should be no in-game affect; let me know if you notice any regressions.
2019-04-17 18:46:35 +01:00
fickleheart
7c75397b67 Fix writing corrupt standings that break replay hut 2019-04-14 17:08:04 -05:00
fickleheart
1ba5412bfe Fix being able to carry rewind state where it shouldn't be 2019-04-13 14:22:48 -05:00
fickleheart
273db8f5c1 Fix thrown items desyncing during frame advance 2019-04-09 23:55:25 -05:00
Sryder
19bd6b225c Z_Free not free. 2019-04-09 20:15:35 +01:00
TehRealSalt
ed0267d7d8 Various more tweaks
- Ring attraction is now much more preformant. Instead of each ring checking for all players for a shield & then doing a distance check, players with an attraction shield already will do a blockmap check around them for rings.
- Draft leeway period is longer, from 10 tics to 1 second
- During the draft leeway period, your draft sparkles will still be attached to the last player you drafted, but transparent
- Scale drafting speed requirements, distances, and visuals with player scale instead of map scale. While shrunk, this will make it so you need to be closer to draft, but don't need to be moving as fast.
2019-04-08 14:30:27 -04:00
fickleheart
f573e4089d Support RA time comparisons in new format
I don't care enough about supporting old replays, and
they're old anyway. Force-overwrite them. :)
2019-04-08 00:45:19 -05:00
fickleheart
73153b7db9 Support new-format ghosts or some bullshit like that
maybe future fickle will add support for multiple ghosts
from one replay for some sick memery but idgaf right now
2019-04-08 00:30:04 -05:00
fickleheart
bea8f51253 Fix record attack not recording + staff names load for all replay types 2019-04-07 18:51:42 -05:00
fickleheart
fb3d5ec7f0 Record demos consistently and also other stuff 2019-04-07 17:59:32 -05:00
TehRealSalt
94fbb2c783 Merge master 2019-04-07 14:54:10 -04:00
fickleheart
77c71ca944 Support playback menu for record attack replays too 2019-04-06 18:59:11 -05:00
fickleheart
d9e061d999 Various fixes and tweaks to rewinds 2019-04-06 18:06:02 -05:00