Commit graph

2185 commits

Author SHA1 Message Date
MascaraSnake
720d84f87f More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
Sryder
96f92f8183 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange
# Conflicts:
#	src/k_kart.c
2019-05-31 22:29:32 +01:00
TehRealSalt
9a24f65cb8 Merge branch 'master' into model-gradients 2019-05-30 02:00:06 -04:00
TehRealSalt
189c2d06fd Merge branch 'rings' into new-items 2019-05-29 22:17:51 -04:00
TehRealSalt
e8edfb03fb Merge branch 'master' into rings 2019-05-29 22:15:05 -04:00
TehRealSalt
f0ff7e7b05 Merge branch 'master' into model-gradients 2019-05-29 22:10:45 -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
TehRealSalt
c6a0a41d1a Model tilts
- Add modeltilt variable, for more manual control of the model tilting. By default this just copies standingslope, but doesn't get cleared in the air.
- Shadows & trailing bananas now tilt to match the ground they are on.
- Rocket Sneakers & afterimages now tilt to match the player's current orientation.
2019-05-28 17:21:22 -04:00
Steel Titanium
894c06520a Merge branch 'next' into jimita-unfuck-awayview 2019-05-25 19:47:45 -04:00
Latapostrophe
ccd0ec96a4 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
Sryder
7756620028 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange
# Conflicts:
#	src/k_kart.c
2019-05-17 22:39:01 +01:00
wolfy852
519a289373 Fix the permanent instashield bug 2019-05-17 08:06:18 -05:00
TehRealSalt
4e5fdc1fa2 Merge branch 'rings' into new-items 2019-05-14 23:12:49 -04:00
Latapostrophe
c54cc42e74 Add command to disable followers clientside 2019-05-13 19:53:17 +02: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
Latapostrophe
a0e27c22e7 make followers work with replays 2019-05-12 13:41:46 +02:00
Latapostrophe
c83127293b resolve conflict in m_menu 2019-05-12 10:48:54 +02: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
wolfy852
e4af44956b Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/r_things.h
2019-05-11 02:05:58 -05: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
Nev3r
09ff071656 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
5a4eded7af Added a mobj-only list entry for mobj thinkers
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r
baeda5060c Basic multiple thinker list implementation
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02: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
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -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
mazmazz
7f0b923107 Merge branch 'public-gl-next' into public-musicplus-jingle 2019-03-15 18:42:19 -04:00
mazmazz
fbdd7b0174 Fix end-of-level fading for cv_playersforexit
(Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)
2019-03-15 03:47:30 -04:00
mazmazz
9094d29607 Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel 2019-03-15 02:07:53 -04:00
mazmazz
c427ccbec5 Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel 2019-03-15 00:39:26 -04:00
mazmazz
607d647435 Remove redundant music reset block for MIXNIGHTSCOUNTDOWN 2019-03-14 23:21:52 -04:00