11991 Commits

This Branch

This Branch

All Branches

• 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 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
• Merge pull request #2482 from smoogipoo/use-bindable-transforms

  Use bindable transforms

  Dean Herbert · 2018-05-10 13:50:13 +08:00
  3504f7393f
• 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
• 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
• Merge pull request #2498 from peppy/update-cfs

  Update CodeFileSanity

  Dan Balasescu · 2018-05-08 10:24:21 +09:00
  96baee4e5c
• 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
• Fix not being able to convert beatmaps with 0 hitobjects
  smoogipoo · 2018-05-07 15:27:45 +09:00
  30a3f4f29f
• Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
  Dean Herbert · 2018-05-07 13:32:19 +08:00
  1be1b10059
• Output ruleset instantiation info
  smoogipoo · 2018-05-07 14:28:30 +09:00
  68441f1ef0
• Give conversion-tested beatmaps a ruleset
  smoogipoo · 2018-05-07 14:04:37 +09:00
  6867886f4c
• Fix testcases
  smoogipoo · 2018-05-07 13:28:01 +09:00
  7ee8228a37
• Restore star difficulty calculation
  smoogipoo · 2018-05-07 12:25:21 +09:00
  ad2c2a5fe6
• Fix resharper warnings
  smoogipoo · 2018-05-07 11:38:41 +09:00
  268c14813b
• Trim whitespace
  smoogipoo · 2018-05-07 11:23:29 +09:00
  e20323b5f6
• Fix incorrect method name
  smoogipoo · 2018-05-07 11:22:25 +09:00
  794418432f
• Rename GetBeatmap() to GetPlayableBeatmap()
  smoogipoo · 2018-05-07 10:40:30 +09:00
  db3e48c194
• Rename OriginalBeatmap back to Beatmap
  smoogipoo · 2018-05-07 10:29:38 +09:00
  9128e64c9a
• Add xmldoc
  smoogipoo · 2018-05-07 10:23:32 +09:00
  7e83c75888
• Reword beatmap conversion error
  smoogipoo · 2018-05-07 10:18:47 +09:00
  b68ee39136
• Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
  smoogipoo · 2018-05-07 10:17:54 +09:00
  4ecdea8b2e
• Fix reference to old name
  smoogipoo · 2018-05-07 10:07:50 +09:00
  27c8591d48
• Merge branch 'i-beatmap' into beatmap-conversion-rework
  smoogipoo · 2018-05-07 10:00:24 +09:00
  77e661489d
• Fix non-IBeatmap usage
  smoogipoo · 2018-05-07 09:59:45 +09:00
  20509b1cc2
• Merge remote-tracking branch 'origin/master' into i-beatmap
  smoogipoo · 2018-05-07 09:58:53 +09:00
  1aefd71b65
• Fix mania-specific beatmap conversion
  smoogipoo · 2018-05-07 09:17:12 +09:00
  f3aa9269ff
• Decouple FilterControl.Ruleset from the game-wide ruleset bindable
  Roman Kapustin · 2018-05-03 22:59:49 +03:00
  33e2b91ccc
• Use bindable transforms
  smoogipoo · 2018-05-02 18:26:23 +09:00
  2d6b2d10f7
• Merge pull request #2479 from peppy/add-net471-dep

  Add squirrel dependency on net471

  Dean Herbert · 2018-05-02 17:00:02 +08:00
  v2018.502.0 420e50b6da
• Update squirrel path
  Dean Herbert · 2018-05-02 16:37:44 +08:00
  6ecb09431f
• Update csproj defaults
  Dean Herbert · 2018-05-02 16:33:48 +08:00
  e92166b40f
• Update squirrel version for net471 prereq support
  Dean Herbert · 2018-05-02 16:23:48 +08:00
  b37acf7510
• Add squirrel dependency on net471
  Dean Herbert · 2018-05-02 16:23:48 +08:00
  8b99a3b8e6
• Merge pull request #2481 from smoogipoo/revert-useroverlay-change

  Revert breaking UserProfileOverlay change

  Dean Herbert · 2018-05-02 16:19:37 +08:00
  036e62e2b1
• Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"

  This reverts commit 67793845b0.

  Dan Balasescu · 2018-05-02 16:39:00 +09:00
  9f9447d441
• Merge pull request #2450 from tgi74/replay_ruleset

  Fix replays being played in the selected ruleset

  Dan Balasescu · 2018-05-02 15:06:24 +08:00
  084504134e
• Merge branch 'master' into replay_ruleset
  Dan Balasescu · 2018-05-02 14:57:02 +08:00
  9f327525a7
• Merge pull request #2458 from 4ppleCracker/patch-1

  Use more inheritance for UserStatus

  Dan Balasescu · 2018-05-02 14:56:46 +08:00
  6fe09ee544
• Merge branch 'master' into patch-1
  Dan Balasescu · 2018-05-02 14:45:30 +08:00
  0ad049976b