katsy
97e2fe18c6
fix spike sandwich teleportation issue
2021-12-06 18:00:30 -06:00
MascaraSnake
9ebc259ab3
Split P_ProcessSpecialSector into multiple functions
2021-12-06 18:50:06 +01:00
LJ Sonic
6504557393
Merge branch 'asin' into 'next'
...
arcsine Lua wrapper
See merge request STJr/SRB2!1554
2021-12-06 00:01:45 +00:00
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
f359151457
Merge branch 'trigger-bruh' into udmf-executor-triggers
2021-12-05 08:36:11 +01: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
MascaraSnake
87a6528f00
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-12-03 19:26:46 +01:00
MascaraSnake
f5cda9f64c
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-12-03 19:23:24 +01:00
MascaraSnake
aee4996eba
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-12-03 19:22:37 +01:00
MascaraSnake
99515bce24
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-12-03 19:21:44 +01:00
MascaraSnake
76962a3a3f
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-12-03 19:20:39 +01:00
MascaraSnake
c4775ed37b
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# extras/conf/SRB2-22.cfg
# src/p_ceilng.c
2021-12-03 19:10:29 +01: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
MascaraSnake
adce427299
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/p_user.c
2021-12-03 18:58:02 +01:00
MascaraSnake
6dc49042de
Port katsy's bouncy FOF cleanup
2021-12-03 18:48:16 +01: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
MascaraSnake
d44ef91f6f
Re-add FF_BUSTUP to INT_CONST
2021-11-28 19:34:42 +01:00
