19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into master
  Jacob Odgård Tørring · 2018-05-10 17:55:37 +02:00
  7de502b20b
• Merge pull request #2491 from smoogipoo/beatmap-conversion-rework

  Rework beatmap conversion process to use IBeatmap

  Dean Herbert · 2018-05-10 20:08:37 +08:00
  0afe33d32f
• Merge branch 'master' into master
  Jacob Odgård Tørring · 2018-05-10 13:21:28 +02:00
  0496deee08
• Adds DisableSeek property to MusicController
  Jacob Odgård Tørring · 2018-05-10 13:20:04 +02:00
  d54a7295f6
• Merge branch 'master' into beatmap-conversion-rework
  Dean Herbert · 2018-05-10 19:10:07 +08:00
  8a6ef0dabb
• Merge pull request #2490 from smoogipoo/i-beatmap

  Migrate the game to use an IBeatmap interface

  Dean Herbert · 2018-05-10 19:07:17 +08:00
  7fd38e4780
• Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
  Dean Herbert · 2018-05-10 19:51:52 +09:00
  9e26bcd571
• Move IBeatmap to its own file
  Dean Herbert · 2018-05-10 19:51:40 +09:00
  40c1b24b3d
• Merge branch 'master' into exit-hold-confirmation
  Dean Herbert · 2018-05-10 18:37:56 +08:00
  ea838f57fc
• Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons
  Dean Herbert · 2018-05-10 19:16:52 +09:00
  4b3c2466a4
• Keep shortcut padding even when there is no shortut
  smoogipoo · 2018-05-10 18:49:33 +09:00
  df604c40cc
• Improve TestCaseOnScreenDisplay

  Now doesn't rely on framesync.

  smoogipoo · 2018-05-10 18:48:48 +09:00
  c03ab9014f
• Merge branch 'master' of https://github.com/odgaard/osu
  Jacob Odgård Tørring · 2018-05-10 11:29:39 +02:00
  a8ca0c899d
• Fixes private method name capitalization
  Jacob Odgård Tørring · 2018-05-10 11:29:19 +02:00
  5b99d8df62
• Merge branch 'master' into master
  Dean Herbert · 2018-05-10 17:18:50 +08:00
  1db5ca0d73
• Merge pull request #2516 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-05-10 17:18:39 +08:00
  2bb671cf9e
• Update framework
  Dean Herbert · 2018-05-10 17:52:48 +09:00
  c7443e6b3b
• Add tests and expand functionality to ensure single fire
  Dean Herbert · 2018-05-10 17:31:16 +09:00
  fadb1a5e0b
• Adds a check to disable music controller's seek
  Jacob Odgård Tørring · 2018-05-10 10:15:47 +02:00
  bb6478cdc3
• Update framework
  Dean Herbert · 2018-05-10 17:10:42 +09:00
  63e10ec3c2
• Implement a hold-to-confirm screen when exiting game using escape key
  Dean Herbert · 2018-05-10 17:07:19 +09:00
  5df9f126d1
• Merge pull request #2482 from smoogipoo/use-bindable-transforms

  Use bindable transforms

  Dean Herbert · 2018-05-10 13:50:13 +08:00
  3504f7393f
• Merge remote-tracking branch 'origin/master' into disable-mouse-buttons
  smoogipoo · 2018-05-10 14:31:52 +09:00
  853680ca51
• Merge branch 'master' into use-bindable-transforms
  Dean Herbert · 2018-05-10 11:45:29 +08:00
  2e9c91c32f
• Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change

  Fix beatmap/ruleset being changeable while in the editor

  Dean Herbert · 2018-05-10 11:45:23 +08:00
  aa69e0ef12
• Merge branch 'master' into fix-editor-beatmap-change
  Dean Herbert · 2018-05-10 11:37:36 +08:00
  fff34be814
• Merge pull request #2501 from smoogipoo/remove-explicit-clock

  Remove explicit clock in TestCaseBreakOverlay

  Dean Herbert · 2018-05-10 11:15:06 +08:00
  e44faebea6
• Merge branch 'master' into remove-explicit-clock
  Dean Herbert · 2018-05-10 11:06:49 +08:00
  5f5e97220d
• Show InputSettings on the PlayerLoader screen
  Roman Kapustin · 2018-05-09 17:31:52 +03:00
  ccf82cacb0
• Introduce InputSettings
  Roman Kapustin · 2018-05-09 17:22:37 +03:00
  6676c55fe0
• Merge branch 'master' into exit_replay_button
  UselessToucan · 2018-05-09 16:31:18 +03:00
  785cf306ec
• Load PlayButton.Preview asynchronously
  Roman Kapustin · 2018-05-09 16:22:52 +03:00
  95dd2125ee
• Use PreviewTrackManager in the PlayButton
  Roman Kapustin · 2018-05-09 14:52:46 +03:00
  c492f62eda
• Make PreviewTrackManager a Component in order to use DI
  Roman Kapustin · 2018-05-09 14:51:04 +03:00
  ad50f7faf1
• Merge pull request #2471 from UselessToucan/change_ruleset_via_direct_while_on_scorescreen

  Decouple FilterControl.Ruleset from the game-wide ruleset bindable

  Dan Balasescu · 2018-05-09 14:09:54 +09:00
  3c689359af
• Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
  Dan Balasescu · 2018-05-09 14:02:20 +09:00
  929e8f16df
• Remove explicit clock in TestCaseBreakOverlay
  smoogipoo · 2018-05-09 12:40:04 +09:00
  c7bc79bce3
• Introduce PreviewTrackManager
  Roman Kapustin · 2018-05-08 22:55:48 +03:00
  7cffabf7f9
• Fix tests and implementation
  AlFasGD · 2018-05-08 16:37:06 +03:00
  e44062b77a
• Prevent user from scrolling outside the timeline in the editor
  AlFasGD · 2018-05-08 16:21:54 +03:00
  dd9b9a18ac
• Appvtests (#1)

  * Resolving AppVeyor's errors

  Vidalee · 2018-05-08 14:33:26 +02:00
  16bcd6c3ed
• Merge branch 'master' into back_mouse_button_support
  UselessToucan · 2018-05-08 10:35:11 +03:00
  38d54f2a6c
• Merge pull request #2498 from peppy/update-cfs

  Update CodeFileSanity

  Dan Balasescu · 2018-05-08 10:24:21 +09:00
  96baee4e5c
• Handle mouse back button using OnMouseDown override instead of using GlobalAction
  Roman Kapustin · 2018-05-08 00:22:11 +03:00
  44bbb8700e
• Update CodeFileSanity
  Dean Herbert · 2018-05-07 22:08:45 +09:00
  c2979a5c48
• Fix beatmap/ruleset being changeable while in the editor
  smoogipoo · 2018-05-07 16:32:15 +09:00
  674e45d49b
• Make BeatmapInfoWedge display properly for converts
  smoogipoo · 2018-05-07 15:51:08 +09:00
  fbd7ccc03f
• Add info label tests to TestCaseBeatmapInfoWedge
  smoogipoo · 2018-05-07 15:51:08 +09:00
  09c70a9362
• Instantiate convertible hitobjects for beatmap info wedge
  smoogipoo · 2018-05-07 15:51:08 +09:00
  6a9f139d9b
• Simplify statistics in osu ruleset
  smoogipoo · 2018-05-07 15:51:08 +09:00
  251bdfdee8