Commit graph

7030 commits

Author SHA1 Message Date
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
Sal
5852b40482 Merge branch '22shadows' into 'master'
2.2 shadows port

See merge request KartKrew/Kart!203
2020-03-06 00:37:41 -05:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sal
b13ebd6d15 Merge branch 'special-sector-tweak' into 'master'
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)

See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
9392282b23 Merge branch 'exists-fix' into 'master'
Prevent LF2_EXISTSHACK from ever getting removed

See merge request KartKrew/Kart!196
2020-03-06 00:10:20 -05:00
Sal
4b5b2462b5 Merge branch 'gentlemen' into 'master'
Gentlemen's ping agreement

See merge request KartKrew/Kart!197
2020-03-06 00:10:06 -05:00
Sal
10fe9434f6 Merge branch 'blizzard' into 'master'
Weather system refactor, Blizzard weather type

See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sal
2448ab34e9 Merge branch 'no-charge' into 'master'
Disable charging drift sparks in bounce pad state

See merge request KartKrew/Kart!190
2020-03-06 00:09:27 -05:00
Sal
a0c1c68f5c Merge branch 'paper-signs' into 'master'
3D level end signposts

See merge request KartKrew/Kart!199
2020-03-06 00:08:35 -05:00
Latapostrophe
ee7ae2e5ca Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-03-05 21:03:29 +01:00
James R
11930b41bf Use tic_t 2020-03-03 20:11:03 -08:00
James R
70d46ebb0a Merge branch 'parties-only' into parties 2020-03-03 20:05:30 -08:00
James R
74f47f83f2 Party yourself with ALL party members when being added to a party 2020-03-03 19:22:32 -08:00
James R
dd29a44ecc cancelinvite command to rescind a party invitation 2020-03-03 19:17:27 -08:00
James R
b3ef79953a Merge branch 'parties-only' into parties 2020-03-03 18:52:14 -08:00
James R
9b239e8252 Set extra displayplayers to displayplayers[0] instead of splitscreen for parties
This fixes P2's HUD drawing in P4's area in a 3P party, when the first local
player was P2.
2020-03-03 18:49:26 -08:00
James R
ac75b30400 r_splitscreen for opengl 2020-03-03 18:48:47 -08:00
Sally Cochenour
2b6ca4a384 Increase SPB speed & turn 2020-03-03 20:56:57 -05:00
Sally Cochenour
721fb369fd Move changes to K_GetBestWaypointForMobj so that K_GetClosestWaypointToMobj can stay the same 2020-03-03 18:34:17 -05:00
Sally Cochenour
d459407866 Forgotten player check here 2020-03-03 17:22:13 -05:00
Sally Cochenour
ff190b7a88 Fix unsigned/signed comparison 2020-03-03 17:05:04 -05:00
Sally Cochenour
7fff21acd4 Instead of vertical cap, quadruple z axis distance
Far more natural results!
2020-03-03 16:58:09 -05:00
Sally Cochenour
ac1d40d6c5 Sight check for player waypoints 2020-03-03 16:14:19 -05:00
Sally Cochenour
f068539bad Don't sight check through transparent FOFs
Maybe this should be a option somehow, like a distinction between "sight" and "ray-tracing", but I'm not sure how to go about that
2020-03-03 16:12:21 -05:00
Sally Cochenour
04b443d58c 2.2 sight checks backport 2020-03-03 15:49:10 -05:00
Sally Cochenour
1cbb4bea6b Limited vertical range on player waypoints 2020-03-03 15:47:02 -05:00
Sally Cochenour
8a19f6f208 Wrong sign here 2020-03-03 15:41:03 -05:00
Sally Cochenour
597e6820b6 Let's try out going back to closest check again 2020-03-03 14:47:41 -05:00
Sally Cochenour
d91e8205dc Don't update respawn point when mid-air 2020-03-03 14:22:52 -05:00
Sally Cochenour
18637b9eb2 2.2 shadow port 2020-03-01 22:12:50 -05:00
Sally Cochenour
834225c597 One more... I swear it's the last... 2020-03-01 17:50:58 -05:00
Sally Cochenour
7a3733d75c More remenants 2020-03-01 17:37:10 -05:00
Sally Cochenour
30d391b6b2 FINISH removing the shadows... 2020-03-01 17:35:49 -05:00
Sally Cochenour
c17f4dcf15 Remove our shadows 2020-03-01 17:07:52 -05:00
Sally Cochenour
65e9aeec62 This was in the wrong place 2020-03-01 16:03:31 -05:00
Sally Cochenour
48ff9ddf85 Move overtime stuff to k_battle.c 2020-03-01 15:58:00 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
0c1d0d8f5c Don't need abs here 2020-03-01 14:56:16 -05:00
Sally Cochenour
885d6fea1f Merge branch 'master' into special-sector-tweak 2020-03-01 14:50:45 -05:00
Sally Cochenour
76e75d9756 Fix offroad collision
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
Sally Cochenour
6956e1d24e Store random states in mobjinfo instead of precipprops
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
Sally Cochenour
a63157b937 Flip facing direction 2020-02-25 00:04:39 -05:00
James R
ea8fd7348f Show lagless for all the host's splitscreen players 2020-02-23 23:23:50 -08:00
James R
f9b5f71171 Merge branch 'gentlemen' into parties 2020-02-23 23:22:37 -08:00
James R
8619ec4d0f Fix first person camera angle in parties 2020-02-23 23:21:20 -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
7961ac9d95 Fix moving while viewing another player not resetting the viewpoint 2020-02-23 23:21:20 -08:00
James R
e593b5297a Reset party size 2020-02-23 23:21:20 -08:00
James R
70bb244dd6 Reset camera when party changes 2020-02-23 23:21:20 -08:00
James R
7fe61a99df More plurals 2020-02-23 23:21:20 -08:00