TehRealSalt
732e0447a5
Merge branch 'master' into 102-gameplay
2018-11-26 10:14:41 -05:00
toaster
3c480277aa
Update HUD anim counters when dead.
...
* Split out the HUD-related counters from K_KartPlayerThink() into their own function.
* Called this function in P_DeathThink().
2018-11-25 13:48:46 +00:00
TehRealSalt
d467399480
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
TehRealSalt
3f35ffd7c6
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
TehRealSalt
39e644a7f5
Move countdown setting to P_CheckRacers
...
This fixes two bugs:
- Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before
- Means that the countdown timer can be set on disconnect
2018-11-19 22:37:24 -05:00
TehRealSalt
b58cbd2c08
Move Shrink out of P_DamageMobj
2018-11-18 17:51:49 -05:00
toaster
0720264bc2
Negate (netgame || multiplayer) condition for countdown to use defaultvalue instead of value per the specifics of the previous implementation
2018-11-18 09:10:26 -05:00
TehRealSalt
12ee59bdfa
Finish countdown only starts when all winners are declared
...
Still removing/changing crusty vanilla holdovers, one at a time. :shitsfree:
2018-11-18 06:17:42 -05:00
TehRealSalt
2d5551ca5b
Double spectator movement speed to keep up with action better, scale it with map size
2018-11-14 14:41:28 -05:00
TehRealSalt
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
93ab9850a3
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
Sryder
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn
4b8232d777
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
TehRealSalt
e63099f3de
Log this
2018-11-07 14:56:36 -05:00
MPC
1cc8619c9e
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
toaster
f2e9186c7b
You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints.
2018-11-05 14:33:39 +00:00
TehRealSalt
5c1cc6e1df
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
TehRealSalt
e758e0f8fd
Merge branch 'master' into resync
2018-11-01 20:39:50 -04:00
TehRealSalt
cc5d248c90
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
toaster
7f24836d00
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:47:34 +00:00
TehRealSalt
08144b96f1
Fix SMK RR thwomps casuing bounce-up
2018-10-29 17:45:59 -04:00
toaster
52523fc4b4
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:37:06 +00:00
Sal
292a18804a
Merge branch 'splitscreen-tuneup' into 'master'
...
Splitscreen tuneup
See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -04:00
TehRealSalt
9f18164ad4
The motherload: all of my Lua is hardcoded
...
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
TehRealSalt
9630e01616
Camera crash fixes
...
UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
2018-10-28 17:31:59 -04:00
TehRealSalt
84c9dbfcce
Even better: base it off how much timer is left
...
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
2018-10-28 01:38:01 -04:00
TehRealSalt
67a8ee178d
More smoothly decide which invincibility music to use
...
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
2018-10-28 01:22:26 -04:00
TehRealSalt
339a857cba
Reduce camspeed in splitscreen
2018-10-27 20:44:05 -04:00
toaster
e8410b2575
Fix and then subsequently disable the zoom tube angle setting stuff.
2018-10-27 22:05:15 +01:00
toaster
3d760271e3
Fix the issue with sliding I identified this morning.
...
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
2018-10-27 21:41:45 +01:00
TehRealSalt
6dd7718d6e
More consistent face-forward
...
Needs it to still land in a close ballpark, so the timer changes are still needed, but this makes it less prone to error
2018-10-26 01:07:14 -04:00
TehRealSalt
555fbbe2f5
Speed up spinout based on timer left
2018-10-26 00:51:58 -04:00
Latapostrophe
e5d4020f3e
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
2018-10-25 13:21:44 +02:00
TehRealSalt
25414edb57
Merge branch 'master' into fz-time-over
2018-10-24 21:20:51 -04:00
Sal
3e556cde44
Merge branch 'last-netgame-tweaks' into 'master'
...
Last netgame tweaks
See merge request KartKrew/Kart!57
2018-10-24 19:33:47 -04:00
TehRealSalt
39bfad150f
Fix camera movement when turning
2018-10-23 19:43:20 -04:00
TehRealSalt
0fcb45a9af
reset these too
2018-10-23 19:08:13 -04:00
TehRealSalt
78ef057f81
Reset cam pan if dead/reset/still
2018-10-23 19:06:26 -04:00
TehRealSalt
017d606828
fzboom.wad hardcode
2018-10-23 17:48:09 -04:00
TehRealSalt
7aa8b94b22
Cam follows faster in 2P
2018-10-22 17:48:21 -04:00
TehRealSalt
cdbe5fa34f
Fix Thunder Shield not killing SPBs
2018-10-22 17:08:34 -04:00
TehRealSalt
ebb0733a3c
Fix camera not noclipping FOFs
2018-10-22 16:16:57 -04:00
TehRealSalt
2021897972
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
TehRealSalt
553066b48b
Merge branch 'master' into net-screen
2018-10-19 15:59:13 -04:00
Sal
27a4cbd52d
Merge branch 'specs_of_dust' into 'master'
...
Specs of dust
See merge request KartKrew/Kart!50
2018-10-19 15:50:58 -04:00
Sal
734b7008c4
Merge branch 'democam' into 'master'
...
If I were a bad Democam, I wouldn't be sittin' here discussin' it with ya now would I?!
See merge request KartKrew/Kart!48
2018-10-19 15:50:28 -04:00
Sal
524ab75a6a
Merge branch 'remove-prints' into 'master'
...
Remove most gameplay prints
See merge request KartKrew/Kart!42
2018-10-19 15:49:01 -04:00
TehRealSalt
7556cca505
Huge restructuring & more fine-tuned speed, following, & turn behavior
2018-10-18 19:51:36 -04:00
toaster
9db5e6a330
A bunch of spectator-joining-round tweaks.
...
* Re-enable the flashing-set thing on attempting to join with the item key. I spoke to Sal privately about this - turns out some keys ALWAYS send key presses instead of only sending one, and shift - what I have item bound to - is one of the problematic ones.
* Make the no-joining-game-after-20-seconds thing happen 20 seconds after the TIMER has started, not the level (ie, take starttime into account)
2018-10-18 18:13:00 +01:00
TehRealSalt
8d6e203bd2
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
