19539 Commits

This Branch

This Branch

All Branches

• 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 branch 'master' into multi-background-stack
  David Zhao · 2019-03-11 11:19:08 +09:00
  0d95511222
• Give Multiplayer its own background stack
  David Zhao · 2019-03-11 11:08:04 +09:00
  2df57c3a29
• 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
• Apply most suggestions
  jorolf · 2019-03-09 23:58:14 +01:00
  2525f5bcb7
• Merge branch 'screen-title-class' of github.com:Jorolf/osu into profile-header-update
  jorolf · 2019-03-09 20:22:33 +01:00
  bb6e57169f
• Fix direct panel stats being misaligned by one pixel
  Joehu · 2019-03-08 20:27:50 -08:00
  7311ccabfb
• Merge branch 'master' into prevent-null-lookup
  Dean Herbert · 2019-03-09 11:14:54 +09:00
  9df27f3a5f
• add ScreenTitle class
  jorolf · 2019-03-08 23:44:01 +01:00
  af1c54d995
• Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update
  jorolf · 2019-03-08 22:37:23 +01:00
  0ac4bbfcf0
• 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
• Fix showing outdated data for non-online beatmaps
  Jamie Taylor · 2019-03-08 18:44:35 +09:00
  8e5816805c
• Add test steps for BeatmapDetailArea
  Jamie Taylor · 2019-03-08 18:35:49 +09:00
  192c257aac
• Set DummyWorkingBeatmap difficulties to 0 for better fallback display
  Jamie Taylor · 2019-03-08 18:17:50 +09:00
  800007c378
• Minor refactorings
  smoogipoo · 2019-03-08 17:18:54 +09:00
  9a05643ec9
• Apply formatting adjustments
  smoogipoo · 2019-03-08 16:44:39 +09:00
  a40ffcc692
• Reduce + make beatmap scores testcase work
  smoogipoo · 2019-03-08 16:41:37 +09:00
  8c0e325d8b
• Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
  smoogipoo · 2019-03-08 16:32:46 +09:00
  a7ad29ca9d
• 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