19539 Commits

This Branch

This Branch

All Branches

• Fix playlist-related errors
  smoogipoo · 2018-12-14 12:35:05 +09:00
  8e6a85058b
• Merge branch 'master' into netcoreapp22
  Dean Herbert · 2018-12-14 11:33:41 +09:00
  4e9f727759
• Merge branch 'master' into polling-component
  Dean Herbert · 2018-12-13 20:07:49 +09:00
  eb0a09576a
• Merge branch 'timeshift-api-integration'
  smoogipoo · 2018-12-13 18:38:22 +09:00
  91f6b08479
• Update with proper playlist usage
  smoogipoo · 2018-12-13 18:38:03 +09:00
  680a3e2aa4
• Merge branch 'timeshift-api-integration'
  smoogipoo · 2018-12-13 17:07:39 +09:00
  2aafaf9ce2
• Merge branch 'match-mod-display'

  # Conflicts:
  #	osu.Game/Screens/Multi/Match/Components/Info.cs
  #	osu.Game/osu.Game.csproj

  smoogipoo · 2018-12-13 17:07:31 +09:00
  eb0e9c0bb1
• Merge branch 'timeshift-player'

  # Conflicts:
  #	osu.Game/Screens/Multi/Multiplayer.cs

  smoogipoo · 2018-12-13 17:06:44 +09:00
  ca87b42758
• Merge branch 'timeshift'

  # Conflicts:
  #	osu.Game/osu.Game.csproj

  smoogipoo · 2018-12-13 17:06:20 +09:00
  208273f16a
• Fix crash on exiting player during results transition
  Dean Herbert · 2018-12-13 16:23:51 +09:00
  71e5ce59da
• Fix invalid room values
  smoogipoo · 2018-12-13 16:06:30 +09:00
  264bd0e2aa
• Use LifetimeManagementContainer

  This is a significant performance boost for gameplay,
  especially for long or stroyboard-heavy maps.

  ekrctb · 2018-12-13 15:23:06 +09:00
  6f8a2e6ff2
• Fix crash when changing beatmap toggles at loading screen
  Dean Herbert · 2018-12-13 14:51:18 +09:00
  ac0fc6236c
• Merge pull request #3849 from peppy/fix-skin-default-revert

  Fix reverting to default skin via settings button causing a hard crash

  Dan Balasescu · 2018-12-13 12:19:53 +09:00
  f29c6987d2
• Fix reverting to default skin via settings button causing a hard crash
  Dean Herbert · 2018-12-12 21:30:21 +09:00
  4fc9902cd2
• Add more tests
  Dean Herbert · 2018-12-12 20:31:58 +09:00
  ebd9375780
• Merge branch 'master' into moreOptionsFromSkin.ini
  Dean Herbert · 2018-12-12 19:54:56 +09:00
  3110427eaf
• Fix backgrounds not quite working
  smoogipoo · 2018-12-12 19:34:37 +09:00
  bac4f42eac
• Merge branch 'master' into master
  Ivan Pavluk · 2018-12-12 17:24:52 +07:00
  d5437f7b4b
• Merge branch 'master' of https://github.com/pavlukivan/osu
  Ivan Pavluk · 2018-12-12 17:18:32 +07:00
  d8b409f81f
• relocate SkinnableCursor
  Dragicafit · 2018-12-12 11:17:09 +01:00
  c6c4bcccc3
• Autodetect LowestSuccessfulHitResult
  Ivan Pavluk · 2018-12-12 17:15:59 +07:00
  28b033bd99
• Hook up API
  smoogipoo · 2018-12-12 19:04:11 +09:00
  450e4cd223
• Make Target abstract (should absolutely always be set)
  smoogipoo · 2018-12-12 19:03:27 +09:00
  87ebb00f1c
• Fix formatting
  Ivan Pavluk · 2018-12-12 07:57:37 +00:00
  77e0d7ed8e
• Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration

  # Conflicts:
  #	osu.Game/osu.Game.csproj

  smoogipoo · 2018-12-12 16:22:14 +09:00
  9af2b49c01
• Use RoomID for creation
  smoogipoo · 2018-12-12 16:20:11 +09:00
  6123a11b67
• Implement basic api structure for rooms
  smoogipoo · 2018-12-12 16:06:56 +09:00
  439d741dee
• Rename SuccessfulHitResult->LowestSuccessfulHitResult
  Ivan Pavluk · 2018-12-12 13:24:58 +07:00
  e49e2fda9e
• Update docstring

  Co-Authored-By: pavlukivan <pavlukivan@outlook.com>

  Dean Herbert · 2018-12-12 13:11:03 +07:00
  ffb91b4afc
• Update docstring

  Co-Authored-By: pavlukivan <pavlukivan@outlook.com>

  Dean Herbert · 2018-12-12 13:10:47 +07:00
  d86cbf66a9
• Add mods to the match info
  smoogipoo · 2018-12-12 14:38:03 +09:00
  170955110f
• Merge branch 'songselect-mods' into match-mod-display

  # Conflicts:
  #	osu.Game/osu.Game.csproj

  smoogipoo · 2018-12-12 14:13:37 +09:00
  6661b5870f
• Merge pull request #3826 from smoogipoo/songselect-mods

  Move ModOverlay to SongSelect

  Dean Herbert · 2018-12-12 13:59:10 +09:00
  b5c3b9e710
• Merge branch 'master' into songselect-mods
  Dean Herbert · 2018-12-12 13:37:04 +09:00
  14af450ecb
• Move a lot more of PlaySongSelect into SongSelect
  smoogipoo · 2018-12-12 13:21:44 +09:00
  49dd6ae9b0
• remove spaces
  Dragicafit · 2018-12-11 21:02:12 +01:00
  4b073aed83
• using SkinReloadableDrawable
  Dragicafit · 2018-12-11 18:06:41 +01:00
  bfe3b03945
• Add more tests
  Dean Herbert · 2018-12-11 20:12:30 +09:00
  7dc1f5b771
• Implement RoomManager and RoomsContainer

  Reduces logic from LoungeScreen

  smoogipoo · 2018-12-11 19:07:40 +09:00
  497f431366
• Change ready button to "Start" and make it enter player
  smoogipoo · 2018-12-11 17:32:01 +09:00
  bf3f5ab685
• adjust if position
  Dragicafit · 2018-12-11 00:38:03 +01:00
  fb7d767909
• Add a polling component model
  Dean Herbert · 2018-12-10 21:08:14 +09:00
  ea4dce8454
• Renamespace
  smoogipoo · 2018-12-10 19:27:25 +09:00
  1ac615b490
• Disable select beatmap button after room is created
  smoogipoo · 2018-12-10 19:03:22 +09:00
  cd41c45686
• Make select beatmap button into a triangle button
  smoogipoo · 2018-12-10 18:50:52 +09:00
  3c44f9e4f1
• Don't add rooms to lounge until they're actually created
  smoogipoo · 2018-12-10 18:35:08 +09:00
  3f64cfc1c6
• Adjust match creation process
  smoogipoo · 2018-12-10 18:25:32 +09:00
  ca544ef3fe
• Move from lobby into match for creation process
  smoogipoo · 2018-12-10 18:00:57 +09:00
  77193eeea4
• Use graying rather than alpha
  smoogipoo · 2018-12-10 17:06:34 +09:00
  3b688c702c