Commit graph

808 commits

Author SHA1 Message Date
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
Sally Cochenour
422f528056 Remove prints, adjust things 2020-04-19 10:12:02 -04:00
Sally Cochenour
21bab775b1 Add difficulty settings 2020-04-19 09:07:29 -04:00
James R
f87e82ca66 Fuck acks!!!! 2020-04-18 18:47:57 -07:00
James R
98478d6712 Request a download after completing the join challenge 2020-04-18 18:45:50 -07:00
James R
94267608c4 WHY THE FUCK DID I DO THIS 2020-04-15 22:04:55 -07:00
James R
ce4161d985 Compiler errors: won't stop, can't stop 2020-04-13 23:31:26 -07:00
James R
d15024482d Kill the old mserv, long live HMS! 2020-04-13 22:23:01 -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
Sally Cochenour
da953c9dae 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
2020-04-12 23:51:00 -04:00
Wolfy
9d31786c8c Fix off by one error in http downloader 2020-04-12 21:14:33 -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
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
Sally Cochenour
d0a6c43c89 Minor things 2020-04-09 02:52:41 -04:00
James R
9f1c616817 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Steel Titanium
eafa6a53a7 Fix even more build errors 2020-04-07 19:14:27 -04:00
Steel Titanium
f25235d1eb Fix some build errors 2020-04-07 19:07:39 -04:00
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04:00
Wolfy
6ea0492008 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Latapostrophe
29781688e8 Merge branch 'v1-ignore-posthumous-ackret' into awful-mix 2020-04-05 11:23:49 +02:00
Latapostrophe
dc00dbdeee Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret 2020-04-05 11:23:29 +02:00
James R
0ee1628b51 Send bot status in servercfg 2020-04-01 20:10:50 -07:00
Steel Titanium
c1aac7c06e Merge branch 'master' into next 2020-03-31 20:46:54 -04:00
Louis-Antoine
dece2adbe6 Fix allowjoin off affecting single player 2020-03-30 22:11:48 +02:00
Sally Cochenour
ff621d3e46 Skins, rudimentary ticcmd building for bots 2020-03-28 12:39:27 -04:00
Louis-Antoine
b0b21aada6 Fix disconnected players being kicked for high ping 2020-03-28 15:23:15 +01:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
Sal
b54531c9f6 Merge branch 'gentlemen-no-spectators' into 'master'
Ignore spectators for gentlemen's ping

See merge request KartKrew/Kart!221
2020-03-23 16:10:47 -04:00
James R
90d415ccc0 Ignore spectators for gentlemen's ping 2020-03-22 18:55:28 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sal
82a39f6c85 Merge branch 'kill-whitespace' into 'master'
Kill CRLF and trailing whitespace

See merge request KartKrew/Kart!216
2020-03-22 20:31:08 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
James R
d46c6dc384 Kill trailing whitespace 2020-03-21 17:37:33 -07:00
James R
8a28d3cfe5 Replace some instances of int with fixed width types 2020-03-21 13:12:50 -07:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
SteelT
2e25a5b56d Merge branch 'viewpointswitch-fix' into 'next'
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
LJ Sonic
21cb05b1f7 Merge branch 'fix-playernode-crash' into 'next'
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Latapostrophe
5f11f7b8df Remove debug prints 2020-03-11 19:53:52 +01:00
Latapostrophe
b7702f5ff5 Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix 2020-03-10 21:46:12 +01:00
Latapostrophe
5147cabff2 Remove debug print 2020-03-10 10:21:47 +01:00
Monster Iestyn
8d7d0c4dc5 Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
colette
e4a3fcea26 Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
fickleheart
88198bce13 I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs 2020-03-07 12:40:45 -06:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
TehRealSalt
7d32f9b6c3 Replay playback changes:
- Store level state periodically
- Load the closest usable level state when done rewinding for
  quicker resumes
- Make playback menu fade out after 5 seconds of no activity
  (but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
  at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo

from fickleheart
2020-03-05 21:04:56 +01:00