Commit graph

19656 commits

Author SHA1 Message Date
Sally Coolatta
ab646415e0 Merge branch 'master' into m-for-mini 2022-09-12 00:06:56 -04:00
Sally Coolatta
27fdb815b9 Give solid to gun & particles
Fixes hitboxes for the gun, IDK why particle isn't working. Also fix typo error
2022-09-12 00:06:48 -04:00
Sally Coolatta
135b444b5e Fix bad shrink position 2022-09-12 00:06:04 -04:00
Sal
7a519704a5 Merge branch 'bbox' into 'master'
renderhitbox command for Software mode

See merge request KartKrew/Kart!672
2022-09-12 04:03:49 +00:00
Sally Coolatta
b8bbdda1f3 Improvements from the netgame
- Double active time
- Increase height they spawn from
- Slow down swing speed the tiniest bit
- Add an extra 7 for first place
- Increase hitbox
- Make particles into hitbox
- Tweak item odds
2022-09-11 23:31:53 -04:00
Sally Coolatta
892863db05 Add bot support to new Shrink
They move towards lasers that belong to them, and steer away from ones that don't.
2022-09-11 21:52:53 -04:00
Sally Coolatta
e1cf42dcbd Increase Shrink odds 2022-09-11 21:48:30 -04:00
Sally Coolatta
6aaa608299 Playable Shrink 2022-09-11 21:40:24 -04:00
Sally Coolatta
92f9fc266d Merge branch 'master' into m-for-mini 2022-09-11 18:39:53 -04:00
Sally Coolatta
e5631d3182 Merge branch 'master' into m-for-mini 2022-09-11 18:39:11 -04:00
James R
7719cf27fa Remedy some quirky rendering of hitboxes if your viewpoint is too close
It's not correct but it's better than before.
2022-09-11 07:15:04 -07:00
James R
7094a064da Do not render waypoint or spectator self hitbox
Visual clutter and waypoint debugger exists. :)

If you are a spectator, the hitbox exists right ontop of
you and hitboxes don't render correctly if they are too
close to the viewpoint.
2022-09-11 07:13:48 -07:00
James R
5a58b3ca3a Refactor hitbox renderer to project vissprites
Properly accounts for portals (skyboxes).
2022-09-11 06:17:42 -07:00
Sal
a7716b966a Merge branch '14plus-votechanges' into 'master'
1.4+ Voting Changes

See merge request KartKrew/Kart!655
2022-09-11 06:30:39 +00:00
Sal
94d7c497b0 Merge branch 'hooklib-port' into 'master'
Hooklib refactor ported and (mostly) squashed

See merge request KartKrew/Kart!662
2022-09-11 06:30:07 +00:00
Sal
2660271911 Merge branch 'terrain-optimise-fresh' into 'master'
Terrain hashes

See merge request KartKrew/Kart!666
2022-09-11 06:29:45 +00:00
Sally Coolatta
a74506690f More shrink foundation
- Keeps track of ties. If multiple Poh-Bees would go to the same waypoint, then it will combine them into a single one, with multiple lasers attached to it.
- Added the laser shooters. Still purely visual.
- Added despawn behavior.
2022-09-11 02:15:44 -04:00
SteelT
51aca52624 Merge branch 'master' into terrain-optimise-fresh 2022-09-11 00:36:06 -04:00
Sally Coolatta
cf9bfcae02 Start on new Shrink
Currently just spawns an object that goes along the waypoint path
2022-09-10 21:44:40 -04:00
Sal
d15fab9681 Merge branch 'fix-orbit-shield-rr' into 'master'
Fix orbinaut/jawz threshold collision

See merge request KartKrew/Kart!674
2022-09-10 19:19:19 +00:00
Sal
9548bd45a4 Merge branch 'launchy' into 'master'
Launch / step-down changes

See merge request KartKrew/Kart!675
2022-09-10 19:18:53 +00:00
Sally Coolatta
79f6d0643b Launch / step-down changes
- Launch / wall-transfer off of no-physics slopes
- Prevent step down when trying to move upwards
- E-brake enables launching again
- Removed old comment talking about slope nerf
2022-09-10 14:46:12 -04:00
Latapostrophe
efc415e536 fix orbiting items not protecting you against your own items
(cherry picked from commit 705851b38a)
2022-09-10 02:45:12 -07:00
Sally Coolatta
0c5b42a07e Stop lag when bots respawn
They try to predict their direction while they respawn, which makes them go a bit nuts when air time compensation kicks in. Cap it so that this can't happen.
2022-09-10 03:59:04 -04:00
Sally Coolatta
5107160a27 Circuit pathfinding
An alternative to the standard pathfind function. Instead of pathfinding to a specific waypoint, it always goes towards the finish line waypoint, but also won't stop when it reaches it. It only stops when it travels a far enough distance.

