17243 Commits

This Branch

This Branch

All Branches

• Call ResetSpeedAdjustments before adjusting clock
  Dean Herbert · 2019-03-12 11:35:25 +09:00
  cdeaa80fea
• Fix "wind" mods adjusting rate twice

  This is a hotfix for incorrect framework behaviour.
  
  Closes #4442

  Dean Herbert · 2019-03-12 02:45:45 +09:00
  13b3036ec6
• Merge pull request #4438 from peppy/extract-slider-tick-creation

  Extract slider tick creation so it can be shared with osu!catch

  Dan Balasescu · 2019-03-11 15:01:32 +09:00
  7805b95a1e
• Clarify repeat index
  Dean Herbert · 2019-03-11 14:53:21 +09:00
  63fea65c0c
• Add xmldoc and clarify struct variables
  Dean Herbert · 2019-03-11 14:36:29 +09:00
  489153579a
• Rename and reuse variables
  Dean Herbert · 2019-03-11 14:33:21 +09:00
  2029cf93fd
• Merge remote-tracking branch 'upstream/master' into extract-slider-tick-creation
  Dean Herbert · 2019-03-11 14:31:12 +09:00
  26f78b659b
• Merge pull request #4448 from Joehuu/naming-convention-1

  Fix file naming on ParticipantCountDisplay

  Dean Herbert · 2019-03-10 20:48:34 +09:00
  61330a690e
• Fix file naming on ParticipantCountDisplay
  Joehu · 2019-03-09 20:29:56 -08:00
  0fc6fa7245
• Merge pull request #4440 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-03-08 22:46:43 +09:00
  2019.308.0 312efbdc34
• Update framework
  Dean Herbert · 2019-03-08 20:48:50 +09:00
  10734b774c
• Merge branch 'master' into extract-slider-tick-creation
  Dean Herbert · 2019-03-08 20:40:03 +09:00
  c6194d5487
• Merge pull request #4157 from LeNitrous/mod-wind

  Add "Wind Up" and "Wind Down" mods

  Dean Herbert · 2019-03-08 20:32:43 +09:00
  843a37721d
• Merge branch 'master' into mod-wind
  Dean Herbert · 2019-03-08 20:23:02 +09:00
  48e54c84c1
• Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
  Dean Herbert · 2019-03-08 20:13:58 +09:00
  28a1baa07e
• Update catch dfificulty test

  Likely the result of fixing https://github.com/ppy/osu/issues/4426.

  Dean Herbert · 2019-03-08 20:13:55 +09:00
  eadd7ce913
• LegacyFinalTick -> LegacyLastTick to match existing variable
  Dean Herbert · 2019-03-08 20:13:11 +09:00
  93a999396e
• Add extensive commenting about LegacyLastTick usage
  Dean Herbert · 2019-03-08 20:12:48 +09:00
  165a353a83
• Merge branch 'master' into extract-slider-tick-creation
  Dean Herbert · 2019-03-08 20:00:12 +09:00
  f59b9e933e
• Add player test for osu! ruleset
  Dean Herbert · 2019-03-08 19:57:39 +09:00
  dd50c5dc1a
• Fix legacy tick handling
  Dean Herbert · 2019-03-08 19:57:30 +09:00
  355705f0a5
• Merge pull request #4431 from peppy/gameplay-clock-container

  Simplify gameplay clock logic with a dedicated container

  Dan Balasescu · 2019-03-08 16:05:48 +09:00
  a40a0f10bd
• Remove blank line
  smoogipoo · 2019-03-08 15:56:36 +09:00
  d055b248ac
• Merge remote-tracking branch 'origin/master' into gameplay-clock-container

  # Conflicts:
  #	osu.Game/Screens/Play/Player.cs

  smoogipoo · 2019-03-08 15:54:15 +09:00
  7c5ca67691
