Commit graph

161 commits

Author SHA1 Message Date
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
4cd47a92dc Merge d_netfil.c 2020-08-10 12:05:23 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Ashnal
6af76ee948 Now that the server doesn't erroneously send the last mainwad
As the first part of fileneeded, we must load file 0
2020-08-09 00:48:53 -04:00
Sally Coolatta
70692f4c3f Merge d_netfil.c 2020-08-02 16:40:22 -04:00
Ashnal
7174299635 Remove now unused ret var 2020-07-04 22:25:02 -04:00
Ashnal
f2990180f6 Fix file number accounting
Should ensure appropriate accounting and prevent loading of
server files if it would put us over MAX_WADFILES
2020-07-02 20:57:33 -04:00
Ashnal
8cfc3520e5 Connection screen no longer freezes up while
searching for addons on disk
Game will run one tic after every file status is updated
2020-07-01 23:48:14 -04:00
Ashnal
f8f6dff748 New "Overall Download Progress" bar
Shows progress of all file downloads pre-join
2020-06-27 21:17:04 -04:00
Ashnal
566cc99cab Load one file per tic
Prevents game from locking up when loading large file lists
2020-06-27 20:58:33 -04:00
Louis-Antoine
36ad16452c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Steel Titanium
6714d9b614 Fix user agent for HTTP downloads being set as SRB2Kart/v1.1.2 2020-06-23 18:39:02 -04:00
Louis-Antoine
04ae70179c Fix "downloads" command reporting incorrect progress 2020-06-01 10:37:05 +02:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Louis-Antoine
2ae00f1edf Wait for acks before resending file fragments 2020-05-20 16:21:18 +02:00
Louis-Antoine
15d6a254e1 Add a command to list current file transfers 2020-05-20 00:24:53 +02:00
Louis-Antoine
6e073efbb7 Fix I_Error when queuing multiple Lua files 2020-05-19 23:50:37 +02:00
Louis-Antoine
ccc51df93b Fix sending Lua files in text mode 2020-05-19 21:36:21 +02:00
Louis-Antoine
1b62785cfa Refactor Lua file transfer code 2020-05-19 15:16:51 +02:00
Louis-Antoine
362adf4576 Allow resuming the most recent file transfer 2020-05-19 11:28:24 +02:00
James R
0de597892e Whoops I used the url to the file instead of the http_source 2020-05-16 21:03:37 -07:00
Louis-Antoine
35c987e731 Show total size when downloading gamestate 2020-05-16 22:49:20 +02:00
Louis-Antoine
c221b76716 Rewrite file transfer code
This code uses a custom packet acknowledgement system,
which is more suited for file transfer and does not suffer from
the small sender window used by the default acknowledgement system
2020-05-16 22:09:00 +02:00
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
James R
12bd9370c2 I forgot extern, now I am the clown 2020-05-15 19:04:03 -07:00
James R
8aced572c9 Some experimental commands to use auth when downloading from HTTP sources 2020-05-15 18:11:05 -07:00
Sal
280f538335 Merge branch 'ferror-errno-yareyare' into 'master'
Fix false file error reporting

See merge request KartKrew/Kart-Public!162
2020-05-15 19:27:08 -04:00
Louis-Antoine
3d08ffe514 Rename local variables 2020-05-12 19:58:16 +02:00
Louis-Antoine
70f4d12d38 Rename some file transfer functions 2020-05-12 19:06:40 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
Steel Titanium
87c7f1f797 Show more descriptive error on failed downloads 2020-04-19 00:13:30 -04:00
James R
5febf5b2d7 Don't strip directory before removing failed http download 2020-04-18 18:47:20 -07:00
Steel Titanium
2d8a924369 Fix error with travis 2020-04-07 19:48:39 -04:00
Steel Titanium
829e63364d Fix this mistake 2020-04-07 19:27:20 -04:00
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04:00
James R
6274b9fde1 ferror does not return errno, are you stupid?
Use M_FileError to return the proper error description, or "end-of-file".

(cherry picked from commit 2f521f2eb18a79fd7e0a6aca2f2b7b6113042d6c)
2020-03-24 15:48:42 -07:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
LJ Sonic
e0f3a5b8f5 Merge branch 'lua-io' into 'next'
Support for Lua's I/O library

See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
Louis-Antoine
6739fcff69 Replace MAX_WADPATH with plain numbers
This is not ideal either, but I would rather
not use a constant for something unrelated.
2020-02-21 17:31:32 +01:00
James R
26ff2e0355 Fix compiler warnings 2020-02-20 17:18:26 -08:00
Louis-Antoine
36a7539f33 SpaceSpaceSpaceSpace 2020-02-20 01:15:54 +01:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
d2e9f0465a Minor code cleanup 2020-02-19 22:37:30 +01:00
Louis-Antoine
cade1d3d38 Fix bad tabulation 2020-02-19 22:01:33 +01:00
Louis-Antoine
1b6d056b91 Rename "luafiles/shared/" to "luafiles/client/" 2020-01-24 17:11:00 +01:00
Louis-Antoine
6d42930c8e Update Lua I/O support to 2.2 2020-01-22 23:08:57 +01:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Steel Titanium
dc9a09f837 Merge branch 'public_next' into 'master' 2019-11-18 15:39:41 -05:00
James R
43422eb670 ferror does not return errno, are you stupid?
Use M_FileError to return the proper error description, or "end-of-file".
2019-10-07 17:55:31 -07:00