toaster
73dabaeab6
Merge branch 'master' into new-menus
...
# Conflicts:
# src/d_clisrv.c
# src/deh_soc.c
# src/lua_baselib.c
# src/m_cheat.c
# src/m_menu.h
# src/y_inter.c
2022-03-29 17:14:38 +01:00
James R
59c04ae041
pedantic: resolve flexible array member in nested struct
...
ISO C forbids a structure that has a flexible array member
to be a member of another structure or element of an
array.
filetx_pak and fileack_pak are two such structures. These
have been removed from doomdata_t's union.
2022-02-20 03:10:27 -08:00
toaster
87d797a45a
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
...
# Conflicts:
# src/Sourcefile
# src/d_main.c
# src/m_menu.c
# src/v_video.c
# src/v_video.h
2022-02-14 13:10:36 +00:00
toaster
c8517007c6
Only disable downloads in TESTER builds and -nodownload, not always.
2022-02-03 22:03:04 +00:00
James R
4712daddf9
Start checking files from correct position on rejoin
2021-12-18 19:52:59 -08:00
SinnamonLat
7c9f3385d4
Merge branch 'master' into new-menus
2021-12-17 12:32:01 +01:00
James R
32127f37ee
Check mainwads netgame md5 in developer build
2021-12-12 02:58:06 -08:00
James R
9e1146bc30
Disable downloading for now
2021-12-12 02:47:46 -08:00
toaster
b4af07ffed
Merge branch 'master' into new-menus
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/v_video.c
# src/y_inter.c
2021-10-18 01:18:37 +01:00
Sally Coolatta
340c948c71
Fix being able to download our data files
2021-04-25 20:49:52 -04:00
James R
08348fcd43
Merge remote-tracking branch 'srb2/next'
2021-04-05 01:26:17 -07:00
James R
0522355135
Make important wads important again
2021-04-04 23:06:52 -07:00
LJ Sonic
145155c3c7
Kick clients if they take too long to download a Lua file
2021-03-25 22:43:06 +01:00
LJ Sonic
addf0e3f13
Use a separate transfer status for disconnected nodes
2021-03-25 22:28:35 +01:00
Sally Coolatta
a14cf1f029
Merge branch 'master' into new-menus
2021-01-10 21:31:09 -05:00
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
Sal
1aaddb9ea7
Merge branch 'download-wrong-checksum' into 'master'
...
Download files if they are found with wrong checksum
See merge request KartKrew/Kart-Public!238
2020-11-03 13:05:26 -05:00
Sal
307a8aa778
Merge branch 'http-downloads-auth' into 'master'
...
Command for http downloads with basic auth
See merge request KartKrew/Kart-Public!233
2020-11-03 13:04:43 -05:00
James R
c59d456772
Count any files not already loaded toward filestoload?
2020-10-07 16:09:21 -07:00
James R
67df3cdb12
Download files that were found with wrong checksum
2020-10-07 16:06:49 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
Steel Titanium
858f345802
Haha NONET...
2020-08-24 00:56:53 -04:00
Ashnal
28c07d2224
Merge remote-tracking branch 'public/next' into conenction-screen-improvements
2020-08-19 19:08:33 -04:00
Ashnal
30f687d0df
Fixes for file accounting
...
mainwads+1 to not use the first mainwad
2020-08-17 03:51:19 -04:00
Ashnal
196514ff21
New message boxes for downloads and full server waiting
...
Downloads must be confirmed before proceeding
Allows downloading mods for full servers
Client will wait for a slot to open on a full server to join
This has a 5 minute timeout
2020-08-17 03:47:23 -04:00
Ashnal
c91d004409
Improve total downloads bar
...
Now has total file size AND number of files
2020-08-15 01:03:45 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
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