• Merge pull request #4436 from peppy/fix-non-async-load

  Fix some non-async load scenarios

  Dan Balasescu · 2019-03-08 15:49:02 +09:00
  253a37c8a7
• Apply review
  Dean Herbert · 2019-03-08 15:14:57 +09:00
  973f29b765
• Merge branch 'master' into fix-non-async-load
  Dan Balasescu · 2019-03-08 15:14:37 +09:00
  c967875ff6
• Merge remote-tracking branch 'origin/master' into fix-non-async-load
  smoogipoo · 2019-03-08 15:14:14 +09:00
  e00702f4e4
• Move sizing to ctor
  smoogipoo · 2019-03-08 15:14:07 +09:00
  09b5cf4891
• Merge pull request #4418 from peppy/cursor-in-playfield

  Fix gameplay cursor discrepancies

  Dan Balasescu · 2019-03-08 15:12:26 +09:00
  7bf60934a5
• Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
  Dean Herbert · 2019-03-08 15:07:55 +09:00
  ed8c9bc88a
• Apply review
  Dean Herbert · 2019-03-08 15:05:45 +09:00
  42efea1e06
• Move cursor construction to BDL
  Dean Herbert · 2019-03-08 15:01:45 +09:00
  a73e3d9700
• Split out consumption and creation into two separate code paths
  Dean Herbert · 2019-03-08 14:59:45 +09:00
  2c98ba1c0c
• Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
  Dean Herbert · 2019-03-08 14:50:46 +09:00
  3ccc76e18f
• Extract slider tick creation so it can be shared with osu!catch
  Dean Herbert · 2019-03-08 14:46:26 +09:00
  551380dd42
• Merge pull request #4420 from nekodex/fix-roomstate-on-cancel

  Fix RoomInspector image inadvertently changing when cancelling MP room creation

  Dan Balasescu · 2019-03-08 14:30:17 +09:00
  398c330934
• Merge branch 'master' into fix-roomstate-on-cancel
  Dan Balasescu · 2019-03-08 14:10:24 +09:00
  969d5bcbd0
• Merge pull request #4410 from peppy/fix-cursor-in-scale-container

  Fix menu cursor not displaying outside of gameplay scaling area

  Dan Balasescu · 2019-03-08 14:06:58 +09:00
  93ae058681
• Fix incomplete comment
  Dean Herbert · 2019-03-08 12:44:33 +09:00
  400514630d
• Merge branch 'master' into fix-cursor-in-scale-container
  Dan Balasescu · 2019-03-08 12:43:57 +09:00
  d1c18c52ab
• Merge pull request #4437 from peppy/fix-resharper-inspection

  Fix stuck r# inspection

  Dean Herbert · 2019-03-08 12:43:17 +09:00
  c4cc72cad9
• Merge branch 'master' into fix-roomstate-on-cancel
  Jamie Taylor · 2019-03-08 12:39:29 +09:00
  08fc42f8e9
• Merge pull request #4419 from nekodex/fix-duplicate-bg-sprites

  Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites

  Dean Herbert · 2019-03-08 12:34:56 +09:00
  3a634b7d72
• Merge branch 'master' into gameplay-clock-container
  Dean Herbert · 2019-03-08 12:32:48 +09:00
  75e94eba35
• Fix test regression
  Dean Herbert · 2019-03-08 12:30:52 +09:00
  345c7f4fa8
• Merge branch 'master' into fix-resharper-inspection
  Dean Herbert · 2019-03-08 12:29:56 +09:00
  5ade51f030
• Merge branch 'master' into fix-duplicate-bg-sprites
  Dean Herbert · 2019-03-08 12:25:23 +09:00
  30a0bb4a25
• Merge pull request #4434 from peppy/fix-autoplay-tests

  Fix replay tests not working

  Dean Herbert · 2019-03-08 12:21:33 +09:00
  196ebab10f
• Fix stuck r# inspection
  Dean Herbert · 2019-03-08 12:16:12 +09:00
  d01b026ebd