Commit graph

12384 commits

Author SHA1 Message Date
Ors
2a89154667 Revert an accidental whitespace change 2021-06-10 14:23:51 -04:00
Riku Salminen
f1a96bd7ee Add support for ghosts with netvars in 2.2.6 and before 2021-06-10 21:18:45 +03:00
Radicalicious
9210923b86 Cut cv_hidetime's minimum value to 5 seconds 2021-06-10 12:59:54 -04:00
sphere
52f9b47ce3 Ignore a linedef tag of 0 when using linedef action 96. 2021-06-10 17:49:33 +02:00
Riku Salminen
45e57fa791 Revert "Revert "Made height/spinheight and height change values in replays more accurate""
This reverts commit fbeabad797.
2021-06-09 19:40:59 +03:00
Riku Salminen
fbeabad797 Revert "Made height/spinheight and height change values in replays more accurate"
This reverts commit 3daee0ebf8.
2021-06-09 19:28:14 +03:00
sphere
786516fa5f Merge branch 'kart-latency' into 'next'
Kart cmd->latency port

See merge request STJr/SRB2!1470
2021-06-09 10:53:09 -04:00
sphere
be8c97728c Merge branch 'aproxdistance' into 'next'
Restore P_AproxDistance Lua parity

See merge request STJr/SRB2!1531
2021-06-08 07:47:38 -04:00
lachablock
4d1b3edb03 Split up x/y/z averages in A_Boss3ShockThink 2021-06-08 17:21:54 +10:00
James R
c325306ddf Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-06-07 18:36:01 -07:00
James R
0f4eb4fab9 Merge conflicts 4d22b9f17 2021-06-07 18:13:56 -07:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
lachablock
0c5018040c Merge remote-tracking branch 'origin/master' into next 2021-06-06 21:25:08 +10:00
sphere
2bc707305b Merge branch 'metalrecording' into 'next'
Expose `metalrecording` global to Lua.

See merge request STJr/SRB2!1536
2021-06-06 07:08:42 -04:00
sphere
c266a27073 Merge branch 'master' into 'master'
Fix console text bleeding

See merge request STJr/SRB2!1434
2021-06-06 07:01:30 -04:00
GoldenTails
409cba678d metalrecording 2021-06-05 18:35:44 -05:00
Monster Iestyn
090e5384d5 Merge branch 'blendmode-rangecheck' into 'next'
Handle invalid blend modes

See merge request STJr/SRB2!1486
2021-06-05 09:02:31 -04:00
Radicalicious
7483a9d049 Switch num and flags so flags is optional 2021-06-03 10:55:42 -04:00
sphere
6ff212b79f Use floating-point math for polyobject planes as well. 2021-06-03 16:01:09 +02:00
Radicalicious
cb5e433a49 Update lua_hudlib.c 2021-06-03 09:34:18 -04:00
lachablock
476dcc861b Restore P_AproxDistance Lua parity 2021-06-03 14:36:29 +10:00
Shane Ellis
18c47afc76 Merge branch 'next' into 'addplayer'
# Conflicts:
#   src/lua_baselib.c
#   src/r_skins.c
2021-06-02 11:47:11 -04:00
sphere
2df75610e6 Merge branch 'allow-lua-to-override-special-stages' into 'next'
Allows Lua to transport you to a different map in place of a Special Stage.

See merge request STJr/SRB2!1368
2021-06-02 11:16:15 -04:00
sphere
8cfe7cd971 Merge branch 'unix-rdynamic' into 'next'
Compile with -rdynamic for UNIXCOMMON platforms

See merge request STJr/SRB2!1481
2021-06-02 06:31:14 -04:00
sphere
4aa3bea6ca Merge branch 'fix-console-splitting' into 'next'
Fix the console splitting up halfway through startup.

Closes #349

See merge request STJr/SRB2!1494
2021-06-02 06:31:01 -04:00
sphere
fb453491dd Merge branch 'models-spr2endstate' into 'next'
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state

