Commit graph

13403 commits

Author SHA1 Message Date
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
sphere
33d0438033 Merge branch 'fuckeggguard' into 'next'
Make Armageddon Shield instantly kill Egg Guards (Closes #225)

Closes #225

See merge request STJr/SRB2!1378
2021-05-31 09:34:14 -04:00
sphere
aec209ad2d Merge branch 'slider' into 'next'
Allow sliders passage through spin gaps (resolves #576)

Closes #576

See merge request STJr/SRB2!1520
2021-05-31 08:31:42 -04:00
sphere
ae9e0e7f08 Merge branch 'text-loops' into 'next'
Custom title card bruh moments

See merge request STJr/SRB2!1501
2021-05-31 08:25:43 -04:00
Nev3r
a48af30465 Merge branch 'easings' into 'next'
Easing functions

See merge request STJr/SRB2!1467
2021-05-31 02:34:02 -04:00
flarn2006
0b51b391f1 Make 96's flags consistent with 97-99 by default 2021-05-30 12:16:15 -04:00
sphere
fb4b3b8130 Merge branch 'ogl-fof-wall-slope-fix2' into 'next'
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg

Closes #192

See merge request STJr/SRB2!1361
2021-05-30 11:32:30 -04:00
Monster Iestyn
d10cf4faf5 A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear!
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
2021-05-29 22:54:58 +01:00
flarn2006
f8fe763df2 Fix linedef type 99 2021-05-29 12:28:06 -04:00
flarn2006
2d4411d077 Remove empty 'else' block (also leftover) 2021-05-29 12:23:35 -04:00
flarn2006
5090de5809 Remove leftover debug printfs 2021-05-29 12:09:30 -04:00
flarn2006
93de054786 Fix linedef type 96 (I had it all wrong) 2021-05-29 11:08:57 -04:00
Nev3r
b978bc4507 Merge branch 'sw-tilted-npo2-span-opt' into 'next'
NPO2 slope span optimization

See merge request STJr/SRB2!1216
2021-05-29 09:30:58 -04:00
flarn2006
eee894581a Make linedef 96 skip the control sector 2021-05-29 00:54:31 -04:00
flarn2006
7d71d534d4 Add missing "/ FRACUNIT" to texture offset code 2021-05-29 00:40:06 -04:00
flarn2006
8d8f62baef Add additional multitagging functionality 2021-05-28 23:59:39 -04:00
SteelT
ad2b4b1809 Merge branch 'save-skin-names' into 'next'
Save skin names in save files instead of skin numbers

See merge request STJr/SRB2!1503
2021-05-28 22:05:20 -04:00
SteelT
c0f8cb29aa Merge branch 'select-heading-no-gaps' into 'next'
[SUGOI] Level select no longer assumes that games will always be linear

See merge request STJr/SRB2!1492
2021-05-28 21:51:52 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next'
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
2021-05-28 21:51:00 -04:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next'
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
2021-05-28 21:30:16 -04:00
Riku Salminen
22aaffa35d non-misleading comment 2021-05-28 22:32:11 +03:00
Riku Salminen
21dab7bd66 Add previous demo version to acceptable demo versions for demo comparison 2021-05-28 22:30:43 +03:00
Monster Iestyn
45b1223f3e My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit 2021-05-28 18:56:32 +01:00
Monster Iestyn
ada6ec07db Fix Lua versions of P_ZMovement and its clones as well as P_MovePlayer so tmthing changes don't linger afterwards 2021-05-28 18:47:09 +01:00
Monster Iestyn
07801a2a18 move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook 2021-05-28 18:42:19 +01:00
flarn2006
fd82357d4f Expose M_MapNumber to Lua 2021-05-27 18:35:15 -04:00
sphere
75938e2dfa Merge branch 'software-slope-plane-uv-fix-attempt' into 'next'
Fix slope plane rotation and alignment (resolves #508)

Closes #508

See merge request STJr/SRB2!1464
2021-05-27 16:56:16 -04:00