Commits · b86871667233d6933fd0ad32245f58d16ec8c619 · STJr / SRB2

Nov 25, 2021

Merge branch 'tails' into 'next' · b8687166

sphere authored 3 years ago

Remove misplaced CopyTiccmd from 2phuman (resolves #674)

Closes #674

See merge request !1627

b8687166

Merge branch 'interfree' into 'next' · f191525f

sphere authored 3 years ago

Don't cache the default background patches if we have an interscreen (resolves #546)

Closes #546

See merge request !1619

f191525f

Merge branch 'fix-nonet-compiling' into 'next' · e01c91d5
sphere authored 3 years ago
```
Fix NONET compiling

See merge request STJr/SRB2!1651
```
e01c91d5

Nov 24, 2021
- Merge branch 'boxsparkle_mario' into 'next' · b955c9c4
  sphere authored 3 years ago
  
  Exclude MT_BOXSPARKLE from Mario blocks See merge request !1556
  b955c9c4
- Merge branch 'ringslinger-penalty-split' into 'next' · 8a5cf4ae
  sphere authored 3 years ago
  
  Fix Ringslinger weapon ring penalty missplitment Closes #684 See merge request !1655
  8a5cf4ae
- Merge branch '555-2-2-9-rotated-patches-are-cropped-have-incorrect-dimensions' into 'next' · 88e022b6
  sphere authored 3 years ago
  
  Fix #555 Closes #555 See merge request !1648
  88e022b6
Nov 09, 2021
- Merge branch 'revert-2578e01c ' into 'next' · d776b1a2
  sphere authored 3 years ago
  
  Revert "Merge branch 'writable-colormaps' into 'next'" (closes #675) Closes #675 See merge request !1649
  d776b1a2
- Fix Ringslinger weapon ring penalty missplitment · cade6f3c
  Zwip-Zwap Zapony authored 3 years ago
  
  cade6f3c
Nov 08, 2021
- Merge branch 'change-my-name' into 'next' · 9ad9683c
  sphere authored 3 years ago
  
  Change my name See merge request !1650
  9ad9683c
- Fix NONET compiling · 1d7061b8
  Lactozilla authored 3 years ago
  
  1d7061b8
- Change my name · 32a68f35
  Lactozilla authored 3 years ago
  
  32a68f35
- Revert "Merge branch 'writable-colormaps' into 'next'" · 34b05efd
  Lactozilla authored 3 years ago
  
  This reverts merge request !959
  34b05efd
- Fix #555 · a14c008d
  Lactozilla authored 3 years ago
  
  a14c008d
Nov 07, 2021
- https://mb.srb2.org/threads/the-most-utterly-unimportant-typo-ever.27152 · 9a5bb598
  sphere authored 3 years ago
  
  9a5bb598
Oct 29, 2021
- Merge branch 'drawntooverlay' into 'next' · 06dfd360
  sphere authored 3 years ago
  
  Make Overlay objects account for player->drawangle See merge request STJr/SRB2!1599
  06dfd360
- Make Overlay objects account for player->drawangle · 865c0a08
  SMS Alfredo authored 3 years ago and sphere committed 3 years ago
  
  865c0a08
Oct 27, 2021
- Merge branch 'sunnywithcloudsandshowers' into 'next' · 2d8230cb
  sphere authored 3 years ago
  
  Fix broken rain to rain weather switching See merge request STJr/SRB2!1626
  2d8230cb
- Fix broken rain to rain weather switching · e10eddd1
  candelavla authored 3 years ago and sphere committed 3 years ago
  
  e10eddd1
- Merge branch 'dave-credits' into 'next' · edaa955b
  sphere authored 3 years ago
  
  Fix #672 Closes #672 See merge request !1623
  edaa955b
Oct 26, 2021
- Merge branch 'remove-unused-function' into 'next' · c9ff9049
  SteelT authored 3 years ago
  
  Remove unused I_GetMouseGrab function See merge request !1628
  c9ff9049
Sep 23, 2021
- Remove unused I_GetMouseGrab function · 0f4074f2
  SteelT authored 3 years ago
  
  0f4074f2
- fix tailsbot controls · ed5942a0
  katsy authored 3 years ago
  
  ed5942a0
Sep 21, 2021
- Missed the 'i' · d88eb7cc
  James R. authored 3 years ago
  
  d88eb7cc
- Correct Big Wave Dave/InstantSonic credits · 143a5154
  James R. authored 3 years ago
  
  143a5154
Sep 13, 2021
- don't create the default patches if we have an interscreen · 3d2f9e61
  katsy authored 3 years ago
  
  3d2f9e61
- Fix faulty comparison · 923e6f31
  James R. authored 3 years ago
  
  Logical comparisons evaluate to a boolean value...
  923e6f31
- Fix compiler warnings · fec5f277
  James R. authored 3 years ago
  
  fec5f277
- Merge branch 'hudlib-hook-refactor' into 'next' · 952ae516
  Tatsuru authored 3 years ago
  
  Refactor HUD hooks too See merge request !1577
  952ae516
- Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor · c33d8b3b
  James R. authored 3 years ago
  
  c33d8b3b
Sep 12, 2021
- Revert "Merge branch 'draw-act-num' into 'next'" · db92f31f
  Tatsuru authored 3 years ago
  
  This reverts merge request !1532
  db92f31f
- Merge branch 'draw-act-num' into 'next' · 30567d75
  Tatsuru authored 3 years ago
  
  Expose act number drawing functions to Lua See merge request !1532
  30567d75
- Merge branch 'shorter-hidetime' into 'next' · 252a48c2
  Tatsuru authored 3 years ago
  
  Cut cv_hidetime's minimum value to 1 (resolves #586) Closes #586 See merge request STJr/SRB2!1544
  252a48c2
- Merge branch 'where-the-fuck-is-my-mobj-at' into 'next' · 1875c0dc
  Tatsuru authored 3 years ago
  
  Add player mobj check to P_PlayerInPain (resolves #640) Closes #640 See merge request STJr/SRB2!1587
  1875c0dc
- Merge branch 'oneline' into 'next' · bb0a0bd4
  Tatsuru authored 3 years ago
  
  Add a missing scale assignment to A_Boss3ShockThink See merge request STJr/SRB2!1588
  bb0a0bd4
- Add a missing scale assignment to A_Boss3ShockThink · d5cdb2dc
  SMS Alfredo authored 3 years ago and Tatsuru committed 3 years ago
  
  d5cdb2dc
- Merge branch 'shocksplit' into 'next' · 9187656b
  Tatsuru authored 3 years ago
  
  Split up x/y/z averages in A_Boss3ShockThink (resolves #589) Closes #589 See merge request STJr/SRB2!1538
  9187656b
- Merge branch 'youvebeenblocked' into 'next' · cd5ba127
  Tatsuru authored 3 years ago
  
  Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332) Closes #332 See merge request STJr/SRB2!1491
  cd5ba127
- Merge branch 'mapload-trigger-fix' into 'next' · 66f054f1
  Tatsuru authored 3 years ago
  
  Don't call map load trigger linedefs when joining or reloading gamestate See merge request !1592
  66f054f1
- Merge branch 'folder-fixes' into 'next' · df249a4a
  Tatsuru authored 3 years ago
  
  Fix minor issues with folder addons See merge request STJr/SRB2!1617
  df249a4a
- Fix minor issues with folder addons · aaf4653f
  Lactozilla authored 3 years ago and Tatsuru committed 3 years ago
  
  aaf4653f