Commit graph

69 commits

Author SHA1 Message Date
Louis-Antoine
36ad16452c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine
04ae70179c Fix "downloads" command reporting incorrect progress 2020-06-01 10:37:05 +02: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
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
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
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
sphere
a225970360 Use zones.pk3 instead of zones.dta. 2019-09-29 05:31:50 +02:00
Monster Iestyn
a7353a9835 Merge branch 'public_next'
# Conflicts:
#	src/d_netfil.c
2019-08-25 18:18:59 +01:00
James R
30d7cf0fb5 Compare the file name only for real
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
b6d1cca4da Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz
ede6b183b1 Merge branch 'addons_menu' into 'master'
Addons menu

See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
MonsterIestyn
d158d7e011 Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Nev3r
623c7097f1 Backported PK3 support to 2.1
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
mazmazz
3bb75690c4 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
Monster Iestyn
eb4eef6104 Merge branch 'public_next'
# Conflicts:
#	src/Makefile.cfg
#	src/d_clisrv.c
#	src/p_setup.c
#	src/r_segs.c
#	src/r_things.c
2018-11-20 14:33:10 +00:00
Alam Ed Arias
8277f32b67 fix format-truncation: need bigger string buffers 2018-11-14 16:50:52 -05:00
toaster
95ba75629a Major refinement of Add-ons menu!
* Kill addonsresponselimit, which was a hacky solution to a stupid problem. Instead...
* Allocate and consistently handle memory to store the name of an added file so we can reference it directly.
* Replace the choice between ./ and a custom folder with the full, standard assortment of Default (usehome ? SRB2HOME : SRB2PATH), HOME (SRB2HOME), SRB2 (SRB2PATH) or Custom (cv_addons_folder.string).
* Make these render as the name plus folder, since you can't go UP... from the top level.
* Make the path seperators consistently system-based re PATHSEP. (Quite frankly, I'm surprised it even worked in the first place...)
2018-06-18 16:55:34 +01:00
toaster
06e9b320d5 Not necessary on-topic devwork, but using global variables I developed in internal to make there less code repetition/iteration in the WAD limit checks. 2018-06-18 12:49:06 +01:00
Monster Iestyn
105eee7e0a Merge branch 'public_next'
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
2018-06-09 19:35:36 +01:00
Monster Iestyn
df7c54d620 Rewrote findfile to store whether any of the three paths searched had a bad MD5 rather than just simply being not there.
This means that, if the three paths are not the same, you should be able to tell if at least one of them has a file that just had a bad MD5. Most relevant for Linux peeps I expect.

Note: Untested as of writing
2018-04-15 22:00:31 +01:00
Monster Iestyn
6d8dc56e55 P_AddWadFile: Remove useless firstmapname param, clean up map searching code 2018-01-04 20:15:44 +00:00
Monster Iestyn
75bc76e9b4 Remove all traces of "srb2.wad" support, since it is no longer needed now that srb2.pk3 is the IWAD (...IPK3?). srb2.wad cannot exactly be a pk3 file after all.
Additionally, rename any remaining "srb2.srb" to "srb2.pk3" in the main source code files. Not sure whether to bother dealing with srb2.srb/srb2.wad mentions in project files for now.
2017-12-07 18:26:12 +00:00
toasterbabe
50d6208913 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-10-21 14:28:44 +01:00
Monster Iestyn
52620ac9b1 Obliterated OS/2 2017-10-07 18:11:14 +01:00
Monster Iestyn
302d0425e0 Incinerated WinCE 2017-09-29 23:25:34 +01:00
Monster Iestyn
5a16c39af0 XBOX was eXecuted 2017-09-29 19:27:17 +01:00
Monster Iestyn
f4e535a64d Burned Dreamcast port at the stake 2017-09-29 18:19:34 +01:00
Nevur
8b64a6eef3 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-08-08 10:41:33 +02:00
Nevur
bb3365a904 We use srb2.pk3 instead. 2017-08-08 10:39:25 +02:00
Monster Iestyn
2e2b71da92 Merge branch 'addfile_menu' into 'master'
Add-ons menu

Does what it says on the tin! Very pretty. Would like help testing in filesystems that are not Windows, although I've recieved assurances from Sryder that since it's based on the same filesrch code, it should work cross-platform. Just want to confirm it works, though.

Also, M_* is whitelisted lumpname too.

root/!LatestSRB2Files/srb2win_branch_addfile.exe, requires new patch.dta.

See merge request !92
2017-08-05 16:05:12 -04:00