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
fbfb9dc95c
Create FIL_ConvertTextFileToBinary
2020-05-19 20:00:58 +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
Steel Titanium
a491f20bee
Merge branch 'master' into next
2020-05-11 18:20:09 -04:00
SteelT
a43072a853
Merge branch 'splitscreen-titlecards-fix' into 'master'
...
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
2020-05-11 18:18:22 -04:00
SteelT
9e93ab4cf5
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
...
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
2020-05-11 18:17:59 -04:00
SteelT
1c7f684f3e
Merge branch '2.2.4-prep' into 'next'
...
2.2.4 preparation
See merge request STJr/SRB2!935
2020-05-11 18:06:11 -04:00
James R
4753c9042d
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
2020-05-11 15:01:32 -07:00
LJ Sonic
b0c1bf50e3
Merge branch 'fix-rollout-rock-crash' into 'next'
...
Fix crash with rollout rock
See merge request STJr/SRB2!936
2020-05-11 17:57:31 -04:00
Louis-Antoine
be67ca3203
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
e95d2beed7
Update patch.pk3 asset hash
2020-05-11 14:41:36 -07:00
James R
ffd88746da
Update version names, SUBVERSION, MODVERSION
2020-05-11 14:41:36 -07:00
Monster Iestyn
ce3639f569
Merge branch 'master' into next
2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony
cb9d0a2fbe
Fix splitscreen Title Card act name regression
...
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02:00
MascaraSnake
ca324f7edc
Merge branch 'showfps-fix' into 'master'
...
Don't show the FPS counter during startup.
See merge request STJr/SRB2!930
2020-05-11 13:31:26 -04:00
MascaraSnake
35b4f88efe
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
...
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
2020-05-11 13:31:09 -04:00
MascaraSnake
2ec7a14b9d
Merge branch 'delete-lua-again' into 'next'
...
Fix the BotRespawn hook and hooking A_Dye being disabled for no reason
See merge request STJr/SRB2!932
2020-05-11 13:30:18 -04:00
toaster
67e01ad66e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
...
# Conflicts:
# src/m_menu.c
2020-05-11 15:00:31 +01:00
James R
1065ded275
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
James R
5ad69621f2
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
sphere
0490dc3e8e
Don't show the FPS counter during startup.
2020-05-11 01:33:34 +02:00
SteelT
1b4d36245f
Merge branch '2.2.3-prep' into 'next'
...
2.2.3 preparation
See merge request STJr/SRB2!929
2020-05-10 17:13:04 -04:00
Steel Titanium
f9195d6593
Merge branch 'next' into 2.2.3-prep
2020-05-10 17:05:56 -04:00
Monster Iestyn
d591b56ef4
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
2020-05-10 20:10:11 +01:00
Monster Iestyn
1ea3a031da
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
...
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
2020-05-10 20:09:08 +01:00
lachwright
a4cba6a5f9
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Lachlan Wright
72c16b0761
Merge branch '1upsound' into 'master'
...
Play the 1-up sound when 1upsound is set to sound
See merge request STJr/SRB2!926
2020-05-10 13:28:09 -04:00
Lachlan Wright
7df8c24a9b
Merge branch 'patch_music' into 'next'
...
patch_music.pk3
See merge request STJr/SRB2!812
2020-05-10 12:51:49 -04:00
lachwright
10187a1e9b
Update MD5 hashes for player.dta and patch.pk3
2020-05-11 00:23:32 +08:00
Monster Iestyn
398770b952
Fix logging on Mac
...
These fixes were suggested by Sveciaost on #mac-users on Discord
2020-05-10 16:47:01 +01:00
Monster Iestyn
f218920395
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
2020-05-10 16:02:23 +01:00
LJ Sonic
1952c30344
Merge branch 'gfz3laser-mkii' into 'next'
...
New Greenflower Zone 3 laser
See merge request STJr/SRB2!924
2020-05-09 16:40:40 -04:00
LJ Sonic
8b5becfcba
Merge branch 'optimise-archiving' into 'next'
...
Optimise net-archiving of Lua strings, numbers and booleans
See merge request STJr/SRB2!904
2020-05-09 16:40:28 -04:00
LJ Sonic
9cfa75b9b5
Merge branch 'showfps-tweaks' into 'next'
...
FPS counter tweaks
See merge request STJr/SRB2!927
2020-05-09 15:46:08 -04:00
sphere
6b761c1486
Make showfps save to config, and add a compact option.
2020-05-08 15:40:50 +02:00
Lachlan
05c83bbd68
Play the 1-up sound when 1upsound is set to sound
2020-05-08 04:07:00 +08:00
MascaraSnake
59a49d9f3c
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-05-07 22:00:02 +02:00
MascaraSnake
9ebbb5b7c2
Fixed a typo
2020-05-07 21:59:39 +02:00
lachwright
fa8e58bec9
Prevent laser sprites clipping into walls/off ledges
2020-05-08 02:58:56 +08:00
lachwright
bfd1d3d49f
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
2020-05-07 23:24:33 +08:00
lachwright
cd9774b649
Fix knockback scaling
2020-05-07 22:47:34 +08:00
