Commit graph

12649 commits

Author SHA1 Message Date
LJ Sonic
066a9d1534 Merge branch 'fix-musicchange-hook' into 'next'
Fix MusicChange hook crashing when called

See merge request STJr/SRB2!1671
2021-12-05 17:02:20 +00:00
LJ Sonic
f271f88c7f Fix MusicChange hook crashing when called
BRUH MOMENT BRUH MOMENT
PREPARE THE HALL OF SHAME
2021-12-05 17:59:33 +01:00
sphere
76bbef29a9 Merge branch 'trigger-bruh' into 'next'
Fix "all players" check in T_EachTimeThinker

See merge request STJr/SRB2!1668
2021-12-05 14:45:01 +00:00
spherallic
fdc825721f some hud fixes, by Confusion 2021-12-05 12:47:20 +01:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
MascaraSnake
55fc7cbd67 Fix "all players" check in T_EachTimeThinker 2021-12-05 07:20:55 +01:00
sphere
7601afb6c1 blentran part 3: Wall & plane blendmodes. 2021-12-05 00:48:21 +01:00
sphere
a3be09bb3f blentran part 2: Sprite & patch blendmodes. 2021-12-05 00:48:21 +01:00
sphere
3802f601a9 blentran part 1: Flag changes & semibright support. 2021-12-05 00:48:21 +01:00
Radicalicious
86edb1e4ca Fix player disappearing when drowning in painstate 2021-12-03 23:20:07 -06:00
Radicalicious
d791fc2dc8 Merge remote-tracking branch 'stjr/next' into we-do-a-little-trolling 2021-12-03 21:53:32 -06:00
LJ Sonic
1acd0f6bac Merge branch 'starstruck' into 'next'
Null gamestate before map transition to prevent unwanted interactions with the map (resolves #601)

Closes #601

See merge request STJr/SRB2!1624
2021-12-03 18:02:06 +00:00
Lach
ac2e8119db Merge branch 'supersuck' into 'next'
Add MFE_FORCESUPER, MFE_FORCENOSUPER, and MFE_REVERSESUPER extra flags (Solves #520)

See merge request STJr/SRB2!1452
2021-12-03 12:18:39 +00:00
SteelT
bb514a0627 Merge branch 'metal-recording-srb2home' into 'next'
Fix metal recordings not being saved in srb2home

See merge request STJr/SRB2!1601
2021-12-03 00:32:06 +00:00
LJ Sonic
d77b427329 Merge branch 'adjust-max-downloadspeed' into 'next'
Raise the maximum value of file upload speed drastically

See merge request STJr/SRB2!1665
2021-12-02 23:57:42 +00:00
LJ Sonic
b959d0f4ab Merge branch 'fix-console-keyup' into 'next'
Fix `KeyUp` hook being called when the console is open

See merge request STJr/SRB2!1664
2021-12-02 23:57:38 +00:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next'
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
2021-12-02 23:57:26 +00:00
LJ Sonic
95c61e0fab Merge branch 'ksf-wadfiles' into 'next'
Raise addon limit

See merge request STJr/SRB2!1465
2021-12-02 22:50:46 +00:00
LZA
a3353be0dc Raise addon limit 2021-12-02 22:50:44 +00:00
LJ Sonic
599abc2a78 Merge branch 'lua-timestamp' into 'next'
Timestamp function for Lua

See merge request STJr/SRB2!1647
2021-12-02 22:41:08 +00:00
LJ Sonic
ff037a8160 Remove downloadspeed cruft 2021-12-02 23:34:28 +01:00
LJ Sonic
14403737ef Raise the file upload speed drastically 2021-12-02 23:15:55 +01:00
LJ Sonic
425d1f1b53 Make all key identifiers lowercase 2021-12-02 21:03:16 +01:00
LJ Sonic
443c51714a Fix KeyUp hook being called when the console is open 2021-12-02 21:02:54 +01:00
sphere
33c43744b4 Merge branch 'what' into 'next'
Clean up bouncy fof code + fix bugs (closes #291)

Closes #291

See merge request STJr/SRB2!1461
2021-12-02 17:29:43 +00:00
sphere
dad13f2dde Merge branch 'myfixes' into 'next'
Fix visplanes getting allocated twice (backport from srb2kart)

See merge request STJr/SRB2!1636
2021-12-02 11:25:18 +00:00
sphere
3597475a9d Merge branch 'drawtiltedsplat-npo2-typo' into 'next'
Remove that line again

See merge request STJr/SRB2!1645
2021-12-02 11:12:24 +00:00
sphere
a8f754283b Merge branch 'lethallavaland' into 'next'
fix MFE_TOUCHWATER (and MFE_TOUCHLAVA) not applying while standing on sloped water or lava (resolves #365, #201)

Closes #201 and #365

See merge request STJr/SRB2!1654
2021-12-02 10:22:14 +00:00
sphere
ec23753b69 Merge branch '401-fix' into 'next'
Add toggle for linedef action 401 to not change the ceiling texture.

Closes #567

See merge request STJr/SRB2!1663
2021-12-02 10:11:21 +00:00
sphere
cef9a1ad18 Merge branch 'damagetype-fixes' into 'next'
A few damage type fixes

Closes #392

See merge request STJr/SRB2!1660
2021-12-02 10:10:19 +00:00
sphere
b3e2b1671e Merge branch 'menu-edits-2210' into 'next'
Small menu edits

Closes #614 and #87

See merge request STJr/SRB2!1658
2021-12-02 10:10:08 +00:00
spherallic
c1c7607cb0 Add toggle for linedef action 401 to not change the ceiling texture. 2021-12-02 01:52:45 +01:00
sphere
16251734ce Merge branch 'hehballs' into 'next'
Fix Large Spike Balls not dealing spike damage

See merge request STJr/SRB2!1661
2021-12-01 10:06:01 +00:00
sphere
ec0345b059 Merge branch 'mostimportanttypo' into 'next'
The Single Most Important Typo Fix of All-Time

See merge request STJr/SRB2!1662
2021-12-01 10:04:55 +00:00
SMS Alfredo
aca0ba0f4b wow 2021-11-30 22:46:51 -06:00
SMS Alfredo
a5e1167ad2 balls 2021-11-30 20:51:15 -06:00
spherallic
9bdfafc9dd Add DMG_FIRE to Pyrefly fire and lavafall objects. 2021-11-29 19:25:30 +01:00
spherallic
49e6e7a80f Fix retracting spikes dealing typeless damage instead of spike damage. 2021-11-27 16:19:04 +01:00
spherallic
1afb0c556a Make Brak's electric barrier damage Elemental and Flame Shields. 2021-11-27 14:23:02 +01:00
spherallic
6a6b292c73 Fix Flame Shield interactions in old-style special stages. 2021-11-27 14:22:21 +01:00
sphere
491ffc7447 Merge branch 'firedeath' into 'next'
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382 Fix #214 (Crushstacean + Fireball Player Removal) 2021-11-26 14:11:09 +00:00
sphere
59660c56c2 Merge branch 'name-unnamed-userdata' into 'next'
Give userdata that needed names some names.

See merge request STJr/SRB2!1639
2021-11-26 14:07:39 +00:00
sphere
b83de902a5 Merge branch 'less-console-text-draw' into 'next'
Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412)

Closes #412

See merge request STJr/SRB2!1357
2021-11-26 13:57:55 +00:00
sphere
dd2a1c8394 Merge branch 'master' into 'next'
merge master into next again

See merge request STJr/SRB2!1659
2021-11-26 13:57:28 +00:00
sphere
f97261ae85 Merge branch 'let-mixed-declarations' into 'master'
Remove mixed code and declarations warning

See merge request STJr/SRB2!1618
2021-11-26 13:55:43 +00:00
sphere
e0071c1c36 Merge branch '11-array-bounds' into 'master'
Fix GCC 11 array-bounds warning in P_SetupStateAnimation

See merge request STJr/SRB2!1614
2021-11-26 13:55:40 +00:00
spherallic
4480af69c7 Only show Ultimate mode warning in unmodified vanilla gameplay. 2021-11-26 14:18:08 +01:00
sphere
08e63fc822 Show values on (float) sliders in the options menu. 2021-11-26 14:18:00 +01:00
sphere
d9fde5c395 Add emblem counter to the Extras checklist. 2021-11-26 14:17:49 +01:00