13360 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
  Dean Herbert · 2018-07-05 14:53:31 +09:00
  d11ba2df0e
• Merge pull request #2942 from Joehuu/fix-footer-clicking-area

  Fix FooterButton clicking area

  Dan Balasescu · 2018-07-05 14:03:04 +09:00
  dd7ed7d42e
• Merge branch 'master' into fix-footer-clicking-area
  Dean Herbert · 2018-07-05 13:39:53 +09:00
  aea1299762
• Merge pull request #2947 from peppy/fix-popup-dialog-regression

  Fix selecting a button on a dialog causing both that button and exit to animate

  Dan Balasescu · 2018-07-04 12:04:56 +09:00
  b02603000e
• Merge branch 'master' into fix-popup-dialog-regression
  Dan Balasescu · 2018-07-04 11:15:18 +09:00
  7a4d3f9ffa
• Merge pull request #2931 from smoogipoo/non-null-nestedobjects

  Tidy up lookups to nested hitobjects

  Dean Herbert · 2018-07-03 19:59:00 +09:00
  8ecd235820
• Merge branch 'master' into non-null-nestedobjects
  Dean Herbert · 2018-07-03 19:43:46 +09:00
  1e1ff8339e
• Fix selecting a button on a dialog causing both that button and exit to animate
  Dean Herbert · 2018-07-03 18:35:09 +09:00
  b33206c212
• Merge pull request #2944 from smoogipoo/fix-beatmap-deserialisation

  Fix beatmap details not loading for unranked beatmaps

  Dean Herbert · 2018-07-03 16:06:46 +09:00
  5f33ab579e
• Fix beatmap details not working for unranked beatmaps
  smoogipoo · 2018-07-03 15:57:05 +09:00
  73851fb194
• Fix FooterButton clicking area
  Joehu · 2018-07-02 22:03:17 -07:00
  d476842c44
• Merge pull request #2932 from ekrctb/fix-menu-cursor-crash

  Fix MenuCursor assertion failure when multiple mouse buttons pressed

  Dean Herbert · 2018-07-02 21:29:00 +09:00
  2018.702.0 e37b931a55
• Merge branch 'master' into fix-menu-cursor-crash
  Dean Herbert · 2018-07-02 18:09:11 +09:00
  627a5deff9
• Merge pull request #2928 from peppy/fix-dialog-popups

  Standardise input handling of popup dialogs

  Dan Balasescu · 2018-07-02 18:09:02 +09:00
  908f555a64
• Add comment about last button invocation
  Dean Herbert · 2018-07-02 17:48:16 +09:00
  6c848f135c
• Merge branch 'master' into fix-dialog-popups
  Dan Balasescu · 2018-07-02 17:41:16 +09:00
  e99c05c85e
• Merge pull request #2690 from peppy/add-scroll-speed-keybinds

  Add key bindings for scroll speed

  Dan Balasescu · 2018-07-02 17:40:16 +09:00
  8f6ec0e7b1
• Merge branch 'master' into add-scroll-speed-keybinds
  Dan Balasescu · 2018-07-02 17:26:05 +09:00
  6abb3fa62c
• Merge pull request #2924 from peppy/fix-leaderboard-placeholder

  Fix leaderboard showing placeholder briefly when entering song select

  Dan Balasescu · 2018-07-02 17:25:31 +09:00
  0123c76b3d
• Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds

  # Conflicts:
  #	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs

  smoogipoo · 2018-07-02 17:21:18 +09:00
  f0ec117bcb
• Merge branch 'master' into fix-leaderboard-placeholder
  Dan Balasescu · 2018-07-02 17:17:40 +09:00
  118366303c
• Merge pull request #2934 from smoogipoo/fix-skin-crash

  Fix crash if the skin stored in the config doesn't exist anymore

  Dean Herbert · 2018-07-02 17:07:47 +09:00
  7c5ad43d22
• Don't hard-bail if config skin doesn't exist anymore
  smoogipoo · 2018-07-02 16:49:07 +09:00
  9f405b0894
