Commits · 0435acd5167fa1a43d43332c889729247fb048a5 · Ors / SRB2

Jun 25, 2020
- Merge branch 'gamequit-hook' into 'next' · 0435acd5
  James R. authored 4 years ago
  
  GameQuit Hook See merge request STJr/SRB2!847
  0435acd5
- Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook · b973b432
  ChaoLoveIceMDBoy authored 4 years ago
  
  b973b432
- Merge branch 'ogl-sprite-qsort' into 'next' · 7317bbb6
  James R. authored 4 years ago
  
  Faster OGL sprite sorting algorithm See merge request STJr/SRB2!1008
  7317bbb6
- Merge branch 'gtr-fixes' into 'next' · 8c3e2728
  James R. authored 4 years ago
  
  Gametype fixes See merge request STJr/SRB2!816
  8c3e2728
- Merge remote-tracking branch 'origin/next' into gtr-fixes · 067d9b9a
  James R. authored 4 years ago
  
  067d9b9a
- Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook · b14f18c1
  ChaoLoveIceMDBoy authored 4 years ago
  
  b14f18c1
- Merge branch 'acz3-softlock-fix' into 'next' · 207d8aee
  James R. authored 4 years ago
  
  ACZ3 softlock fix See merge request STJr/SRB2!1015
  207d8aee
- Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next' · 95cc10d7
  James R. authored 4 years ago
  
  Don't repeatedly look for model texture files See merge request STJr/SRB2!1009
  95cc10d7
- Merge branch 'fixeggsign' into 'next' · 9eb8fd8a
  James R. authored 4 years ago
  
  Fix the Eggman signpost's background color See merge request STJr/SRB2!1007
  9eb8fd8a
- Merge branch 'ogl-drawnode-fix' into 'next' · 2e827705
  James R. authored 4 years ago
  
  Faster and more correct OGL transparent surface sorting See merge request STJr/SRB2!1005
  2e827705
- Merge branch 'gme-cleanup-fixes' into 'next' · ac71bb76
  James R. authored 4 years ago
  
  GME cleanup and fixes See merge request STJr/SRB2!1001
  ac71bb76
- Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook · 5ef8c95c
  ChaoLoveIceMDBoy authored 4 years ago
  
  5ef8c95c
Jun 22, 2020
- Merge branch 'lua-side-enum-bruh' into 'next' · 7d2de839
  Monster Iestyn authored 4 years ago
  
  Fix missing bruh string in Lua side string options. See merge request STJr/SRB2!1017
  7d2de839
- Fix missing bruh string in lua side options. This is stupid. · 80e0d353
  Latapostrophe authored 4 years ago
  
  80e0d353
Jun 21, 2020
- Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. · e9e9cd61
  sphere authored 4 years ago
  
  e9e9cd61
Jun 19, 2020
- Don't repeatedly look for model texture files · f3212746
  Hannu Hanhi authored 4 years ago
  
  f3212746
- Faster OGL sprite sorting algorithm · 6f9b9aac
  Hannu Hanhi authored 4 years ago
  
  6f9b9aac
- lol should have tested before pushing · cab87b46
  lachwright authored 4 years ago
  
  cab87b46
- Fix the Eggman signpost's background color · 47d9d876
  lachwright authored 4 years ago
  
  47d9d876
Jun 18, 2020
- Merge branch 'shaderless-support-next' into 'next' · 8063814f
  Nev3r authored 4 years ago
  
  Backwards compatibility for shaderless hardware See merge request STJr/SRB2!1003
  8063814f
- Faster and more correct OGL transparent surface sorting · ffaffdf3
  Hannu Hanhi authored 4 years ago
  
  ffaffdf3
- Backwards compatibility for shaderless hardware · 9477d372
  Hannu Hanhi authored 4 years ago
  
  9477d372
Jun 17, 2020
- Merge branch 'marathonmode' into 'next' · bff6b190
  SteelT authored 4 years ago
  
  MARATHON RUN See merge request STJr/SRB2!941
  bff6b190
- Merge branch 'sal-oglshaderport' into 'next' · 5a52f9cb
  SteelT authored 4 years ago
  
  OpenGL shaders See merge request STJr/SRB2!724
  5a52f9cb
- A even more better fix for this · 8365d975
  SteelT authored 4 years ago
  
  8365d975
- Better fix for may be used uninitialized, maybe fixes GCC 4.x · 1e655fb2
  SteelT authored 4 years ago
  
  1e655fb2
- Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport · 3946309e
  SteelT authored 4 years ago
  
  # Conflicts: # src/hardware/r_opengl/r_opengl.c
  3946309e
- Use SAMPLERATE for consistency with the rest of the code · 5708325d
  SteelT authored 4 years ago
  
  5708325d
- Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong · f626b9f4
  SteelT authored 4 years ago
  
  f626b9f4
- Reduce code duplication by creating get_zlib_error function · a34be0e3
  SteelT authored 4 years ago
  
  Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong Return false if it fails to decompress VGZ data in some form.
  a34be0e3
- Fix facecolor may be used uninitialized. · d3d5496a
  SteelT authored 4 years ago
  
  d3d5496a
Jun 12, 2020
- I forgot to pop the error handler · 6eccc703
  ChaoLoveIceMDBoy authored 4 years ago
  
  6eccc703
- Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook · 965d42f9
  ChaoLoveIceMDBoy authored 4 years ago
  
  965d42f9
- Merge branch 'dofile' into 'next' · 23226444
  Nev3r authored 4 years ago
  
  Add dofile() to Lua See merge request STJr/SRB2!969
  23226444
- Merge branch 'master' into next · b056bf1d
  SteelT authored 4 years ago
  
  b056bf1d
- Merge branch 'next-lc-uint16' into 'next' · c810ea39
  SteelT authored 4 years ago
  
  Custom skincolor bugfixes See merge request STJr/SRB2!971
  c810ea39
Jun 11, 2020
- Updated LUAh_GameQuit to use new error handler · 0d70e16b
  ChaoLoveIceMDBoy authored 4 years ago
  
  0d70e16b
- Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook · 08e9efee
  ChaoLoveIceMDBoy authored 4 years ago
  
  08e9efee
- Merge branch 'better-download' into 'next' · 38a8fe2b
  LJ Sonic authored 4 years ago
  
  Improvements to the in-game file downloader See merge request STJr/SRB2!976
  38a8fe2b
Jun 10, 2020
- Merge branch 'next' into 'better-download' · 7ffee074
  LJ Sonic authored 4 years ago
  
  # Conflicts: # src/d_clisrv.c
  7ffee074