Commit graph

7385 commits

Author SHA1 Message Date
James R
b8bfe9b83a Use STUN instead of curl to fetch the public IP address for Discord
RFC 5389 is a standard protocol that can be used for this instead of ip4.me.

I may have gone overboard on the CSPRNG... It was fun though.
2020-09-30 03:57:50 -07:00
James R
a39762a8fd Mute music instead of pausing if lose focus 2020-09-28 11:58:24 -07:00
Monster Iestyn
8a5fd38bca clarify the situation a bit more in the comments
(cherry picked from commit 5c33ff04581abe44e1c8ad03e680ff918b9dc0d2)
2020-09-27 16:50:43 -07:00
Monster Iestyn
31237935da move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified
(cherry picked from commit 903cc311a711d80436215e7f7c897a447daf2539)
2020-09-27 16:50:43 -07:00
James R
93a76c10de Don't let us warp to a map that doesn't exist (really!)
Okay so 6464df9876e472d1210aabce4237d02af38377e1, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.

(cherry picked from commit 566b4a1626399b1c1621bf8b4ab1f8426c789c36)
2020-09-27 16:50:43 -07:00
James R
9e33e16d26 If we move the -warp code down, map searching can be used
(cherry picked from commit 404f3c13e4ed1d9e1a375bba1c2ae59b4f694e0e)
2020-09-27 16:50:43 -07:00
James R
9885ab164a I'm still an idiot
(cherry picked from commit 0a014755b98fb909aed4a12feba00744bc2af225)
2020-09-27 16:50:42 -07:00
James R
9a2ff50f5a Who cares?
(cherry picked from commit 2ffff56b391235257c65eb23e539926c4da6ac62)
2020-09-27 16:50:42 -07:00
James R
52a863d1fd Split map code checking from Command_Map_f
(cherry picked from commit 19aafbfd0b9bde40809ca91195d4636899504708)
2020-09-27 16:50:42 -07:00
James R
1adae3deea Maybe I'm mistaken but this probably isn't needed
(cherry picked from commit 6464df9876e472d1210aabce4237d02af38377e1)
2020-09-27 16:50:17 -07:00
James R
bd253c0e7e Use a third variable of XOR nonsense
(cherry picked from commit d5816d44f337c6eb82d937959f971fe45a5eec2a)
2020-09-27 16:50:17 -07:00
James R
e5fa66a2a9 Warn if gametype number is out of range to map command
(cherry picked from commit 6ffb18c4b157f9efecec6a104ef930dd71f8b986)
2020-09-27 16:50:01 -07:00
James R
401f30f27d Check for out of range gametype on map change
(cherry picked from commit 9b96964cbbfc20565a8cfdb741f4927f36df7899)
2020-09-27 16:50:01 -07:00
James R
05246f36a6 Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL
(cherry picked from commit c5d73e37bbc0c9fa8fd1dd874ac782b655068576)
2020-09-27 16:50:01 -07:00
James R
dc23895875 Add back the encore parameter 2020-09-27 16:50:01 -07:00
James R
19443fec4c Merge descrepancies 2020-09-27 16:50:01 -07:00
James R
a5bf7719e7 Warn if the gametype is not valid at all!
(cherry picked from commit 7776c59cddaa4cc09dfdb2f15192a194fda36eb7)
2020-09-27 16:50:01 -07:00
James R
7c3aedc48e Optimizations from LJ and generic functions
(cherry picked from commit 359d8a2c254222d4e44934ec71d56b9511dd9379)
2020-09-27 16:50:01 -07:00
James R
9a054ab989 Warn if the first argument is an option
(cherry picked from commit c9aad2d1862e92fc78d8dfbd5d1f2c5969d90d84)
2020-09-27 16:50:01 -07:00
James R
93c351a38e Get map name from multiple arguments
(This means you don't need quoting.)

(cherry picked from commit 46fbed8b716f96a7e87ac4c68ca3ee98c8c6a25c)
2020-09-27 16:50:01 -07:00
James R
fb858dd64b So you don't like macros?
(cherry picked from commit 5fd6561d464d53521343dd4abae6b08e42719885)
2020-09-27 16:50:01 -07:00
James R
3506ae6d1d :oh:
(cherry picked from commit fb9421893e555629f0fe42705f034e0b639c6905)
2020-09-27 16:50:01 -07:00
James R
c7a31ea5de Oh right, the keywords...
(cherry picked from commit a922de8242143a55eb0c19cc5a65bb9126213f29)
2020-09-27 16:48:50 -07:00
James R
d630706377 Merge remote-tracking branch 'origin/master' into map-by-name 2020-09-27 16:10:44 -07:00
James R
e2749f8fdc Include d_main.h 2020-09-25 11:25:15 -07:00
Sal
2d7590ed39 Merge branch 'luafiles-srb2home' into 'master'
Open lua files in srb2home

See merge request KartKrew/Kart-Public!234
2020-09-24 23:23:02 -04:00
James R
b70d765144 Prepend srb2home to luafiles 2020-09-24 14:43:21 -07:00
Sal
680b8e3477 Merge branch 'engine-sounds-fix' into 'master'
Fix engine sound volume

See merge request KartKrew/Kart-Public!231
2020-09-20 17:07:31 -04:00
Sally Coolatta
7b6d527bd4 Griefing timer
Spectates/kicks players who aren't making progress, does it even faster if they're going backwards.
2020-09-20 17:03:14 -04:00
Sal
1906bf3817 Merge branch 'link-with-exchndl' into 'master'
Link with exchndl, instead of dynamically loading it.

See merge request KartKrew/Kart-Public!230
2020-09-19 15:42:00 -04:00
Sal
7c829dcb97 Merge branch 'silly-numbers' into 'master'
Kill some nonsense

See merge request KartKrew/Kart-Public!232
2020-09-19 15:41:51 -04:00
James R
0523114f56 Kill some nonsense 2020-09-18 13:11:49 -07:00
Sally Coolatta
eb0a3c9da3 Make it a bit louder 2020-09-18 01:10:59 -04:00
Sally Coolatta
e81a5ee0ca Spectator re-entry cooldown 2020-09-18 00:58:05 -04:00
Sally Coolatta
21422703f5 Fix engine sounds' dampening to a sane value, now that the bug preventing it from working properly was fixed.
You can hear engines in 16P again, but it's not as obnoxiously loud as it was before. Additionally, I commented this function better.
2020-09-17 18:58:44 -04:00
Steel Titanium
13a34e2545 Link with exchndl, instead of dynamically loading it.
It caused problems with crash reports not being made if the current working directory gets changed. Not even recommended anymore per the drmingw readme
https://github.com/jrfonseca/drmingw#exchndl
2020-09-17 15:59:02 -04:00
Sal
ccf6584466 Merge branch 'disable-rpc-in-dedicated' into 'master'
Disable Discord Rich Presence on dedicated servers

See merge request KartKrew/Kart-Public!229
2020-09-16 01:43:40 -04:00
James R
fbfc305e47 Disable DRPC if dedicated 2020-09-15 19:56:08 -07:00
Sal
85726d7a55 Merge branch 'advertisement-for-rpc' into 'master'
Move master server presence updates to Advertise_OnChange

See merge request KartKrew/Kart-Public!227
2020-09-15 16:22:32 -04:00
Sal
c575bc0398 Merge branch 'more-helpful-lua-error' into 'master'
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened

See merge request KartKrew/Kart-Public!228
2020-09-15 16:22:13 -04:00
Steel Titanium
9b180acdd7 Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened
Shouldn't break scripts as it stops execution as soon it happens, like it already does.
2020-09-14 23:01:47 -04:00
Sally Coolatta
5181ddd67c Move master server presence updates to Advertise_OnChange
This will probably call DRPC_UpdatePresence slightly less?
2020-09-14 16:34:17 -04:00
Sal
18adf478ca Merge branch 'small-to-issmall' into 'master'
Rename the "small" variable to "isSmall"

See merge request KartKrew/Kart-Public!226
2020-09-14 13:07:17 -04:00
Sally Coolatta
e8c91b6727 Rename the "small" variable to "isSmall"
Reported by MK, apparently "small" is considered a data type for some systems. After a little bit of research, apparently it can happen when including <windows.h>... whatever, just rename the variable :p
2020-09-14 12:47:55 -04:00
James R
6f8d246db8 Merge branch 'master' into next 2020-09-13 14:39:01 -07:00
James R
5755bab29a Makefile: add WINDOWSHELL=1 for the Windows detect
(cherry picked from commit 6f51c68c7248d616ad16f66b72cfcc36b7c952f5)
2020-09-13 14:25:08 -07:00
James R
1dca1a3f47 Makefile: automatically detect system to compile for, if no system was specified
This should work for mingw and linux so far.

(cherry picked from commit f92026f98b168f4556d50d3dde403ab6bfd97ff3)
2020-09-13 14:25:08 -07:00
James R
00ff94caa2 Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
(cherry picked from commit 9495e6354fed1028c6fc502cc9d946cfdd0b7896)
2020-09-13 14:25:07 -07:00
James R
8c7f9f85fe Is it GCC is it gcc, is it????
(cherry picked from commit ef2bff6383b16385f9874e1c9c6b66c9df794f5b)
2020-09-13 14:24:49 -07:00
James R
655c694bbc Update LATEST_GCC_VERSION too
(cherry picked from commit 4059c6a654a5785199cf0d6dd998bf113b57cd0f)
2020-09-13 14:22:46 -07:00