Commit graph

16729 commits

Author SHA1 Message Date
LJ Sonic
85f5698c9b Merge branch 'dragonbomber-height' into 'next'
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
LJ Sonic
e4b5d85f31 Merge branch 'shift-when-hiding-in-1p-menu' into 'next'
Tweak display of hidden items in "1 Player" menu

See merge request STJr/SRB2!1013
2020-07-03 17:04:42 -04:00
LJ Sonic
080a5acd0f Merge branch 'ff_horizontalflip' into 'next'
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
2020-07-03 16:56:32 -04:00
Lachlan
cd152365fa Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00
Lachlan
ee7bc779ea P_Earthquake: Use P_RadiusAttack in favor of thinker iteration 2020-07-04 04:00:28 +08:00
Lachlan
2ceff03a15 Fix buildbot warning 2020-07-04 03:21:48 +08:00
SteelT
2d6fff5165 Merge branch 'na-char-replays' into 'next'
Add support for saving/loading per-skin NiGHTS replays

See merge request STJr/SRB2!1025
2020-07-03 14:51:05 -04:00
lachwright
0a3b728e81 Knuckles changes:
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
colette
da537d8695 "Legacy controls" was a mistake of a name 2020-07-02 23:17:33 -04:00
Ashnal
8790661b20 Remove Checking Files spam 2020-07-02 21:48:45 -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
8df8d1d028 Correct total files to load off by one 2020-07-02 17:47:10 -04:00
Hannu Hanhi
ff9848befb Better MF2_LINKDRAW support for OpenGL 2020-07-03 00:28:52 +03:00
lachwright
5ec234e726 Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
Zippy_Zolton
acdac44db8 sound caption 2020-07-01 23:18:20 -05:00
Ashnal
a4c004fee3 Changed "this server has a lot of addons!" to
"Checking server addon list ..." to be more informative
2020-07-01 23:52:43 -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
James R
1071e72e62 Merge branch 'cheese' into 'next'
Cheese

See merge request STJr/SRB2!1028
2020-07-01 23:28:08 -04:00
James R
39e3a5f5bb Merge branch 'credits-225' into 'next'
More credits changes

See merge request STJr/SRB2!1027
2020-07-01 23:27:59 -04:00
Ashnal
3cb4e3cc18 Fix X/0 files display bug for legacy downloader
Also made "Waiting to Download" consistent with other states
2020-07-01 21:40:21 -04:00
James R
79bbd3606d Merge branch 'fix-polyobject-rotation-crash' into 'next'
Fix crash when a polyobject rotates a non-player mobj

See merge request STJr/SRB2!1026
2020-07-01 19:40:36 -04:00
James R
a5a626f883 Cheese mode activate! 2020-07-01 16:37:36 -07:00
James R
1beea770e5 Add "Discord Community Testers" to the Testing section 2020-07-01 16:29:26 -07:00
James R
746235a4d6 Credits: add back fickle, add Chrispy and Hannu 2020-07-01 16:23:26 -07:00
James R
5e78af3818 Remove Producer role from the credits 2020-07-01 16:04:46 -07:00
Sal
3468d7808f Merge branch 'fix-pk3-leak' into 'master'
Fix memory leak in W_ReadLumpHeaderPwad

See merge request KartKrew/Kart-Public!182
2020-07-01 18:36:48 -04:00
Sal
b7ba97601b Merge branch 'http-useragent-fix' into 'master'
Fix user agent for HTTP downloads being set as SRB2Kart/v1.1.2

See merge request KartKrew/Kart-Public!185
2020-07-01 18:36:33 -04:00
Sal
0043ccd314 Merge branch 'ogl-color-fix3' into 'master'
Ogl colormap fix third attempt

See merge request KartKrew/Kart-Public!184
2020-07-01 18:36:19 -04:00
Sal
48409ce627 Merge branch 'chatbug-fix' into 'master'
clientside ack fix

See merge request KartKrew/Kart-Public!186
2020-07-01 18:35:57 -04:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Louis-Antoine
ec2f58c664 Fix crash when a polyobject rotates a non-player mobj 2020-06-30 18:37:21 +02:00
Steel Titanium
db559d73d0 Correct comment 2020-06-29 23:57:39 -04:00
Steel Titanium
e0b524d6a9 Address compat with old-style names 2020-06-29 23:54:45 -04:00
James R
06c3116afa Merge branch 'special_save' into 'next'
Special saves! (Resolves #162)

Closes #162

See merge request STJr/SRB2!1016
2020-06-29 19:18:30 -04:00
James R
7ef7649c75 Merge branch 'titlecard-double-clown-town' into 'next'
ACTUALLY fix #172

Closes #172

See merge request STJr/SRB2!1020
2020-06-28 18:41:22 -04:00
James R
71dedde5eb Merge branch 'delete-connection-screen-and-midgame-joins' into 'next'
Delete connection screen and midgame joins

See merge request STJr/SRB2!1021
2020-06-28 18:41:07 -04:00
Steel Titanium
f891c6cde4 Add support for saving/loading per-skin NiGHTS replays 2020-06-28 16:59:36 -04:00
Ashnal
f0fac04dfd Experiemntal clientside ack fix
Stops the client from using reliable packets before joining a server
Clients can time out during addon loading
sending reliable packets before then can cause out of order acks
This causes joinbug, chatbug, and chatspam, as well as
general server instability due to unnecesary packetspam
2020-06-27 23:43:15 -04:00
Ashnal
d1a2e4ce89 Adjust text position 2020-06-27 23:40:13 -04:00
Ashnal
4376ab84dc Add progress bar for file loading 2020-06-27 23:26:38 -04:00
Ashnal
31ea4637d8 Adjustment to new progress text 2020-06-27 21:17:21 -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
James R
dc746f4dfe Use levelflat->name instead of flatname 2020-06-27 14:30:41 -07:00
SteelT
07c84dc854 Merge branch 'increase-input-buffer-more' into 'next'
Increase the length of the player input buffer even more

See merge request STJr/SRB2!951
2020-06-27 13:32:19 -04:00
GoldenTails
0fbcd7a5d2 Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with 2020-06-27 10:56:15 -05:00
LJ Sonic
71f5b7fd0d Merge branch 'lua-server-variables' into 'next'
Expose "server" and "dedicated" to Lua scripts

See merge request STJr/SRB2!1022
2020-06-27 09:50:30 -04:00
Louis-Antoine
9e770ceec4 Expose "server" and "dedicated" to Lua scripts
Careful! Both are local variables and are always false for clients,
and therefore should obviously not be used in anything gamelogic-related.
2020-06-27 15:30:23 +02:00
Louis-Antoine
36ad16452c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine
8b78811651 Fix computation of very high pings 2020-06-26 15:34:26 +02:00