Commit graph

556 commits

Author SHA1 Message Date
TehRealSalt
4e5fdc1fa2 Merge branch 'rings' into new-items 2019-05-14 23:12:49 -04:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
TehRealSalt
933ca5c3a4 Add an array for unsynced, HUD animation variables
Reduces the size of kartstuff_t, and makes it easy to add even more HUD animations. Fixes viewpoints being wonky for rings.
2019-05-12 14:33:18 -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
TehRealSalt
c2a07b486b Add Flame Shield 2019-05-11 15:20:06 -04:00
TehRealSalt
ecaf14a76b Grow no longer has a speed boost, but no longer holds the item box hostage
It can now be moved over to "mid-tier" instead of the end. Flame Shield will be taking its place as the "situational but powerful speed-up/offense combo item"
2019-05-10 17:04:30 -04:00
Sryder
7635743486 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-05-10 20:32:14 +01:00
TehRealSalt
41a66ac50a Use IsDisplayPlayer for more things
Makes viewpoints in spectating/demos do client-side effects a little better
2019-05-10 15:28:39 -04:00
Sryder
00ec2b5f16 Re-enable the speed cap
Only in midair to prevent pogo jump acceleration to infinity.
2019-05-10 20:21:21 +01:00
Sryder
682a8f6829 Disable the speedcap on players.
Don't calculate acceleration as ever being above top speed.
2019-05-08 20:49:47 +01: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
Sryder
7792b48ea3 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
# Conflicts:
#	src/p_user.c
2019-05-06 20:20:57 +01:00
TehRealSalt
e087d18402 Cooler afterimages
Players afterimages have been colorized & flicker, ala Sonic Advance 2. The number of afterimages you get extends with how many boosts you have stacked.

Item afterimages have also been given a basic colorization.
2019-05-04 21:04:06 -04:00
TehRealSalt
20e5d59ae4 New air speed cap behavior
- Lowered from 75 units to 50 units
- Added easing to make the shift in speed feel natural
- (Also I'm now pretty sure it didn't actually work before...?!)
2019-05-02 17:36:48 -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
ab7e747648 Fix warnings
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -04:00
TehRealSalt
e59a7175be Fix skin shit 2019-05-02 00:39:49 -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
fickleheart
273db8f5c1 Fix thrown items desyncing during frame advance 2019-04-09 23:55:25 -05:00
fickleheart
0ae4c905ad Don't pause while the menu's up during replays 2019-03-31 16:28:29 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05:00
TehRealSalt
e3434cf724 Merge branch 'doubled-boost' into draft 2019-03-14 19:45:33 -04:00
mazmazz
937a423664 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -04:00
fickleheart
5c4c0a5ff6 Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
wolfs
f4947820e4 Merge branch 'maxskins-bump' into 'next'
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
James R
b91701c948 Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
TehRealSalt
0f4fd73533 Try out boost stacking 2019-03-11 12:00:39 -04:00
wolfy852
19e515d439 Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
fickleheart
26b7efddb4 Make P_NukeEnemies (including K_DoThunderShield) scale by mapscale 2019-03-09 17:24:20 -06:00
TehRealSalt
8c79e57f89 Don't lose rings with a shield on hit 2019-03-09 16:39:43 -05:00
TehRealSalt
74a757ad69 Merge remote-tracking branch 'kartpublic/next' into rings 2019-03-07 21:31:45 -05:00
TehRealSalt
129268121d Added rings. 2019-03-07 17:11:31 -05:00
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
fickleheart
843bc6bc1b Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
Monster Iestyn
e7952e4de7 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
fickleheart
39603af6a1 Add field-of-view support in software mode 2019-02-23 10:31:37 -06:00
fickleheart
bca918cdbf Let titledemos play while game is unfocused 2019-02-18 20:51:28 -06:00
fickleheart
d2b34a0e20 Add cvar for netreplay saving options 2019-02-16 18:29:51 -06:00
fickleheart
0bbff7f6d4 [WIP, CRASHES] Save ghost data in netreplays 2019-02-16 12:42:24 -06:00
fickleheart
1c6046ac43 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
2019-02-06 20:47:35 -06:00
fickleheart
e5cdf6d84d Format for better consistency with the codebase 2019-02-06 20:25:45 -06:00
Sally Cochenour
3d84c7c6c5 Merge branch 'next' 2019-02-05 22:02:08 -05:00
Sally Cochenour
fc7ad66497 Merge branch 'next' 2019-02-05 21:10:55 -05:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00
James R
8a1c6114a7 Add support for changing viewpoint via console
This isn't just a shameless console-empowerement. More precise "spying" can
benefit everybody. But especially in net-replays, this is almost necessary.
2019-02-04 03:09:40 -08:00