Commits · 603d5805f7ed73efe9073a81c4516c02587064ea · STJr / SRB2 · GitLab

Snippets Groups Projects

Aug 04, 2019
- Revert "Merge branch 'musicplus-aug2019-b' into 'master'" · 603d5805
  toaster authored 5 years ago
  
  This reverts commit 56bfdb71, reversing changes made to c29cfbef.
  603d5805
- Revert "Fix MIDI Soundfont code shadowing a global variable." · 99dbcb9f
  toaster authored 5 years ago
  
  This reverts commit 3591e3d0.
  99dbcb9f
- Merge branch 'gcc7_corrections_aug2019' into 'master' · 5cff567a
  MascaraSnake authored 5 years ago
  
  ACTUALLY fix for gcc7 See merge request STJr/SRB2Internal!280
  5cff567a
- Fix MIDI Soundfont code shadowing a global variable. · 3591e3d0
  toaster authored 5 years ago
  
  3591e3d0
- Fix inadvertent fallthrough and associated whitespace. · a87e1b8a
  toaster authored 5 years ago
  
  a87e1b8a
- Fix HWR_DrawConsoleFill. · 48e09d56
  toaster authored 5 years ago
  
  48e09d56
- Merge branch 'musicplus-aug2019-b' into 'master' · 56bfdb71
  mazmazz authored 5 years ago
  
  MusicPlus August 2019 merge Closes #6 See merge request STJr/SRB2Internal!279
  56bfdb71
- Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b · cdb7250d
  Marco Z authored 5 years ago
  
  cdb7250d
- Merge branch 'gcc7-fixes-aug2019' into 'master' · c29cfbef
  mazmazz authored 5 years ago
  
  gcc7 compile fixes (Fall through; spr2 var comparison) See merge request STJr/SRB2Internal!277
  c29cfbef
- Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 · ce39341c
  Marco Z authored 5 years ago
  
  ce39341c
- Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 · bddafbee
  Marco Z authored 5 years ago
  
  bddafbee
- Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 · 8dc29fb5
  Marco Z authored 5 years ago
  
  8dc29fb5
- Mixer X menu touchup · fd4d3a6a
  Marco Z authored 5 years ago
  
  fd4d3a6a
- Revert djgppdos fade function inadvertent merge · fbaf5106
  Marco Z authored 5 years ago
  
  fbaf5106
- Revert MUSSERV code removal from S_LoadMusic · 91265379
  Marco Z authored 5 years ago
  
  (but we'll probably purge it later, anyway...)
  91265379
- Fix HWR_DrawConsoleFill call extra input · d4f6a145
  Marco Z authored 5 years ago
  
  d4f6a145
- Fix HWR_DrawConsoleFill call extra input · 6f50faf1
  Marco Z authored 5 years ago
  
  6f50faf1
- Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx · d373b101
  Marco Z authored 5 years ago
  
  d373b101
- Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx · b99f06c0
  Marco Z authored 5 years ago
  
  b99f06c0
- Slight refactor for jingle resume lapse time · 353fefbd
  Marco Z authored 5 years ago
  
  353fefbd
- Jingle resume: Don't set music position when music is replaced · 81d08403
  Marco Z authored 5 years ago
  
  81d08403
- Fix 1up intermission jingle not playing · da55b4b8
  Marco Z authored 5 years ago
  
  da55b4b8
- Fix HWR_DrawConsoleFill call extra input · 6ecc062c
  Marco Z authored 5 years ago
  
  6ecc062c
- Merge branch 'gcc7-fixes-aug2019' into internal-musicplus-jingle · 8a41b530
  Marco Z authored 5 years ago
  
  8a41b530
- Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle · dd9efeba
  Marco Z authored 5 years ago
  
  dd9efeba
- gcc7 compile fixes (Fall through; spr2 var comparison) · 5b284c81
  Marco Z authored 5 years ago
  
  5b284c81
- gcc7 compile fixes (Fall through; spr2 var comparison) · 07d1363d
  Marco Z authored 5 years ago
  
  07d1363d
- Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp · 5f2a45be
  Marco Z authored 5 years ago
  
  5f2a45be
- Fix titlemap music bug · a9b66109
  Marco Z authored 5 years ago
  
  a9b66109
- Fix titlemap music bug · efc8e420
  Marco Z authored 5 years ago
  
  efc8e420
- Merge branch 'master' into musicplus-feature-dying-fp · 1b59b224
  Marco Z authored 5 years ago
  
  1b59b224
Aug 03, 2019
- Merge branch 'ending' into 'master' · 8a0f1e7e
  toaster authored 5 years ago
  
  ENDINGS See merge request STJr/SRB2Internal!264
  8a0f1e7e
- Merge branch 'bossenable' into 'master' · 9f34a7aa
  toaster authored 5 years ago
  
  Boss enable linedef (type 449) See merge request STJr/SRB2Internal!272
  9f34a7aa
- Merge branch 'snaptoground-fix' into 'master' · 97072d9f
  toaster authored 5 years ago
  
  Snap to ground fix Closes #165 See merge request STJr/SRB2Internal!274
  97072d9f
- Merge branch 'mpspec_cleanup' into 'master' · 5ef190fc
  toaster authored 5 years ago
  
  MP/Old Special Stage ring stuff See merge request STJr/SRB2Internal!276
  5ef190fc
- Merge branch 'linedef-award-rings' into 'master' · 8f729c33
  toaster authored 5 years ago
  
  New award rings linedef executor See merge request STJr/SRB2Internal!263
  8f729c33
- Remove commented out P_CheckSector calls and add extra comments explaining the situation · f9037509
  Monster Iestyn authored 5 years ago
  
  f9037509
- Merge branch 'master' into snaptoground-fix · dff54440
  Monster Iestyn authored 5 years ago
  
  dff54440
- Merge branch 'speciallosesound' into 'master' · 38ecd00a
  Monster Iestyn authored 5 years ago
  
  Fix old Special Stage failure sounds not always playing See merge request STJr/SRB2Internal!275
  38ecd00a
- Merge branch 'titlemaplua' into 'master' · c82c2ee8
  Monster Iestyn authored 5 years ago
  
  Titlemap Lua See merge request STJr/SRB2Internal!270
  c82c2ee8