• whitespace
  ekrctb · 2018-07-02 16:20:44 +09:00
  ae6fdd8e29
• Tidy up lookups to NestedHitObjects
  smoogipoo · 2018-07-02 16:10:56 +09:00
  45a4187923
• typo
  ekrctb · 2018-07-02 16:09:33 +09:00
  63746876c2
• Fix MenuCursor crash
  ekrctb · 2018-07-02 16:07:52 +09:00
  341ffa4667
• Merge pull request #2885 from peppy/non-null-ruleset

  Make BindableRuleset non-null

  Dan Balasescu · 2018-07-02 16:04:31 +09:00
  7d256f6595
• Merge branch 'master' into non-null-ruleset
  Dan Balasescu · 2018-07-02 15:32:55 +09:00
  e5947cc969
• Use testcase ruleset
  smoogipoo · 2018-07-02 15:25:37 +09:00
  90d90370c2
• Merge pull request #2842 from peppy/fix-background-screen-crash

  Fix background screens not supporting early-exit condition

  Dan Balasescu · 2018-07-02 15:17:14 +09:00
  2b33a3b2eb
• Adapt to IBindables
  smoogipoo · 2018-07-02 15:07:18 +09:00
  b61fe10f62
• Merge remote-tracking branch 'origin/master' into non-null-ruleset

  # Conflicts:
  #	osu.Game/Screens/Select/FilterControl.cs

  smoogipoo · 2018-07-02 15:05:34 +09:00
  4070c1a888
• Merge branch 'master' into fix-background-screen-crash
  Dan Balasescu · 2018-07-02 15:01:59 +09:00
  2c19790a97
• Merge pull request #2769 from Aergwyn/allow-back-in-player

  Standardise handling of "Back" key binding

  Dan Balasescu · 2018-07-02 15:01:23 +09:00
  154e30fe64
• Merge branch 'master' into allow-back-in-player
  Dan Balasescu · 2018-07-02 14:44:58 +09:00
  50f561fbc2
• Merge pull request #2882 from UselessToucan/null_coalescing_quickfix

  Fix incorrect usages of null coalesce

  Dean Herbert · 2018-07-02 14:40:16 +09:00
  10eccfba39
• Remove unnecessary null checks
  Dean Herbert · 2018-07-02 14:28:56 +09:00
  831b11ff97
• Revert unnecessary change
  Dean Herbert · 2018-07-02 14:27:42 +09:00
  9a54bf6854
• Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix
  Dean Herbert · 2018-07-02 14:26:41 +09:00
  c04bfb96e1
• Standardise input handling of popup dialogs
  Dean Herbert · 2018-07-02 14:25:12 +09:00
  596787c941
• Make SampleControlPoint clone the existing SampleInfo
  smoogipoo · 2018-07-02 14:17:19 +09:00
  8b0c6a4c85
• Fix possible nullreference
  Dan Balasescu · 2018-07-02 13:51:47 +09:00
  37495c34fa
• Fix time being a part of controlpoint change comparisons
  smoogipoo · 2018-07-02 13:34:25 +09:00
  b664d3ef81
• Fix failing json conversion testcases
  smoogipoo · 2018-07-02 13:34:19 +09:00
  c78bfbfa55
• Use .Equals everywhere
  smoogipoo · 2018-07-02 13:34:14 +09:00
  aea50e770b
• Merge pull request #2916 from smoogipoo/beatmap-preprocess

  Extend BeatmapProcessor to allow processing hitobjects prior to ApplyDefaults

  Dean Herbert · 2018-07-02 13:20:54 +09:00
  6fe768366f
• Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
  Dean Herbert · 2018-07-02 13:10:42 +09:00
  812929fa05
• Remove unnecessary comments
  Dean Herbert · 2018-07-02 13:07:44 +09:00
  b7893bc994
• Merge pull request #2925 from smoogipoo/bindable-maniaaction

  Dependency inject the mania column keybind

  Dean Herbert · 2018-07-02 12:57:50 +09:00
  4b89ae2390