Commit graph

17141 commits

Author SHA1 Message Date
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
Sally Coolatta
bd29d0c6bb Check supported skins by name instead of number, so we can have bonuschars images 2020-08-17 04:42:05 -04:00
Ashnal
98ad0248f9 Move code down so declarations are above to appease C90 2020-08-17 04:03:02 -04:00
Ashnal
42f677447d Move declaration to appease C90
also remove some extra tab characters
2020-08-17 03:56:13 -04:00
Ashnal
30f687d0df Fixes for file accounting
mainwads+1 to not use the first mainwad
2020-08-17 03:51:19 -04:00
Ashnal
196514ff21 New message boxes for downloads and full server waiting
Downloads must be confirmed before proceeding
Allows downloading mods for full servers
Client will wait for a slot to open on a full server to join
This has a 5 minute timeout
2020-08-17 03:47:23 -04:00
Sally Coolatta
9bf325eec6 Put the cvar in the menu 2020-08-17 02:31:30 -04:00
Sally Coolatta
59ebf07dd5 Guard discord.h, add cvar to disable rich presence 2020-08-17 02:25:05 -04:00
Sally Coolatta
0c412459bf Merge branch 'master' into next 2020-08-17 02:05:31 -04:00
Sally Coolatta
352449010e Display time elasped/time limit 2020-08-17 02:05:16 -04:00
James R
b681b6e9e6 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
Sally Coolatta
5f86025f05 Use curl to retrieve your own IP address properly 2020-08-17 00:29:52 -04:00
James R
5d739bec6d Remove HAVE_CURL guards on sending httpsource 2020-08-16 20:39:46 -07:00
James R
57019ae532 Merge branch 'IS-IT-1094' into 'next'
REMOVE THE LAST OF CV_ALLCAPS

See merge request STJr/SRB2!1116
2020-08-16 22:45:15 -04:00
Sally Coolatta
c70f706c2a Allow lowercase level name / zone title
Might have some other side-effects, we'll need to see
2020-08-16 22:13:21 -04:00
Sally Coolatta
b5a378f850 Merge remote-tracking branch 'public/master' into discord-rpc-support 2020-08-16 22:12:36 -04:00
Sally Coolatta
7a9e781bea Little fixes 2020-08-16 21:31:03 -04:00
Sally Coolatta
d31c33e035 No previous prototype for K_DropKitchenSink 2020-08-16 21:18:33 -04:00
Sally Coolatta
632df264a3 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
Sally Coolatta
ac29aa86b0 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-16 03:45:51 -04:00
Sally Coolatta
3a94a2db44 enum for the different face icon types 2020-08-16 03:45:09 -04:00
James R
a566a8e245 Revert "Disable animated textures"
This reverts commit 5e13555727.
2020-08-16 00:10:49 -07:00
Sally Coolatta
9863171879 Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object 2020-08-16 03:03:04 -04:00
Sally Coolatta
8fd64ca607 Fix ring usage & gravity 2020-08-16 02:12:17 -04:00
Sally Coolatta
51aef1ce75 Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]" 2020-08-16 01:46:54 -04:00
James R
36885c1343 Merge remote-tracking branch 'origin/the-scary-22-merge' into the-scary-22-merge 2020-08-15 21:35:17 -07:00
James R
6cd395f1ff Even the warning can die, give the programmer some credit
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
(cherry picked from commit 390042ffc5)
2020-08-15 21:34:05 -07:00
James R
b1fb9ed737 Fix more compiler errors 2020-08-15 21:32:02 -07:00
Sally Coolatta
a251c3909b Lots of little fixes
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
James R
246e71a463 Is it GCC is it gcc, is it???? 2020-08-15 21:29:02 -07:00
Sally Coolatta
5e13555727 Disable animated textures 2020-08-16 00:16:17 -04:00
Sally Coolatta
49e2f98beb TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
2020-08-16 00:15:05 -04:00
Sally Coolatta
a2caa2dc16 Character select can open without crashing 2020-08-15 22:40:49 -04:00
Sally Coolatta
ae4ea9eda2 Fix sound effects 2020-08-15 22:29:55 -04:00