Louis-Antoine
d4393925c7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake
2020-05-10 11:00:30 +02:00
Sally Coolatta
b4f8d708a4
Merge branch 'master' into new-menus
2020-05-09 17:04:10 -04:00
ThatAwesomeGuy173
972d052c67
Display refusal message if there is no HTTP source and internal downloads are disabled
2020-05-09 06:06:21 -06:00
Sally Coolatta
4a3262da41
Initial GP commit
...
Has a rudimentary option in the menu, which spawns the specific bots & spawns you on Green Hills in singleplayer.
2020-05-09 03:42:51 -04:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
Louis-Antoine
d3d01dd8eb
Fix compiler warning
2020-05-05 14:05:19 +02:00
Sally Coolatta
2188391d42
add botvars to resynch packet
2020-05-04 20:37:52 -04:00
Sally Coolatta
766c6da005
Give bots servernode, D_NumPlayers no longer counts bots
2020-05-04 19:49:18 -04:00
Sally Coolatta
2dfa20f758
Merge branch 'master' into pet-robo
2020-05-03 23:08:00 -04:00
James R
77ddf635a5
Use a random port when connecting
...
(cherry picked from commit f584b61c93a97e1a9852f306acba673ced21e03a)
2020-05-03 18:35:51 -07:00
James R
d1fb8f42f2
Fix switching the master server
2020-04-28 14:21:57 -07:00
Louis-Antoine
0540548a98
Update sound and closed captions in connection screen
2020-04-28 00:37:58 +02:00
Louis-Antoine
829bb84b5e
Minor adjustements in Snake minigame
2020-04-27 23:15:18 +02:00
Louis-Antoine
1c78e9cdfb
Add bonuses and maluses to Snake minigame
2020-04-27 23:10:13 +02:00
Louis-Antoine
3ab29047bd
Add pause and retry to Snake minigame
2020-04-27 22:06:32 +02:00
Louis-Antoine
0bdf93e48d
Add a background to Snake minigame
2020-04-27 15:31:38 +02:00
Louis-Antoine
3c43515cbd
Use sprites for snake and apple
2020-04-27 13:01:14 +02:00
James R
29bf51bc99
Make mod update, room list and server list multithreaded
...
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-04-26 19:46:35 -07:00
Louis-Antoine
4b94ebd8fd
Lower the download progress bar
2020-04-26 21:57:17 +02:00
Louis-Antoine
472be36b87
Prevent edge warping in Snake minigame
2020-04-26 21:17:15 +02:00
James R
908013f02e
Download mismatched md5sum with http
...
This is from 7176aaf3
2020-04-26 01:29:40 -07:00
James R
9640cb1635
Fallback you doofus!
2020-04-26 01:28:01 -07:00
Wolfy
f35bdf3bb7
Revert basically every attempted join passwords fix
2020-04-26 01:20:46 -07:00
James R
6613b19220
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
James R
720e08c14d
Revert "Reorder join process so password is authenticated before attempting to download"
...
This reverts commit 7176aaf36f
2020-04-26 01:12:40 -07:00
James R
de9a156884
Revert "Don't send httpsource in SERVERINFO if join password is set"
...
This reverts commit ffd120f597
2020-04-26 01:12:39 -07:00
James R
82b3649ad6
Revert "Request a download after completing the join challenge"
...
This reverts commit 98478d6712
2020-04-26 01:11:25 -07:00
Louis-Antoine
90ef711412
Fix compiler warnings
2020-04-24 22:19:05 +02:00
Louis-Antoine
151fe6be07
Improve controls handling in connection screen minigame
2020-04-24 19:27:42 +02:00
Louis-Antoine
0928375bc4
Add a Snake minigame to the downloading screen
2020-04-24 19:27:29 +02:00
Louis-Antoine
ccf4bbe194
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
Sally Cochenour
372544d28f
Merge branch 'master' into pet-robo
2020-04-22 21:54:40 -04:00
Wolfy
c40f1bf60d
Shut the compiler up
2020-04-21 19:25:18 -05:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05: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
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