See merge request STJr/SRB2!1515
2021-06-02 06:28:51 -04:00
Nev3r
a4300220e9 whitespace 2021-06-02 11:36:52 +02:00
Nev3r
9c68f8cbb0 Fix the equation constant fields not being filled properly. 2021-06-02 11:21:37 +02:00
Nev3r
aec1ab304a Let equation slopes be read from textmaps. 2021-06-02 11:00:57 +02:00
Nev3r
36ce44e0a3 Add slope equation constant parsing functionality. 2021-06-02 11:00:47 +02:00
Nev3r
8cb62eeca5 Initialize slopes before the map loads. 2021-06-02 10:59:57 +02:00
sphere
d040b61edc Merge branch 'multitagging_plus' into 'next'
Enhance the multitagging functionality added by !1485

See merge request STJr/SRB2!1524
2021-06-01 17:25:29 -04:00
flarn2006
115254efc9 Fix compiler warning related to precedence 2021-06-01 17:10:29 -04:00
sphere
5a91f3326a Merge branch 'disable-int-emeralds' into 'next'
Some more intermission features for Lua

See merge request STJr/SRB2!1329
2021-06-01 15:38:00 -04:00
sphere
e203e457de Merge branch 'custom3drotate-scale-fix' into 'next'
A_Custom3DRotate scale fix

See merge request STJr/SRB2!1525
2021-06-01 15:02:43 -04:00
sphere
70bcb6081f Merge branch 'dashmode-lowroad' into 'next'
Have Metal Sonic use spinheight while dashing

See merge request STJr/SRB2!1382
2021-06-01 15:00:08 -04:00
sphere
69b6c409b5 Merge branch 'flicky-mapload-crash-fix' into 'next'
Flicky mapload crash fix (and other tmthing-related fixes)

Closes #81

See merge request STJr/SRB2!1522
2021-06-01 14:58:01 -04:00
flarn2006
172454f108 Fix offset_tags array indices 2021-06-01 10:09:57 -04:00
Nev3r
f7ee0dacf2 Merge branch 'lua_mapnumber' into 'next'
Expose M_MapNumber to Lua

See merge request STJr/SRB2!1521
2021-06-01 07:43:33 -04:00
Nev3r
2d155fa366 Merge branch 'remove-fracunit-2' into 'next'
I have no idea why software does this.

See merge request STJr/SRB2!1517
2021-06-01 07:42:36 -04:00
Nev3r
de0a91729b Merge branch 'buttered-lua' into 'next'
Expose P_ButteredSlope to lua

See merge request STJr/SRB2!1397
2021-06-01 07:39:19 -04:00
Nev3r
6edad47788 Merge branch 'no-airwalking-springs' into 'next'
No airwalking (from horizontal springs)

See merge request STJr/SRB2!1428
2021-06-01 07:38:04 -04:00
Nev3r
b49238f7c4 Merge branch 'remove-iterdeclarations' into 'next'
Remove TAG_ITER_DECLARECOUNTER

See merge request STJr/SRB2!1398
2021-06-01 07:36:50 -04:00
Nev3r
ab06ff011e Merge branch 'colorfret' into 'next'
Respect mobj->color while enemies & bosses flash (resolves #531)

Closes #531

See merge request STJr/SRB2!1513
2021-06-01 02:31:22 -04:00
Nev3r
e06b450c75 Merge branch 'small-readme-update' into 'master'
Add badge to readme showing latest stable release

See merge request STJr/SRB2!1510
2021-06-01 02:30:30 -04:00
Nev3r
9e7d619a5b Merge branch 'golden-nitpicks-use-of-base-10' into 'next'
Use more readable hex constants in the Software Renderer splat and floorsprite drawers.

See merge request STJr/SRB2!1442
2021-06-01 02:29:53 -04:00
sphere
4908712641 Merge branch 'go-away' into 'next'
Make a few messages more helpful (resolves #485)

Closes #485

See merge request STJr/SRB2!1519
2021-05-31 16:32:42 -04:00
sphere
65350e59c9 Merge branch 'rollout-stuff' into 'next'
Rollout rock improvements

Closes #445, #221, and #532

See merge request STJr/SRB2!1401
2021-05-31 16:12:17 -04:00
Radicalicious
3e91a8b2d4 Revert "Update p_user.c"
This reverts commit 92209bf246
2021-05-31 19:23:37 +00:00
Radicalicious
92209bf246 Update p_user.c 2021-05-31 15:09:54 -04:00