Commits · ksf-wadfiles · STJr / SRB2

Dec 01, 2021
- Only use IDs when requesting files · 395d0abe
  LJ Sonic authored 3 years ago
  
  395d0abe
Nov 29, 2021
- smh jimita smh · 572ca569
  LJ Sonic authored 3 years ago
  
  572ca569
- NO!! · b8a6073d
  LJ Sonic authored 3 years ago
  
  b8a6073d
Nov 28, 2021
- Fix fileneeded array not being reallocated correctly · 61925042
  LJ Sonic authored 3 years ago
  
  61925042
Nov 27, 2021
- Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into ksf-wadfiles · c96d32e5
  LJ Sonic authored 3 years ago
  
  c96d32e5
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
- Fix #214 (Crushstacean + Fireball Player Removal) · cf79bc83
  SMS Alfredo authored 3 years ago and sphere committed 3 years ago
  
  cf79bc83
- Merge branch 'name-unnamed-userdata' into 'next' · 59660c56
  sphere authored 3 years ago
  
  Give userdata that needed names some names. See merge request STJr/SRB2!1639
  59660c56
- Merge branch 'less-console-text-draw' into 'next' · b83de902
  sphere authored 3 years ago
  
  Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412) Closes #412 See merge request STJr/SRB2!1357
  b83de902
- Merge branch 'master' into 'next' · dd2a1c83
  sphere authored 3 years ago
  
  merge master into next again See merge request STJr/SRB2!1659
  dd2a1c83
- Merge branch 'let-mixed-declarations' into 'master' · f97261ae
  sphere authored 3 years ago
  
  Remove mixed code and declarations warning See merge request STJr/SRB2!1618
  f97261ae
- Merge branch '11-array-bounds' into 'master' · e0071c1c
  sphere authored 3 years ago
  
  Fix GCC 11 array-bounds warning in P_SetupStateAnimation See merge request STJr/SRB2!1614
  e0071c1c
Nov 25, 2021

Merge branch 'master' into 'next' · 00c50aea
sphere authored 3 years ago
```
merge master into next

Closes #671

See merge request STJr/SRB2!1657
```
00c50aea

Merge branch 'master' into 'master' · 68b622e8

sphere authored 3 years ago

Fix Debian (.deb) build from making (Project_root)/bin/Linux

See merge request STJr/SRB2!1595

68b622e8

Merge branch 'msys2-no-dynbase' into 'master' · 5a3c5f75
sphere authored 3 years ago
```
MSYS2: Don't compile with dynamic base

See merge request STJr/SRB2!1652
```
5a3c5f75

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 STJr/SRB2!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 14, 2021

Merge branch 'master' of https://git.do.srb2.org/stjr/srb2 · dbd1e61e

bitten2up authored 3 years ago

	modified:   src/CMakeLists.txt
	modified:   src/Makefile
	modified:   src/Makefile.d/detect.mk
	modified:   src/r_picformats.h
	modified:   src/sdl/mixer_sound.c

dbd1e61e

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 STJr/SRB2!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
Nov 03, 2021
- MSYS2: Don't compile with dynamic base · c55e9733
  SteelT authored 3 years ago
  
  Resolves #671
  c55e9733
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 STJr/SRB2!1628
  c9ff9049
Oct 22, 2021
- Give userdata that needed names some names. · 81104736
  Golden authored 3 years ago
  
  81104736
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