Commit graph

6719 commits

Author SHA1 Message Date
Latapostrophe
5a6f5591ca Merge branch 'master' into spb-waypoints 2020-03-25 23:30:18 +01:00
Latapostrophe
366fff9942 Red rings, fuse, and spb game speed support 2020-03-20 21:58:14 +01:00
Latapostrophe
897feac651 Make SPB spawn damaging dust and sliptides while it moves around 2020-03-20 14:59:38 +01:00
Sally Cochenour
5ef433f9c7 Remove bumper when you respawn in Battle again
(This stuff really should be its own function...)
2020-03-17 19:54:32 -04:00
Sally Cochenour
1e10ec00d7 Merge branch 'waypoints' into sal-waypoints 2020-03-15 20:23:24 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Sryder
c268313f0a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/Makefile
#	src/k_kart.c
#	src/p_map.c
#	src/p_setup.c
#	src/p_spec.c
2020-03-16 00:13:42 +00:00
Sally Cochenour
084901a8b1 Add warnings for old map setups
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
2020-03-15 19:21:06 -04:00
Sally Cochenour
d8e0bf61f6 Scale item distances with map scale 2020-03-08 00:26:33 -05:00
Sal
b3a1bb6064 Merge branch 'fullbright-boosters' into 'master'
Fullbright boosters

See merge request KartKrew/Kart!205
2020-03-07 14:37:36 -05:00
Sally Cochenour
558f8607c9 Merge branch 'master' into fullbright-boosters 2020-03-06 12:56:36 -05:00
Sally Cochenour
83c74af696 Fix bad master merge 2020-03-06 12:56:12 -05:00
Sally Cochenour
76188e89fb Fullbright boosters
We no longer have to maintain this standard manually. I actually suggest making booster sectors use the lightlevel of their surrounding sectors so that only the booster itself glows.

(OGL support is commented out, since it conflicts with sal-lighting and should probably be done there)
2020-03-06 12:54:54 -05: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
James R
11930b41bf Use tic_t 2020-03-03 20:11:03 -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
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
4f73e26661 Show server's ping on scores if not LAGLESS 2020-02-23 23:07:57 -08:00
James R
a511d9358a Terrible code to show the ping counter for honest servers 2020-02-23 23:07:57 -08:00
James R
352d576979 Don't turn off lagless at map start; draw LAGLESS in intermission 2020-02-23 23:07:57 -08:00
James R
6484a5cd93 Show LAGLESS on the scores if the host is being dishonest 2020-02-23 23:07:57 -08:00
James R
56f6b058d0 Make host lag optional with "lagless", lag by default (lagless off) 2020-02-23 23:07:57 -08:00
James R
5f26312a0a Drop frames as the host according to the lowest ping among clients 2020-02-23 23:07:57 -08:00