Commits · bddafbeece6ef2539ee272b943f7bf1204fa2352 · STJr / SRB2 · GitLab

Snippets Groups Projects

Aug 04, 2019
- 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
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
- Fix the minor issues since steel's busy · f3baac85
  toaster authored 5 years ago
  
  f3baac85
- Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1. · 544a160f
  toaster authored 5 years ago
  
  544a160f
- MI made a good argument for bossdisabled not being conditional on fromnetsave. · 105df239
  toaster authored 5 years ago
  
  105df239
Aug 02, 2019
- Have the ring bonus in MP Special Stages be based on the shared sum of all players'. · 876f87e7
  toaster authored 5 years ago
  
  876f87e7
- Add rings to old/MP special stage HUD + make both them and spheres (in old... · 16c541ef
  toaster authored 5 years ago
  
  Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k
  16c541ef
- Perfect bonus support for non-NiGHTS special stages · c4f0fdb7
  toaster authored 5 years ago
  
  c4f0fdb7
- Fix old Special Stage failure sounds not always playing. · 8d561334
  toaster authored 5 years ago
  
  8d561334
- Merge branch 'bustables_misc' into 'master' · af38c0e2
  Monster Iestyn authored 5 years ago
  
  Bustables and landing events Closes #157 and #162 See merge request STJr/SRB2Internal!262
  af38c0e2
- Merge branch 'anglestuff' into 'master' · 94c1873b
  Monster Iestyn authored 5 years ago
  
  Spring angles and ring angles See merge request STJr/SRB2Internal!266
  94c1873b
- Merge branch 'emeraldfixes' into 'master' · 8520243a
  Monster Iestyn authored 5 years ago
  
  Special stage related fixes See merge request STJr/SRB2Internal!269
  8520243a
- Merge branch 'maniaspheresfix' into 'master' · 146271e4
  Monster Iestyn authored 5 years ago
  
  MANIASPHERES de-hardcode See merge request STJr/SRB2Internal!268
  146271e4
- Merge branch 'spring-things' into 'master' · ee64d98e
  Monster Iestyn authored 5 years ago
  
  Additional spring flags See merge request STJr/SRB2Internal!256
  ee64d98e
- Merge branch 'followmobj_scale' into 'master' · 2503c2f3
  Monster Iestyn authored 5 years ago
  
  Smiles tail scale See merge request STJr/SRB2Internal!273
  2503c2f3
- Merge branch 'diagonalrings' into 'master' · aab3a029
  Monster Iestyn authored 5 years ago
  
  Diagonal spring ring fixes See merge request STJr/SRB2Internal!267
  aab3a029
- Modify P_CheckSector with a modified version of Sal's attempted proper fix for... · 42a36de4
  Monster Iestyn authored 5 years ago
  
  Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
  42a36de4