Commit graph

20142 commits

Author SHA1 Message Date
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
toaster
f901ce0f00 Only calculate wipeout slowdown if the player's speed > 0 2022-09-07 14:04:22 +01:00
toaster
54e03194ea Ignore client joins while loading a level, to prevent a myriad of join bugs.
Slightly rewritten from Jugador's, to prevent spurious DEBFILE prints of unknown packet type
2022-09-07 13:50:26 +01:00
toaster
925e05a8a0 Sink painstate crash fix 2022-09-07 13:33:40 +01:00
toaster
4d52ca53e7 Make P_SpawnGhostMobj ghosts properly copy spritestuff2 variables
- spritexscale
- spriteyscale
- spritexoffset
- spriteyoffset
- renderflags
2022-09-07 13:24:31 +01:00
toaster
7adca2ef19 Fix papersprites being rotated incorrectly in Software when viewing them on the flipped side
Rewritten version of STJr/SRB2!1770
2022-09-07 13:05:40 +01:00
LJ Sonic
8880285222 Remove downloadspeed cruft
# Conflicts:
#	src/d_clisrv.c
2022-09-07 12:33:56 +01:00
toaster
3dc2e3230d Manual zip-together of Ashnal's cvar suggestions and LJSonic's download speed cap raise
- Lowered resynchattempts
- Increased maxsend and downloadspeed
- Increased max downloadspeed
- Doubled nettimeout and jointimeout
2022-09-07 12:33:04 +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
b696b1e378 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into sdl-vsync
# Conflicts:
#	src/sdl/i_video.c
2022-09-06 19:19:22 +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
toaster
9e11eff9d8 Perform incantations so the byteptr.h macros are valid ISO C 2022-09-05 16:49:27 +01:00
toaster
e9d7c2eee3 Fix regressions in merge process
- Re-replace `hu_font` with `fontv[HU_FONT].font`
- Re-init hu_keystrokes
2022-09-05 16:38:23 +01:00
LJ Sonic
d5367d2e65 Fix message sending code using hardcoded buffer size 2022-09-05 16:38:23 +01:00
LJ Sonic
9f37c240a4 Fix long chat messages causing net command failures 2022-09-05 16:38:22 +01:00
LJ Sonic
0036559bef Add SKIPSTRINGL macro 2022-09-05 16:38:22 +01:00
LJ Sonic
32e7442d00 Revert "Fix long chat messages causing net command failures"
This reverts commit 13778247990d60c2ad8aa5729bc0397ab764eaaa.
2022-09-05 16:38:22 +01:00
LJ Sonic
75e4f07e12 Fix say command and its variants using hardcoded buffer size 2022-09-05 16:38:22 +01:00
LJ Sonic
8558323c44 Add READSTRINGL and WRITESTRINGL macros 2022-09-05 16:38:21 +01:00
LJ Sonic
c7e495bf8b Make byte stream manipulation code easier to read
# Conflicts:
#	src/byteptr.h
2022-09-05 16:38:21 +01:00
LJ Sonic
d3d2205932 Fix long chat messages causing net command failures 2022-09-05 16:38:21 +01:00
LJ Sonic
47c7351928 Support delete key in chatbox 2022-09-05 16:38:21 +01:00
LJ Sonic
94f691f216 Fix long chat messages crashing the game 2022-09-05 16:38:20 +01:00
LJ Sonic
de4eed6af2 Add SKIPSTRINGN macro 2022-09-05 16:38:20 +01:00
LJ Sonic
bc62dc8214 Fix single-letter messages not being sent 2022-09-05 16:38:20 +01:00
LJ Sonic
cf6dfecc6a Cleanup chat event handling
# Conflicts:
#	src/hu_stuff.c
2022-09-05 16:38:20 +01:00