Commit graph

3748 commits

Author SHA1 Message Date
toaster
889064527a 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
90f904241b 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
Sal
f5a9ae016a Merge branch 'karma-touchups' into 'master'
Karma touchups

See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04:00
Sal
7f42cbc942 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
ef08560bf4 Reimplemented the splitscreen chat fix 2018-10-25 20:02:43 +02:00
Latapostrophe
bd1c7e2bc6 Fixed the menu highlight thing 2018-10-25 19:41:14 +02: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
Latapostrophe
612ff4059c Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt
6f76b2b827 Fix merges
(Don't bother me hastily to merge something in again, please)
2018-10-24 21:51:43 -04:00
Sal
b122df3e27 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
a57c6af1f0 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
Sal
862f2389dc 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
268fa6337e Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt
db6e1f9b94 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
67de207278 Turn cam on wall hit 2018-10-24 21:05:02 -04:00
Sal
3c1325cedf 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
c7311ba826 Wrong variable 2018-10-24 19:38:46 -04:00
Latapostrophe
a16864f79e Resolved conflict 2018-10-25 01:35:55 +02: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
Latapostrophe
ff79a954aa I'm an idiot and keep forgetting to hit trim trailing space. 2018-10-25 00:59:43 +02:00
Latapostrophe
e654e32b25 Midnight Channel: warning sign hardcode 2018-10-25 00:58:59 +02:00
TehRealSalt
51c94171bb Remove these 2018-10-24 18:14:25 -04:00
Latapostrophe
3a4bff82f2 Reduced aggravating stationary Shadow range + fixed whitespace 2018-10-24 23:57:08 +02:00
Latapostrophe
c74c4e9549 Midnight Channel: HUD static effect hardcode 2018-10-24 23:55:12 +02:00
TehRealSalt
d91f6b09f8 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
f34bd5ff8c Update SPB hitbox too
Even more consistency!
2018-10-24 17:22:58 -04:00
TehRealSalt
f3d838b2b5 Merge branch 'master' into karma-touchups 2018-10-24 17:21:34 -04:00
TehRealSalt
bb70f08e0c 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
Latapostrophe
508862a158 Reaper will repeat chain sound + 1 small targetting bugfix 2018-10-24 22:28:44 +02:00
Sal
ec80cfc3d2 Merge branch 'new-spb' into 'master'
New SPB

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

See merge request KartKrew/Kart!54
2018-10-24 16:01:58 -04:00
Sal
87d51cc491 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
5a6524fc93 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
2301cc322e Reaper new anim + fast spawn for testing 2018-10-24 21:07:25 +02:00
TehRealSalt
5e41e6fb5b 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
3c4b3342c5 Remove the local dontdraw
Not only did I not implement this for everything, but I also REALLY like seeing other player's. If it's a problem, then let's just turn down the fuse and/or tics
2018-10-23 19:45:35 -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
Latapostrophe
fa03c99412 another few whitepsaces i forgot from copypasting... 2018-10-23 18:35:42 +02:00
Latapostrophe
7be547950a I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces 2018-10-23 18:31:34 +02:00
Latapostrophe
7e16795c64 Jack In The Box + Color Drive hardcode 2018-10-23 17:59:19 +02:00
TehRealSalt
988c0d07e3 Spread out SPB odds 2018-10-22 22:29:30 -04:00
TehRealSalt
a922a9b805 New item odds to accomedate new SPB behavior 2018-10-22 21:09:37 -04:00
TehRealSalt
30e83ff305 Cam follows faster in 2P 2018-10-22 17:48:21 -04:00
TehRealSalt
14522752fe Minor mistakes on my part 2018-10-22 17:24:58 -04:00
TehRealSalt
8e3f4d5a63 Fix Thunder Shield not killing SPBs 2018-10-22 17:08:34 -04:00
TehRealSalt
1171e5b3e0 Don't destroy all of your balloons in 3 tics 2018-10-22 17:05:44 -04:00