Commit graph

19647 commits

Author SHA1 Message Date
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
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
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
James R
aa5063668e hooklib: revert ps_lua_mobjhooks to pre perfstats averaging refactor (77ecfb9cdc)
Revert later
2022-09-05 11:56:30 -07:00
James R
37c3a55dda Fix conflicts 522467a88 2022-09-05 11:56:30 -07:00
James R
b4d1fade5f Apply b4fa98d2f to lua_hudlib.c
Continued from 544812a45
2022-09-05 11:56:30 -07:00
James R
ceeda5c826 Lua hooklib refactor squash
commit 8d382e49fb3411cad1a3ef5ee1e546030c3a9d93
Author: James R <justsomejames2@gmail.com>
Date:   Tue Nov 17 04:14:45 2020 -0800

    Big Large Lua Hooklib Refactor

    * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
      to, at the most basic level, only two calls.
    * Lua tables (the array part) are used to index hooks. Such tables contain only
      hooks of the same type.
    * Hook types are defined in one place so you no longer need to sync up the enum
      and name array.

commit 3f7c2ae0b0c450cb8993ffe7664ead05fd9f5000
Author: James R <justsomejames2@gmail.com>
Date:   Thu Dec 10 05:39:53 2020 -0800

    Avoid using multiple tables to fetch hook

    String hooks still use a table to fetch the id, but the id indexes a C array.

    Also I fixed a missing call in the MusicChange hook.

commit dbd8903a538e7b87061795ce27ec5c72c26743af
Author: James R <justsomejames2@gmail.com>
Date:   Thu Dec 10 08:50:23 2020 -0800

    Use ref for pushing error handler

commit 9ddeb5f5896de0407b2b6fce8c949295a9e6d5e4
Author: James R <justsomejames2@gmail.com>
Date:   Sat Dec 12 02:05:21 2020 -0800

    Resolve GameQuit hook conflicts

commit 93e4f43e4b3a24fc2d8032e8730cbf427e75b297
Author: James R <justsomejames2@gmail.com>
Date:   Sat Dec 12 03:06:57 2020 -0800

    Hooklib macros names -> uppercase + documentation

commit 80fe39bbd1433c91131d2cdb36ba709f37d3b5f3
Author: Steel Titanium <steeltitanium1@gmail.com>
Date:   Mon May 3 01:40:02 2021 -0400

    Fix MusicChange hook not returning some values correctly

commit 46ca9613c68422a26910cbb034a9f3e004a967c3
Author: James R <justsomejames2@gmail.com>
Date:   Thu Jun 10 18:09:39 2021 -0700

    Pop hook id fetched from table

commit a75d4a1c360874a3c301a494e38ea49cd89b6616
Author: James R <justsomejames2@gmail.com>
Date:   Tue Jul 6 18:42:08 2021 -0700

    Automatically count hook values

commit 331329306cad257d52f84e47a92d9214d9eaa8d3
Author: James R <justsomejames2@gmail.com>
Date:   Tue Jul 6 19:12:47 2021 -0700

    Refactor hook ref allocation

commit ae57b6ca8664e00ff4d9544339dbf29a41138040
Author: James R <justsomejames2@gmail.com>
Date:   Tue Jul 6 20:23:38 2021 -0700

    MORE MACROS

    I just can't stop myself!

commit b4fa98d2fbab180f487ce3efedb8ab715e5f3390
Author: James R <justsomejames2@gmail.com>
Date:   Wed Jul 7 00:23:51 2021 -0700

    Refactor hudlib hooks to hooklib

    HUD hooks now meet the standard of hooklib. HUD registry
    magic numbers are gone.

    HUD hooks may also be added using addHook.

        addHook('HUD', fn[, type])

    hud.add still exists, but the intention is to remove it
    eventually.

commit cb619fad5d762ba8d8dd20e9a979a04ced7c943f
Author: SMS Alfredo <65426124+SMS-Alfredo@users.noreply.github.com>
Date:   Wed Jul 7 19:57:28 2021 -0500

    Rebase on !1307

commit f271f88c7f3084523a03ca7f47060d6527724796
Author: LJ Sonic <lamr@free.fr>
Date:   Sun Dec 5 17:59:33 2021 +0100

    Fix MusicChange hook crashing when called

    BRUH MOMENT BRUH MOMENT
    PREPARE THE HALL OF SHAME

commit 0a0c17da7c793ec29e80c5bdaa66b02da0884078
Author: James R <justsomejames2@gmail.com>
Date:   Tue Feb 1 02:27:27 2022 -0800

    PARANOIA: I_Error if mobj hook is called with MT_NULL

commit 86336d6bed80bee6f8168078aa8856109091e50f
Author: katsy <katmint@live.com>
Date:   Mon Mar 7 18:33:15 2022 -0600

    remove MODID check from hooklib to fix compile issue
2022-09-05 11:56:04 -07:00
Sally Coolatta
7a91e5b6b5 Don't allow ebrake in tumble 2022-09-05 11:56:11 -04:00
Sally Coolatta
98ec1779d9 Reimplement follower hit confirm 2022-09-05 11:30:12 -04:00
Sally Coolatta
38dc572699 Reset fast falling in P_ResetPlayer
Resets it for springs
2022-09-05 10:58:50 -04:00
Sally Coolatta
eb7e2287c4 Change bounce behavior
- Always allow bounce after fast fall
- Allow for more bounces
- Lose speed on bounces that don't reach max
2022-09-05 10:54:16 -04:00
Sally Coolatta
1eb1309032 Remove step-down change 2022-09-05 10:41:06 -04:00