Commit graph

6681 commits

Author SHA1 Message Date
James R
b8942a5e68 SRB2APPLICATION: this is jart! 2020-04-20 20:22:17 -07:00
James R
6eae2b5243 Make the PACKETVERSION rule easier
(cherry picked from commit 4214397679c70a7910c82126783b434f0d10343e)
2020-04-20 20:22:04 -07:00
James R
6fd3d2641c Remove adminplayer from SERVERINFO (PACKETVERSION 2)
(cherry picked from commit 339ceafdf03a54cb562d70079f15587acd639619)
2020-04-20 20:22:01 -07:00
James R
2111cc2be6 More fine tuned versioning
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.

(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
2020-04-20 19:59:42 -07:00
wolfs
fb0e699aec Merge branch 'fixsignalhandler-resurrection' into 'awful-mix'
2.2 signal handler

See merge request SinnamonLat/Kart-Public!11
2020-04-20 22:42:59 -04:00
Hannu Hanhi
4dfe60ad46 Fixed and faster transparency sorting for OGL. For easy comparison, check Ethereal Crystal in Abstraction Pack 2020-04-19 18:42:03 +03:00
Hannu Hanhi
c2407368f6 Fix skywalls in ogl. Similar to 6a53837d in master. 2020-04-19 18:19:16 +03:00
wolfs
8a4cde70ee Merge branch 'more-descriptive-error' into 'awful-mix'
Show more descriptive error on failed downloads

See merge request SinnamonLat/Kart-Public!10
2020-04-19 00:27:56 -04:00
Wolfy
146164f1b7 Make the deployer use the new version format 2020-04-18 23:18:39 -05:00
colette
d04a244cad FOV fixes
# Conflicts:
#	src/r_main.c
2020-04-18 23:13:54 -05:00
Steel Titanium
87c7f1f797 Show more descriptive error on failed downloads 2020-04-19 00:13:30 -04:00
wolfs
43944d29b4 Merge branch 'remove-download-file' into 'awful-mix'
Remove the correct file when http download fails

See merge request SinnamonLat/Kart-Public!9
2020-04-18 23:35:21 -04:00
wolfs
ebdb28242f Merge branch 'awful-mix-httpfixes' into 'awful-mix'
Fix super lol compile errors

See merge request SinnamonLat/Kart-Public!7
2020-04-18 23:34:41 -04:00
wolfs
8b89fe7b6c Merge branch 'awful-mix' into 'awful-mix'
Require join password authentication to download, also hide http source behind PT_DOWNLOADFILESOKAY

See merge request SinnamonLat/Kart-Public!6
2020-04-18 23:33:41 -04:00
James R
f87e82ca66 Fuck acks!!!! 2020-04-18 18:47:57 -07:00
James R
5febf5b2d7 Don't strip directory before removing failed http download 2020-04-18 18:47:20 -07:00
James R
98478d6712 Request a download after completing the join challenge 2020-04-18 18:45:50 -07:00
James R
a4ef8dd401 Multithreading in my SRB2??? 2020-04-17 20:05:29 -07:00
James R
94267608c4 WHY THE FUCK DID I DO THIS 2020-04-15 22:04:55 -07:00
James R
2aca9918f0 Oops 2020-04-14 19:41:32 -07:00
James R
238e5099ac Handle NULL hms buffer 2020-04-14 16:55:14 -07:00
James R
ce4161d985 Compiler errors: won't stop, can't stop 2020-04-13 23:31:26 -07:00
James R
0e7678a5d5 masterserver_update_rate cvar determines wait between updates in minutes
The new default is 15 minutes as well. And if you think that's too long, I have
confirmed that the Master Server delists inactive servers after a whopping 40
minutes, at least.
2020-04-13 23:10:06 -07:00
James R
2a9ae68364 Don't try to update right after registering 2020-04-13 22:54:58 -07:00
James R
3440e0307b Add a hack so the 'All' room isn't display for hosting 2020-04-13 22:31:11 -07:00
James R
d15024482d Kill the old mserv, long live HMS! 2020-04-13 22:23:01 -07:00
James R
83464dbf1d Clean up header text 2020-04-13 21:20:29 -07:00
Steel Titanium
71f21dd81b Fix compile errors 2020-04-13 23:07:38 -04:00
James R
f7c726dd71 7176aaf3 also fixed the http downloader not considering checksum mismatched files 2020-04-13 17:48:10 -07:00
James R
f61e916ab6 Whoops I fucked that up 2020-04-13 17:45:02 -07:00
James R
ffd120f597 Don't send httpsource in SERVERINFO if join password is set 2020-04-13 17:40:48 -07:00
James R
7176aaf36f Reorder join process so password is authenticated before attempting to download 2020-04-13 17:30:42 -07:00
Sally Cochenour
53784f9940 No more modulo bullshit in VERSION
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision

# Conflicts:
#	src/doomdef.h
2020-04-12 23:32:15 -05:00
Wolfy
e1ab32a459 oops 2020-04-12 22:47:22 -05:00
James R
219d8c9380 HTTP update alert 2020-04-12 20:37:46 -07:00
Wolfy
9d31786c8c Fix off by one error in http downloader 2020-04-12 21:14:33 -05:00
Wolfy
30f5e928dd Prep stuff
pending asset hash changes
2020-04-12 20:48:11 -05:00
wolfs
4a264ffba9 Merge branch 'http-downloads' into 'awful-mix'
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
James R
d8334f9a8f Fix some goofs 2020-04-12 18:33:53 -07:00
James R
7b2463a040 Bruh 2020-04-12 18:27:01 -07:00
James R
26c0049694 Clean up a bunch of stuff and follow the Master Server API more closely 2020-04-12 18:25:59 -07:00
James R
8a923a5b57 Windows certs do work, thanks Steel! 2020-04-12 17:51:30 -07:00
James R
c4995a5eba Handle more errors 2020-04-12 17:51:05 -07:00
James R
b9f5eaa739 Kill masterserver_token 2020-04-12 17:15:39 -07:00
Steel Titanium
47d70e1ae6 Fix cmake using wrong libs if internal libs is turned on
Use '\0' instead, just in case
2020-04-12 17:56:12 -04:00
Steel Titanium
4bfb583e91 Remove some of these superfluous ifdef checks.
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
Wolfy
bf3b00f43a Fix self-comparison in hw_main.c 2020-04-12 06:47:12 -05:00
Hannu Hanhi
4d5ff9fbe6 Backport from SRB2: Replace NextTexAvail with glGenTextures 2020-04-12 06:39:00 -05:00
wolfs
b14d0a977f Merge branch 'kill-these-please-12' into 'awful-mix'
Compiler errors, again, again

See merge request SinnamonLat/Kart-Public!5
2020-04-12 07:00:05 -04:00
James R
390042ffc5 Even the warning can die, give the programmer some credit
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
2020-04-11 22:10:05 -07:00