vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3978 commits 50 branches 7 tags 75 MiB
Commit graph

3978 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster 88b6e9e1bd Minor things that annoyed me to NO GOOD END. 
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
 2018-10-27 20:43:33 +01:00
toaster 564cfb33b4 Fade stuff! 
* Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable.
* Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.
 2018-10-27 20:39:41 +01:00
toaster bd36816b39 dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident 2018-10-27 16:25:25 +01:00
toaster d78368d4d2 Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else. 
Requires charscleanup.kart. Ezo, if you want me to, I can fix up bonuschars for this tweaked system.
 2018-10-27 15:43:33 +01:00
TehRealSalt a8dfd45d9c Merge branch 'master' into div-sounds 2018-10-26 01:15:10 -04:00
TehRealSalt 8058b77743 Combine spinout & wipeout timers 
Turns out they were only 1 tic apart originally, sooo
 2018-10-26 01:07:54 -04: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 240d7a44c1 CRITICAL BUGFIX 
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
 2018-10-26 00:56:02 -04:00
TehRealSalt 27f118a06c Adjust spinout times to face your forward about 90% of the time 2018-10-26 00:55:20 -04:00
TehRealSalt 555fbbe2f5 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00
TehRealSalt 146c8b228b - Reduce volume reduction 
- Don't apply to sounds without an origin mobj
 2018-10-25 22:53:58 -04:00
toaster 4595328e6d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal 7f2090aeae Merge branch 'karma-touchups' into 'master' 
Karma touchups

See merge request KartKrew/Kart!59
 2018-10-25 14:06:22 -04:00
Sal 6997db11e1 Merge branch 'chat-changes' into 'master' 
New chat mode (Window Hidden) + Player join/leave/rename messages in chat + new console backcolours for console & chat

See merge request KartKrew/Kart!55
 2018-10-25 14:06:11 -04:00
Latapostrophe b9c6210822 Reimplemented the splitscreen chat fix 2018-10-25 20:02:43 +02:00
Latapostrophe 20cfd80767 Fixed the menu highlight thing 2018-10-25 19:41:14 +02: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
toaster 19a6bd948c Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
 2018-10-25 10:46:18 +01:00
Latapostrophe 26093de2e9 Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt aa00ca72e2 Fix merges 
(Don't bother me hastily to merge something in again, please)
 2018-10-24 21:51:43 -04:00
Sal af4e4f3fe4 Merge branch 'fz-time-over' into 'master' 
F-Zero time over hardcode

See merge request KartKrew/Kart!62
 2018-10-24 21:40:07 -04:00
TehRealSalt f2f03d03a7 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
Sal eef1ba3660 Merge branch 'lat-hardcode' into 'master' 
Midnight Channel + Mementos hardcode

See merge request KartKrew/Kart!61
 2018-10-24 21:26:02 -04:00
TehRealSalt 974f6d47e1 Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt 25414edb57 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt 224408210c Extra safety 
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
 2018-10-24 21:18:15 -04:00
TehRealSalt 326955dd30 Turn cam on wall hit 2018-10-24 21:05:02 -04:00
Sal 8109890913 Merge branch 'explosion-spinout-fix' into 'master' 
Explosion spinout fix

See merge request KartKrew/Kart!60
 2018-10-24 20:18:34 -04:00
TehRealSalt f3a61b43d7 Wrong variable 2018-10-24 19:38:46 -04:00
Latapostrophe 6e67aaa9cd Resolved conflict 2018-10-25 01:35:55 +02: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
Latapostrophe 474bebaad3 I'm an idiot and keep forgetting to hit trim trailing space. 2018-10-25 00:59:43 +02:00
Latapostrophe a24507b2eb Midnight Channel: warning sign hardcode 2018-10-25 00:58:59 +02:00
TehRealSalt 7ab6cefb99 Remove these 2018-10-24 18:14:25 -04:00
Latapostrophe ac4a2f3d02 Reduced aggravating stationary Shadow range + fixed whitespace 2018-10-24 23:57:08 +02:00
Latapostrophe 77fd7704e8 Midnight Channel: HUD static effect hardcode 2018-10-24 23:55:12 +02:00
TehRealSalt ac9e00a425 Karma point changes 
- Number of points needed to come back is now 2.
- Bombs no longer give extra points.
 2018-10-24 17:29:13 -04:00
TehRealSalt 43c6e25668 Update SPB hitbox too 
Even more consistency!
 2018-10-24 17:22:58 -04:00
TehRealSalt 0e4d5fd50e Merge branch 'master' into karma-touchups 2018-10-24 17:21:34 -04:00
TehRealSalt 3dba084fd9 Give karma items their own hitbox size 
Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V
 2018-10-24 17:16:32 -04:00
toaster 3d2efc751f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/info.c
#	src/p_inter.c
 2018-10-24 22:15:08 +01:00
toaster 03a4cca0b6 SPR_VAPE on S_VVVAPING1 2018-10-24 21:48:09 +01:00
Latapostrophe 0874e6bb8e Reaper will repeat chain sound + 1 small targetting bugfix 2018-10-24 22:28:44 +02:00
Sal 08791269be Merge branch 'new-spb' into 'master' 
New SPB

See merge request KartKrew/Kart!56
 2018-10-24 16:04:29 -04:00
Sal 65d9b05966 Merge branch 'battleoffline' into 'master' 
Battle Offline

See merge request KartKrew/Kart!54
 2018-10-24 16:01:58 -04:00
Sal 2a375e0f1c Merge branch 'howdyalikethemcherries' into 'master' 
How'd'ya like them cherries

See merge request KartKrew/Kart!53
 2018-10-24 16:01:47 -04:00
Sal d93a4106b6 Merge branch 'some_scaling_stuff' into 'master' 
Two scale things I noticed.

See merge request KartKrew/Kart!51
 2018-10-24 16:01:39 -04:00
Latapostrophe 553013ddbf Reaper new anim + fast spawn for testing 2018-10-24 21:07:25 +02:00
TehRealSalt b4fd249742 Partially revert Jawz x2 changes 
Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
 2018-10-23 21:13:14 -04:00
TehRealSalt 5ff1817c34 Divide sound volume by number of local players 2018-10-23 20:53:05 -04:00