Commit graph

646 commits

Author SHA1 Message Date
Sally Cochenour
372544d28f Merge branch 'master' into pet-robo 2020-04-22 21:54:40 -04:00
lachwright
dd126494b3 [Everyone disliked that.] (revert camera zoom) 2020-04-22 22:59:57 +08:00
lachwright
c92634c71e Make lookback instantaneous 2020-04-21 05:24:48 +08:00
lachwright
6905cfb064 Revert camtilt splitscreen hacks 2020-04-21 03:32:06 +08:00
lachwright
263c31f5df Improve camera tilt 2020-04-21 02:38:08 +08:00
James R
9f1c616817 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Sally Cochenour
0ef12d3cce Properly use bot movement when exiting 2020-03-29 17:59:26 -04:00
Latapostrophe
4c8d373962 Fix followers in anti gravity 2020-03-29 16:40:21 +02:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Sally Cochenour
15bda7da2d Use K_MomentumToFacing to give bots a bit better traction 2020-03-28 14:57:49 -04:00
Sally Cochenour
ff621d3e46 Skins, rudimentary ticcmd building for bots 2020-03-28 12:39:27 -04:00
Sally Cochenour
e5ae9d1513 Merge branch 'master' into pet-robo 2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
Sally Cochenour
8a3c7ad2fb Add fire trail to flame shield 2020-03-26 03:13:49 -04:00
James R
572bf314e5 Merge remote-tracking branch 'origin/master' into resume 2020-03-22 19:01:05 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
James R
5e671b3483 Don't reset special music in P_RestoreMusic
Because that resets Grow music when you stack Grow over Invincibility, and
Invincibility ends. (Also Megamix Themes.)

Thanks Snu, for calling P_RestoreMusic every tic!
2020-03-21 22:34:27 -07:00
James R
7e0aa16e70 Reset Invincibility (and Grow) music to the start if stacked
Toggleable via the resetspecialmusic cvar.
2020-03-21 22:28:55 -07:00
James R
dd1715aa15 Optionally only resync Invincibility and Grow music 2020-03-21 22:28:55 -07:00
James R
d99d1994da Let invincibility and grow music fades work again 2020-03-21 22:28:55 -07:00
James R
80c7cc3c87 3 AM Moment: The death fades now only apply to local players 2020-03-21 22:28:55 -07:00
James R
15e8291903 Reset the music fade in cvar pointer too
This fixes a bug with death fades.
2020-03-21 22:28:55 -07:00
James R
911dd57334 Restore level music to where it left off
Toggleable via the resume cvar.
2020-03-21 22:28:55 -07:00
James R
8524c3749d Fade level music back in after Invincibility and Grow
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
2020-03-21 22:28:54 -07:00
James R
310a9cd09c Merge remote-tracking branch 'origin/master' into parties 2020-03-21 17:22:57 -07:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/k_kart.c
2020-03-21 23:27:55 +00:00
Sal
9d35d0f5d8 Merge branch 'driftspark-update' into 'master'
Yellow drift sparks & new drift spark effects

See merge request KartKrew/Kart!211
2020-03-21 19:02:48 -04:00
James R
1dd95f5e3b gr_shearing doesn't exist in master! 2020-03-21 12:53:33 -07:00
James R
b1db9077a4 splitscreen -> r_splitscreen 2020-03-21 12:48:51 -07:00
James R
fd1cb69a87 Merge remote-tracking branch 'origin/master' into parties 2020-03-21 12:45:23 -07:00
Sally Cochenour
7d1c132ca2 Fix drift spark camera when you go to yellow sparks 2020-03-15 21:21:07 -04:00
lachwright
49f9d830ed Attempt to make splitscreen's camtilt better 2020-03-12 01:23:09 +08:00
Latapostrophe
1f5bbb2c3d Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
4dfb47dff6 Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
lachwright
e2c95a0060 Visibility improvement 2020-03-10 19:30:02 +08:00
lachwright
f0c98697dc Add camera pitching when driving on downhill slopes 2020-03-10 05:18:05 +08:00
James R
0c814ce42d Sync look back
Also fixes look back applying to the first
player in parties instead of locally.
2020-02-23 23:21:20 -08:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
1e89d512a7 Fix spectator join black screen 2020-02-23 23:20:20 -08:00
James R
c8524b47e7 Fix VIEWPOINT annotation showing up in parties 2020-02-23 23:20:20 -08:00
James R
06cee4a0b7 Fix camera angle of party players 2020-02-23 23:20:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
TehRealSalt
b69d105af3 Add respawn animation
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
2019-10-24 16:35:39 -04:00
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04:00