Commit graph

16762 commits

Author SHA1 Message Date
Sal
810c93f15a Merge branch 'kart-io' into 'next'
Lua Input/Output library

See merge request KartKrew/Kart-Public!200
2020-08-19 20:35:56 -04:00
Ashnal
37da22c5eb Added m_menu_mutex to M_Drawer in connection screen 2020-08-19 19:52:24 -04:00
James R
325ae01e4b K_DropRocketSneaker: MF2_DONTDRAW -> MFD_DONTDRAW 2020-08-19 16:46:24 -07:00
James R
8f2bfb63bc Merge remote-tracking branch 'pub/next' 2020-08-19 16:45:31 -07:00
Ashnal
28c07d2224 Merge remote-tracking branch 'public/next' into conenction-screen-improvements 2020-08-19 19:08:33 -04:00
James R
d330ad6b01 Merge branch 'ringslinger-penalty-snap' into 'next'
Fix Ringslinger weapon ring penalty missnapment

See merge request STJr/SRB2!1120
2020-08-19 18:18:15 -04:00
James R
288a6c1431 Merge branch 'fix-file-downloading' into 'next'
Fix bug where SRB2 would check size of disk from current directory instead of srb2home

See merge request STJr/SRB2!1121
2020-08-19 18:16:22 -04:00
James R
f30e52f967 Merge branch 'oops-http-mserv' into 'next'
Fix lingering issues with the http-mserv merge

See merge request STJr/SRB2!1117
2020-08-19 18:12:38 -04:00
Ashnal
b53181a62a COnfirm box now respects rebindable accelerate and brake on keyboards 2020-08-19 18:01:56 -04:00
Sally Coolatta
83c3b7cc2d Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-19 00:55:40 -04:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
SteelT
7cd1b99fdb Quit on error fix 2020-08-18 22:45:57 -04:00
Sally Coolatta
b081dd5d7e Make title screen full black
Don't care about making it use our old title screen since we're replacing it anyway
2020-08-18 21:49:37 -04:00
James R
fd4ab28a84 Makefile: automatically detect system to compile for, if no system was specified
This should work for mingw and linux so far.
2020-08-18 18:01:59 -07:00
Sally Coolatta
69fb03d87f Use proper explosions
A_MineExplode was renamed to A_SSMineExplode to not conflict with the vanilla function, but the states were not updated
2020-08-18 21:00:55 -04:00
James R
ce98fc16bd Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS 2020-08-18 16:45:00 -07:00
James R
63ba605f52 Is it GCC is it gcc, is it????
(cherry picked from commit 246e71a463)
2020-08-18 16:37:19 -07:00
James R
9b04a1a45f Merge branch 'showjoinaddress-menu' into 'next'
Add a menu option for showjoinaddress; disable it by default

See merge request STJr/SRB2!1115
2020-08-18 19:15:23 -04:00
GoldenTails
2a27628232 Fix bug where SRB2 would check size of current directory instead of srb2home
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05:00
SteelT
c7dd3b6682 Fix skin face patches not being cached. 2020-08-18 18:32:37 -04:00
SteelT
27945cfad0 Fix being unable to add Lua scripts from the addons menu 2020-08-18 17:55:49 -04:00
Hannu Hanhi
9473de18c5 Convince the compiler that I know what I'm doing, I think 2020-08-18 23:21:26 +03:00
SteelT
ba15c7caf3 Don't let a missing music lump cause an I_Error()
Fix midi lump checking being broken
2020-08-18 15:10:56 -04:00
SteelT
296e974e9d Fix the title music being played early 2020-08-18 15:09:09 -04:00
James R
d082e42d48 Cast UINT16 for unlockable_t.height -> alphaKey 2020-08-18 11:19:16 -07:00
SteelT
d98aee5a8d Restore many missing Kart globals 2020-08-18 13:01:12 -04:00
Sryder
3c10405852 Fix instant crash on startup in OpenGL 2020-08-18 15:58:28 +01:00
Sryder
ac68aeae2b Fix building of debug binary 2020-08-18 15:32:09 +01:00
Sally Coolatta
8ec67e1ff9 Fix mobjscale 2020-08-18 06:36:43 -04:00
Sally Coolatta
08b76dd52f Fix the HUD 2020-08-18 06:09:27 -04:00
Zwip-Zwap Zapony
12b4b7f708 Fix Ringslinger weapon ring penalty missnapment 2020-08-18 11:42:35 +02:00
Sally Coolatta
fc663d4d86 Bots work again 2020-08-18 05:40:21 -04:00
Sally Coolatta
1029c01b05 Fix crash in K_BananaSlopeZ 2020-08-18 05:26:27 -04:00
Sally Coolatta
5259e57553 Remove MF_BOUNCE from MOBJFLAG_LIST 2020-08-18 05:11:42 -04:00
Sally Coolatta
ebec43b727 Fix G_WriteStandings 2020-08-18 05:08:21 -04:00
Sally Coolatta
7419cbde03 Fix Got_NameAndColor 2020-08-18 04:23:08 -04:00
Sally Coolatta
75d05702fb Fix Got_AddPlayer 2020-08-18 04:14:17 -04:00
Sally Coolatta
f5bf0371de Revert "TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig"
This reverts commit 49e2f98beb.
2020-08-18 03:54:31 -04:00
Sal
37ca880353 Merge branch 'kimmy-osx-fixes' into 'master'
[OSX] Fix "SIGILL: illegal instruction" on macOS Catalina

See merge request KartKrew/Kart-Public!194
2020-08-18 03:52:47 -04:00
James R
2492bfe335 Copy the saved wad directory to srb2path 2020-08-17 21:27:59 -07:00
James R
45091555b2 hate hate hate hate 2020-08-17 21:22:25 -07:00
Sally Coolatta
5af0eb7076 Don't show gametype when watching replays 2020-08-17 23:33:55 -04:00
James R
a29785aec3 Save srb2path to %LOCALAPPDATA%\SRB2Kart\lastwaddir, and chdir here if srb2.srb cannot be found
Windows code goes brrr
2020-08-17 20:11:32 -07:00
Latapostrophe
e0dc13e70b Merge remote-tracking branch 'stjr/io' into kart-io 2020-08-17 20:22:02 +02:00
Sally Coolatta
9d304d3d16 Show game speed and encore 2020-08-17 09:08:05 -04:00
Sally Coolatta
1a966f4a11 Don't allow invites if allowjoin is off 2020-08-17 06:55:43 -04:00
Sally Coolatta
0576729ff4 Update presence when maxplayers is changed 2020-08-17 06:52:46 -04:00
Sally Coolatta
1d5251e1f1 Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00
Latapostrophe
1598bfa143 Kill line riding for offroad 2020-08-17 12:01:16 +02:00
Sally Coolatta
8fd0424f15 Add distinct images for map hell & normal custom maps 2020-08-17 04:42:22 -04:00