Commits · 904b434c65340fff1505901db181a33dda8603bb · STJr / SRB2 · GitLab

Snippets Groups Projects

Jan 09, 2022
- Merge branch 'udmf-scrollers' into udmf-polyobjects · 904b434c
  MascaraSnake authored 3 years ago
  
  904b434c
- Merge branch 'udmf-plane-linedefs' into udmf-scrollers · 0c6e2c70
  MascaraSnake authored 3 years ago
  
  0c6e2c70
- Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs · 5e7547b8
  MascaraSnake authored 3 years ago
  
  5e7547b8
- Fix typo in wall scroller conversion · ce29d05b
  MascaraSnake authored 3 years ago
  
  ce29d05b
Jan 04, 2022
- Fix incorrect turnaround behavior for bounceFloor and bounceCeiling · a8e32cfe
  MascaraSnake authored 3 years ago
  
  a8e32cfe
- Fix typo in laser FOF conversion · 7609f300
  MascaraSnake authored 3 years ago
  
  7609f300
Dec 12, 2021
- Remove outdated linedef type check in HWR_ProcessSeg · f714966c
  MascaraSnake authored 3 years ago
  
  f714966c
Dec 03, 2021
- Merge branch 'udmf-scrollers' into udmf-polyobjects · 99515bce
  MascaraSnake authored 3 years ago
  
  99515bce
- Merge branch 'udmf-plane-linedefs' into udmf-scrollers · 76962a3a
  MascaraSnake authored 3 years ago
  
  76962a3a
- Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs · c4775ed3
  MascaraSnake authored 3 years ago
  
  # Conflicts: # extras/conf/SRB2-22.cfg # src/p_ceilng.c
  c4775ed3
- Merge branch 'next' into udmf-fofs-mkii · adce4272
  MascaraSnake authored 3 years ago
  
  # Conflicts: # src/p_user.c
  adce4272
- Port katsy's bouncy FOF cleanup · 6dc49042
  MascaraSnake authored 3 years ago
  
  6dc49042
- Merge branch 'metal-recording-srb2home' into 'next' · bb514a06
  SteelT authored 3 years ago
  
  Fix metal recordings not being saved in srb2home See merge request STJr/SRB2!1601
  bb514a06
Dec 02, 2021
- Merge branch 'adjust-max-downloadspeed' into 'next' · d77b4273
  LJ Sonic authored 3 years ago
  
  Raise the maximum value of file upload speed drastically See merge request STJr/SRB2!1665
  d77b4273
- Merge branch 'fix-console-keyup' into 'next' · b959d0f4
  LJ Sonic authored 3 years ago
  
  Fix `KeyUp` hook being called when the console is open See merge request STJr/SRB2!1664
  b959d0f4
- Merge branch 'perfstats-averaging-rebased' into 'next' · be87a84a
  LJ Sonic authored 3 years ago
  
  Perfstats averaging and refactor See merge request STJr/SRB2!1643
  be87a84a
- Merge branch 'ksf-wadfiles' into 'next' · 95c61e0f
  LJ Sonic authored 3 years ago
  
  Raise addon limit See merge request STJr/SRB2!1465
  95c61e0f
- Raise addon limit · a3353be0
  Lactozilla authored 3 years ago and LJ Sonic committed 3 years ago
  
  a3353be0
- Merge branch 'lua-timestamp' into 'next' · 599abc2a
  LJ Sonic authored 3 years ago
  
  Timestamp function for Lua See merge request STJr/SRB2!1647
  599abc2a
- Remove downloadspeed cruft · ff037a81
  LJ Sonic authored 3 years ago
  
  ff037a81
- Raise the file upload speed drastically · 14403737
  LJ Sonic authored 3 years ago
  
  14403737
- Make all key identifiers lowercase · 425d1f1b
  LJ Sonic authored 3 years ago
  
  425d1f1b
- Fix KeyUp hook being called when the console is open · 443c5171
  LJ Sonic authored 3 years ago
  
  443c5171
- Merge branch 'what' into 'next' · 33c43744
  sphere authored 3 years ago
  
  Clean up bouncy fof code + fix bugs (closes #291) Closes #291 See merge request STJr/SRB2!1461
  33c43744
- Merge branch 'myfixes' into 'next' · dad13f2d
  sphere authored 3 years ago
  
  Fix visplanes getting allocated twice (backport from srb2kart) See merge request STJr/SRB2!1636
  dad13f2d
- Merge branch 'drawtiltedsplat-npo2-typo' into 'next' · 3597475a
  sphere authored 3 years ago
  
  Remove that line again See merge request STJr/SRB2!1645
  3597475a
- Merge branch 'lethallavaland' into 'next' · a8f75428
  sphere authored 3 years ago
  
  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
  a8f75428
- Merge branch '401-fix' into 'next' · ec23753b
  sphere authored 3 years ago
  
  Add toggle for linedef action 401 to not change the ceiling texture. Closes #567 See merge request STJr/SRB2!1663
  ec23753b
- Merge branch 'damagetype-fixes' into 'next' · cef9a1ad
  sphere authored 3 years ago
  
  A few damage type fixes Closes #392 See merge request !1660
  cef9a1ad
- Merge branch 'menu-edits-2210' into 'next' · b3e2b167
  sphere authored 3 years ago
  
  Small menu edits Closes #614 and #87 See merge request STJr/SRB2!1658
  b3e2b167
- Add toggle for linedef action 401 to not change the ceiling texture. · c1c7607c
  sphere authored 3 years ago
  
  c1c7607c
Dec 01, 2021
- Merge branch 'hehballs' into 'next' · 16251734
  sphere authored 3 years ago
  
  Fix Large Spike Balls not dealing spike damage See merge request STJr/SRB2!1661
  16251734
- Merge branch 'mostimportanttypo' into 'next' · ec0345b0
  sphere authored 3 years ago
  
  The Single Most Important Typo Fix of All-Time See merge request STJr/SRB2!1662
  ec0345b0
- wow · aca0ba0f
  SMS Alfredo authored 3 years ago
  
  aca0ba0f
- balls · a5e1167a
  SMS Alfredo authored 3 years ago
  
  a5e1167a
Nov 29, 2021
- Add DMG_FIRE to Pyrefly fire and lavafall objects. · 9bdfafc9
  sphere authored 3 years ago
  
  9bdfafc9
Nov 27, 2021
- Fix retracting spikes dealing typeless damage instead of spike damage. · 49e6e7a8
  sphere authored 3 years ago
  
  49e6e7a8
- Make Brak's electric barrier damage Elemental and Flame Shields. · 1afb0c55
  sphere authored 3 years ago
  
  1afb0c55
- Fix Flame Shield interactions in old-style special stages. · 6a6b292c
  sphere authored 3 years ago
  
  6a6b292c
Nov 26, 2021

Merge branch 'firedeath' into 'next' · 491ffc74

sphere authored 3 years ago

Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629

491ffc74