Commit graph

406 commits

Author SHA1 Message Date
TehRealSalt
fbbddfff0a Log this 2018-11-07 14:56:36 -05:00
toaster
935607cfab 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
ab02ea1e1a Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt
5360bff294 Merge branch 'master' into resync 2018-11-01 20:39:50 -04:00
TehRealSalt
b08fb14d62 Time over cam & signposts support mobjscale 2018-10-31 03:13:56 -04:00
toaster
97274177d3 Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:47:34 +00:00
TehRealSalt
4bf4bcadda Fix SMK RR thwomps casuing bounce-up 2018-10-29 17:45:59 -04:00
toaster
8d575c9b56 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:37:06 +00:00
Sal
916fb49be6 Merge branch 'splitscreen-tuneup' into 'master'
Splitscreen tuneup

See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -04:00
TehRealSalt
193941945e 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
f9d8ebd4e6 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
ab518c611c 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
a8e549e0c5 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
02c425696f Reduce camspeed in splitscreen 2018-10-27 20:44:05 -04:00
toaster
18c649caca Fix and then subsequently disable the zoom tube angle setting stuff. 2018-10-27 22:05:15 +01:00
toaster
92b6f8bb50 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
46164a7f46 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
bd79aaf847 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00
Latapostrophe
35f576c166 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
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
Sal
a2fab299c1 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
4bb92418f6 Fix camera movement when turning 2018-10-23 19:43:20 -04:00
TehRealSalt
abb50683ff reset these too 2018-10-23 19:08:13 -04:00
TehRealSalt
ad2efe658f Reset cam pan if dead/reset/still 2018-10-23 19:06:26 -04:00
TehRealSalt
e11fe766ef fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
TehRealSalt
30e83ff305 Cam follows faster in 2P 2018-10-22 17:48:21 -04:00
TehRealSalt
8e3f4d5a63 Fix Thunder Shield not killing SPBs 2018-10-22 17:08:34 -04:00
TehRealSalt
6832cd7195 Fix camera not noclipping FOFs 2018-10-22 16:16:57 -04:00
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
TehRealSalt
d93f09ccf4 Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
d0042f481f 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
d2e8a71ff8 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
3e2f4f2404 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
a0c32e771c Huge restructuring & more fine-tuned speed, following, & turn behavior 2018-10-18 19:51:36 -04:00
toaster
62d16b877f 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
2ae44ab10e New SPB
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
TehRealSalt
2121bbae84 No more vanilla democam, for real 2018-10-17 19:10:23 -04:00
TehRealSalt
c7d40482af Merge branch 'master' into democam 2018-10-17 18:17:42 -04:00
toaster
12d67e62bc Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen 2018-10-16 22:13:45 +01:00
TehRealSalt
055d9ecc69 restore 2018-10-14 17:54:18 -04:00
TehRealSalt
3186af9e51 Remove most gameplay prints
A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 17:45:28 -04:00
toaster
1142fddc71 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
2018-10-14 21:52:05 +01:00
Monster Iestyn
37f32fa251 Merge branch 'master' into next 2018-10-14 20:49:35 +01:00
Monster Iestyn
34728b3031 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
TehRealSalt
a1a7a10ac1 Merge branch 'master' into net-screen 2018-10-09 21:16:16 -04:00
TehRealSalt
cdef7f4e1d New engine sounds
9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-08 21:31:55 -04:00
TehRealSalt
7a6a2f8946 Merge branch 'master' into net-screen 2018-10-07 23:26:56 -04:00
Sal
85430da37f Merge branch 'thinkerclean' into 'master'
Nuke a bunch of iteration things that have no purpose in SRB2Kart.

See merge request KartKrew/Kart!25
2018-10-07 23:14:53 -04:00
TehRealSalt
b5f409fcb8 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -04:00
TehRealSalt
37b5a9327c Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00