Commit graph

16229 commits

Author SHA1 Message Date
Sally Coolatta
42ac955584 Don't reset menu in drawing function 2020-08-21 04:17:36 -04:00
Sally Coolatta
f000756448 Merge branch 'discord-rpc-support' of https://git.magicalgirl.moe/KartKrew/Kart into discord-rpc-support 2020-08-21 04:14:36 -04:00
Sally Coolatta
734b099202 Invite menu started
Functions! Is not pretty yet!
2020-08-21 04:14:33 -04:00
James R
368ed6ad1e curl_global_cleanup 2020-08-20 22:36:41 -07:00
Sally Coolatta
3949826f89 Don't show map image for title screen demos 2020-08-21 01:18:40 -04:00
Sally Coolatta
d4a530ac5e XOR IP addresses before sending them to Discord
Not complex because we aren't sending anything that isn't easily accessible via the Master Server anyway, just means we aren't sending plain-text IPs to Discord. Might be improved by basing the XOR key on other values (base RNG, maybe version) so that it's not like *right* there
2020-08-21 01:16:11 -04:00
Sal
6dace9aeff Merge branch 'conenction-screen-improvements' into 'next'
Connection screen improvements

See merge request KartKrew/Kart-Public!187
2020-08-21 00:11:37 -04:00
Ashnal
7c5a969473 Fixed retry timeout to no ttrigger when starting a local server 2020-08-20 23:38:04 -04:00
Ashnal
60cfc091e5 Add return false to the connect timeout 2020-08-20 23:09:12 -04:00
James R
a09592b5da Merge remote-tracking branch 'origin/master' into next 2020-08-20 19:55:03 -07:00
SteelT
ccff8dc2ba Attempt to fix joining netgames being broken 2020-08-20 20:28:48 -04:00
FlykeSpice
2d9ec1687c Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
Sal
d698705f5e Merge branch 'port-port-port' into 'master'
2.2's random client port

See merge request KartKrew/Kart-Public!201
2020-08-20 12:19:52 -04:00
Sal
4bf5e5a020 Merge branch 'snapback' into 'master'
Instantaneous lookback camera (v2 backport)

See merge request KartKrew/Kart-Public!203
2020-08-20 12:19:41 -04:00
Sal
d9cc5f1627 Merge branch 'gme-fixes-cleanup' into 'master'
GME cleanup and fixes

See merge request KartKrew/Kart-Public!202
2020-08-20 02:07:19 -04:00
lachwright
49fa372b8d Instantaneous lookback camera (v2 backport) 2020-08-20 13:41:03 +08:00
Ashnal
538ec7e61d Well actually, lets fix all comparisons of askset to use the same comparison
If we initialize to I_GetTime() - NEWTICRATE*3 it never underflows and everything is good
2020-08-20 00:54:18 -04:00
Steel Titanium
8ad5eaad2e GME cleanup and fixes
Just some stuff backported from SRB2 2.2, well mostly

get_zlib_error function to reduce code duplication

Return false if it fails to load the VGZ lump

Reduce redundant calls to gme_set_equalizer

Fix sometimes loading a VGZ crashing the game
2020-08-19 22:39:12 -04:00
James R
2c3b30de90 -clientport (it's back!) and -serverport, which is an alias to -port
If you ever need to, you can change the client port number.

(cherry picked from commit 17749b9e3e)
2020-08-19 18:16:54 -07:00
James R
e3a383aafc Use a pointer for port_name
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.

(cherry picked from commit 5921e1a567)
2020-08-19 18:16:53 -07:00
James R
d365ea7981 Use a random port when connecting
(cherry picked from commit 8368449e6c)
2020-08-19 18:16:53 -07:00
James R
328dd607d8 Fix tiny mistake with the last commit 2020-08-19 17:55:01 -07:00
James R
240cc0b1d1 Rearrange time comparsion on asksent to make it underflow friendly
This fixes '-connect'. NEWTICRATE*5 is subtracted from asksent after
CL_LOADFILES. If this happens too early, an underflow will occur.
2020-08-19 17:49:47 -07:00
Sal
6cda24cd2b Merge branch 'fix-nocurl' into 'master'
Fix NOCURL compiling

See merge request KartKrew/Kart-Public!197
2020-08-19 20:36:14 -04:00
Sal
ed82eda30b Merge branch 'httpsource-without-curl' into 'master'
Let servers send httpsource without curl

See merge request KartKrew/Kart-Public!196
2020-08-19 20:36:06 -04:00
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
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
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
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
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
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
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