15535 Commits

This Branch

This Branch

All Branches

• Boot player back to lobby if token request fails
  smoogipoo · 2018-12-17 11:51:17 +09:00
  bf8aae8d9b
• Fix playlist deserialisation for creating rooms
  smoogipoo · 2018-12-17 11:05:03 +09:00
  2fd2425cc4
• Fix invalid value
  smoogipoo · 2018-12-14 21:21:02 +09:00
  983a45c4d8
• Basic score submission implementation
  smoogipoo · 2018-12-14 21:09:17 +09:00
  9726eea0d0
• Implement multiplayer room leaderboard
  smoogipoo · 2018-12-14 21:08:55 +09:00
  e8007ac37f
• Separate out Leaderboard into BeatmapLeaderboard
  smoogipoo · 2018-12-14 19:51:27 +09:00
  d9fc7c7d66
• Fix beatmap + ruleset being changeable
  smoogipoo · 2018-12-14 17:35:18 +09:00
  de0fc2a0de
• Fix incorrect ruleset being sent to API
  smoogipoo · 2018-12-14 17:35:05 +09:00
  5f0069eb83
• Fix beatmap not having any mods when going into play
  smoogipoo · 2018-12-14 16:16:38 +09:00
  edefdb18f8
• Use the local beatmap if existing, fixing player not loading objects
  smoogipoo · 2018-12-14 16:11:00 +09:00
  e3ad226075
• Enable/disable the view beatmap + ready buttons based on beatmap presence
  smoogipoo · 2018-12-14 15:04:04 +09:00
  83bf37a302
• Fix nullref
  smoogipoo · 2018-12-14 15:03:49 +09:00
  28192aef90
• Completely hide the select beatmap button for now
  smoogipoo · 2018-12-14 14:33:50 +09:00
  3de65238a2
• Fix up header sizing + styling
  smoogipoo · 2018-12-14 14:30:39 +09:00
  b83f99d90a
• Fix ToBeatmap not using the correct metadata

  Metadata is always come from the API via the beatmap set.

  smoogipoo · 2018-12-14 13:43:52 +09:00
  c9c04a6200
• Fix mod/beatmap selection not always working
  smoogipoo · 2018-12-14 13:38:27 +09:00
  56fd4b95cd
• Fix incorrect acronym
  smoogipoo · 2018-12-14 13:38:13 +09:00
  2e767a5292
• Fix playlist-related errors
  smoogipoo · 2018-12-14 12:35:05 +09:00
  8e6a85058b
• 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 invalid room values
  smoogipoo · 2018-12-13 16:06:30 +09:00
  264bd0e2aa
• 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
• Fix backgrounds not quite working
  smoogipoo · 2018-12-12 19:34:37 +09:00
  bac4f42eac
• 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
• 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
• 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
• 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
• 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
• Cleanup handling of readonly fields
  smoogipoo · 2018-12-10 16:50:00 +09:00
  c7970e5425