This is basically a cleaner, less hacky, and optimized version of the pathfinding I gave to the bots; instead of doing 1-2 full pathfinds to do this (depending on if they are near the finish line or not), it will instead always do a single small pathfind. I also need it for shrink laser behavior.
2022-09-10 03:52:31 -04:00
Sally Coolatta
5b42b3b41a Backport mobj interpolators crash fix
From commit f009b3d8c9d2273bf2e51ef9a23fbfedc2da09df in the public repo. Porting directly into master because I'm tired of kartdebugwaypoints crashing all the time.
2022-09-09 13:49:57 -04:00
Oni
42cba129b8 Merge branch 'ogl-in-software' into 'master'
OpenGL instead of Direct3D11 for Software blitter

See merge request KartKrew/Kart!671
2022-09-09 08:35:32 +00:00
James R
082d9206e8 Add a hitbox renderer to Software mode
renderhitbox
- Tangible - collision activating objects, minus rings
- All - every object
- Intangible - the opposite of Tangible, also no rings
- Rings - rings
2022-09-08 22:30:00 -07:00
Sally Coolatta
c95acb120a Merge branch 'master' into ogl-in-software 2022-09-08 14:28:29 -04:00
Sally Coolatta
f6fd8f6728 OpenGL instead of Direct3D11 for Software blitter 2022-09-08 12:51:47 -04:00
Oni
8bc24a8259 Merge branch 'new-menus' into 'master'
New menus

See merge request KartKrew/Kart!204
2022-09-07 23:25:38 +00:00
James R
badbcb5c8d Fix -Wformat 2022-09-07 14:12:20 -07:00
toaster
a5043b5be8 Fixed Oni's controller-related SIGFPE 2022-09-07 22:08:12 +01:00
toaster
975ed1f136 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into new-menus
# Conflicts:
#	src/d_main.c
2022-09-07 21:39:34 +01:00
Oni
129d1230d1 Merge branch 'correctsparkcolors' into 'master'
Modified Driftspark colors

See merge request KartKrew/Kart!667
2022-09-07 08:06:26 +00:00
VelocitOni
813751d9c0 Consistent color scale
Driftsparks now go through grey, yellow, red, and blue; instead of yellow, red, blue, purple. This is consistent with every other scale of power in the game.
2022-09-07 03:45:20 -04:00
Sally Coolatta
3149d7738f Revert "vsync is not broken anymore thanks to both Eidolon and jart's efforts"
This reverts commit 59044e7389.
2022-09-07 01:31:48 -04:00
Oni
ea3818d285 Merge branch 'hear-pain' into 'master'
Improved MKSC-style hit confirms

See merge request KartKrew/Kart!659
2022-09-07 04:44:03 +00:00
Oni
a6c35a2191 Merge branch 'fast-fall' into 'master'
Fast falling

See merge request KartKrew/Kart!660
2022-09-07 04:37:48 +00:00
Sally Coolatta
abeec10d32 Brightmap loading uses hashes
# Conflicts:
#	src/k_brightmap.c
#	src/k_brightmap.h
2022-09-06 19:48:41 +01:00
Sally Coolatta
c145d12db3 Use hashes for terrain loading 2022-09-06 19:39:27 +01:00
toaster
be7357e8a5 Merge branch '14plus-mergeladder' into 'master'
1.4+ Mergeladder

See merge request KartKrew/Kart!654
2022-09-05 19:35:32 +00:00
James R
787b5283fc Fix big blunder by MEEEEEEE
Blame 37c3a55dd
2022-09-05 12:16:59 -07:00
SteelT
cb46f8de39 Turn the console warning into a devmode print because turns out it happens more often than I thought
(cherry picked from commit 893ea10a677274b8cb3aa0987f22f162521b6311)
2022-09-05 11:56:30 -07:00
SteelT
c73d3b4244 Spawn MT_RAY when attempting to spawn MT_NULL
Some code assumes that P_SpawnMobj can never return NULL
So spawn MT_RAY in it's place when attempting to spawn MT_NULL and show a console warning

(cherry picked from commit 34f8464cbfc01adf1650da1311a0751fce5b0678)
2022-09-05 11:56:30 -07:00
spherallic
3a2fe22485 Don't read or set MT_NULL's properties in A_SkullAttack
(cherry picked from commit 878b4dc5b6025e1deef775ccb72b8a871833598a)
2022-09-05 11:56:30 -07:00
James R
707f487f92 Never spawn MT_NULL
(cherry picked from commit a8c658b545e3c7709212a43489163f33ffbe91f0)
2022-09-05 11:56:30 -07:00
James R
72342338b1 Use P_CheckMove
(cherry picked from commit 9dfa153e7497403d874e980868b7aa6d15595286)
2022-09-05 11:56:30 -07:00
James R
ba1b6bb253 Add P_CheckMove
Checks if P_TryMove would succeed without actually moving.

(cherry picked from commit 518de0ce104166c3eacd10ebe6ade422307ce671)
2022-09-05 11:56:30 -07:00
James R
b17717babe A_LobShot: remove ???
MT_NULL spawning, not cool bro.

(cherry picked from commit f6f002e70b645982dddd83d6f831a601faa0fdae)
2022-09-05 11:56:30 -07:00