4db656db1a
Midnight Channel hardcode
2018-10-20 16:10:40 +02:00
2021897972
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
1f15d87b68
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 21:53:02 +01:00
fc86c87465
Two scale things I noticed.
...
* Change spacing of bustable FOF debris with scale (plus increase its default a bit for less lag).
* Make a few instances of scalespeed take mapheader scaling into account.
2018-10-19 21:32:29 +01:00
2e3f6b09af
Merge branch 'net-screen' into 'master'
...
Splitscreen in netgames
See merge request KartKrew/Kart!22
2018-10-19 16:01:53 -04:00
553066b48b
Merge branch 'master' into net-screen
2018-10-19 15:59:13 -04:00
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
22aa01b35e
Merge branch 'thundertweak' into 'master'
...
Thundertweak
See merge request KartKrew/Kart!49
2018-10-19 15:50:47 -04:00
9a818ae7fb
Merge branch 'you_can_sometimes_have_too_many_rings' into 'master'
...
You can sometimes have too many rings
See merge request KartKrew/Kart!47
2018-10-19 15:50:37 -04:00
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
4994e9749f
Merge branch 'no-spectate-griefing' into 'master'
...
Prevent spectate griefing
See merge request KartKrew/Kart!43
2018-10-19 15:50:18 -04:00
adb2fad43c
Merge branch 'sp_fixes' into 'master'
...
Singleplayer fixes (no, not record attack, the *other* one)
See merge request KartKrew/Kart!46
2018-10-19 15:50:06 -04:00
ab4bf563e0
Merge branch 'sweet-new-kicks' into 'master'
...
Sweet new kicks
See merge request KartKrew/Kart!39
2018-10-19 15:49:51 -04:00
d6cf424aed
Merge branch 'unlock-hard' into 'master'
...
Hard Mode is an unlockable
See merge request KartKrew/Kart!40
2018-10-19 15:49:32 -04:00
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
8366defae1
Slows down in the air
2018-10-19 14:02:55 -04:00
8ab8df6789
Completely stop when there's no targets possible
...
(if'd out self-destruct code too)
2018-10-19 02:37:45 -04:00
f8fc6862b5
SPB knockback is more punishing
...
Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-18 20:49:30 -04:00
7556cca505
Huge restructuring & more fine-tuned speed, following, & turn behavior
2018-10-18 19:51:36 -04:00
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
3c4cd4e51c
Fix indentation.
2018-10-18 16:18:54 +01:00
b03ae92253
Play the traditional thundershield manifestation sound when a thundershield is manifested, plus a minor eye towards forward compatibility in the condition for manifestation.
2018-10-18 16:15:59 +01:00
8d6e203bd2
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
36595b06af
Merge branch 'master' into update-version
2018-10-17 20:31:56 -04:00
39ca58d0a4
Add more hash stuff
...
UNFINISHED, still need to add in legitimate hashes for non-CMake builds when we've finalized the content.
2018-10-17 20:30:34 -04:00
c8cd84ca34
No more vanilla democam, for real
2018-10-17 19:10:23 -04:00
9f05e14c99
Merge branch 'master' into democam
2018-10-17 18:17:42 -04:00
9ab5a74b00
Disable rings, NiGHTS wing-emblems, special placement patterns, and team rings.
...
Also, tweak the hoop spawning routine to correctly P_SetTarget the hnexts and hprevs, since I'm mucking around in there.
2018-10-17 19:27:45 +01:00
1ca823f981
<
2018-10-17 13:38:31 -04:00
ce443712b2
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken.
...
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 13:40:17 +01:00
7f4228c37b
Merge branch 'master' into net-screen
2018-10-16 21:40:06 -04:00
5a1e40f987
Quick fix for attack/protect being too big
2018-10-16 21:39:39 -04:00
9047780e29
Prevent point grief
...
(Needs tested)
2018-10-16 20:56:04 -04:00
1f1ba26aa7
Merge branch 'fix-nextlevel' into 'master'
...
Fix "advancemap next" going to GHZ at the end of a cup
See merge request KartKrew/Kart!44
2018-10-16 18:08:04 -04:00
41b684e63e
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen
2018-10-16 22:13:45 +01:00
b34cbe4032
`[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it`
...
The Menu Queen is in the house~ ✨
* Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional.
* Death to NOFOURPLAYER, now that the cat's out the bag.
* Clean up NONET, assuming people try to make DD builds on release.
* Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 22:11:47 +01:00
c9b0786a3b
Merge branch 'master' into fix-nextlevel
2018-10-16 17:05:47 -04:00
362cbeb6b5
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00
bcc1911672
Merge branch 'nextmerge_plus_rain' into 'master'
...
Next-merge plus rain
See merge request KartKrew/Kart!41
2018-10-16 16:36:18 -04:00
ae7c4c44fa
Merge branch 'engine-tweak' into 'master'
...
Engine tune-up
See merge request KartKrew/Kart!45
2018-10-16 15:46:15 -04:00
a919260fd2
Default sound channels
...
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
2018-10-16 13:26:03 -04:00
b23a798978
1 minor, non-engine related change I wanted to make while I was at it:
...
Minor priority change to two voice lines; the "passing someone" line has the same priority as every other line, and gave it's boosted priority to the way more gameplay-important "hit 'em" line.
2018-10-16 12:48:46 -04:00
5701fe8a51
Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag
...
Sryder's request
2018-10-16 12:30:47 -04:00
35528276d2
Optimize
2018-10-16 12:25:51 -04:00
e24cbb2c86
== --> >=
2018-10-16 12:23:05 -04:00
496e0df9d0
Smoother
...
NOW this is good enough to ship
2018-10-15 23:13:59 -04:00
8024ad74b5
Quick fix for banana cheat not showing all unlockables
...
Plus, this is generally better, as a mod could let you unlock stuff "out-of-order"
2018-10-15 22:02:10 -04:00
bca6e9165b
Merge branch 'master' into net-screen
2018-10-15 21:57:11 -04:00
32f3088e01
Minor whitespace
2018-10-15 20:34:53 -04:00
ec048b73c4
Show Spectator controls for P2-P3 again
2018-10-15 20:31:26 -04:00
Latapostrophe