fe2911f165
Fix some formatting issues
2017-08-13 10:36:57 +09:00
096e574401
Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)
2017-08-12 19:52:09 +09:30
e48c5898bd
Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.
2017-08-11 17:26:30 +09:30
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
e8021c2b92
Move line inside if
2017-08-04 17:20:05 +09:00
74facb32b4
Use removeAutoModOnResume as a field.
2017-08-04 15:34:11 +08:00
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
44fd0eb78b
Pass input state in OnSelected.
2017-08-04 00:09:41 +08:00
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
c8b5c1b8a5
Merge branch 'master' into scroll_to_selected
2017-08-01 11:06:32 +09:00
700c7753c3
Applied suggestions
2017-07-31 14:20:12 +03:00
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
62365090ad
Removed useless variable
2017-07-29 17:51:11 +03:00
6b3a81f567
Fix hard crash when pressing random if no beatmaps avaliable
2017-07-29 17:42:32 +03:00
e121b119be
Added "scroll to" container
2017-07-29 17:33:20 +03:00
8458622c4d
Add ScrollToSelected method
2017-07-29 16:03:17 +03:00
e691dd12c5
Fix potential sequen of execution issues in BeatmapCarousel
2017-07-28 15:05:08 +09:00
6f4efbeda6
Merge remote-tracking branch 'upstream/master' into database-tidy
2017-07-27 17:41:29 +09:00
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
96b08b8777
Simplify and document DatabaseStore API
2017-07-27 15:06:10 +09:00
31bfa00d60
Schedule API callback to own scheduler
...
Fixes race condition when API returns a failure after exiting song select. Note that the API does also schedule to the correct thread, but this schedule ensures the callback is never run, which is what we want in this case.
2017-07-27 12:55:14 +09:00
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
3c7546e2c1
Merge remote-tracking branch 'upstream/master' into no-more-colourinfo
2017-07-25 10:14:48 +09:00
b528568547
Merge branch 'master' into drawableflag-ctor
2017-07-25 09:46:27 +09:00
47b4ef5cd2
Handle control key with OnKeyUp/OnKeyDown.
2017-07-24 22:14:21 +08:00
c2e5788ed1
Make OsuScreen.Ruleset protected.
2017-07-24 21:47:31 +08:00
e0b1057b87
Merge branch 'master' into fixes
2017-07-24 20:50:33 +08:00
84f12c722f
Merge branch 'master' into master
2017-07-24 18:23:36 +09:00
d0e99f0c95
check removed beatmap being null, check promptdelete beatmap being default
2017-07-24 10:25:33 +02:00
5d30efc090
Do not trigger Random if no Beatmaps are imported
2017-07-24 09:57:12 +02:00
c80f5c708a
Less verbose DrawableFlag constructor.
2017-07-24 09:25:49 +02:00
64f2e2dc32
Use Colour instead of ColourInfo
2017-07-23 13:06:16 +02:00
d9e9ab22db
Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel
2017-07-23 13:27:03 +03:00
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
388fcfb295
Make BeatmapCarousel inherit from OsuScrollContainer
2017-07-21 13:13:53 +03:00
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
9a33e77d63
Merge branch 'master' into fix-carousel-debounce-race
2017-07-21 17:44:04 +09:00
12b6b80d5c
Make method to flush filter requests
2017-07-21 17:20:52 +09:00
b4dddc98ee
Fix selection changing on entering song select
...
Conditional was backwards, easy fix.
2017-07-21 06:15:44 +09:00
fb2f1224b3
Fix carousel filter debounce causing a race condition
...
Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.
2017-07-21 05:58:58 +09:00
e84d8cc020
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:15:58 +02:00
4e33efd41f
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:04:45 +02:00
518a7c460e
Merge branch 'master' into fix-beatmap-select-race
2017-07-20 21:04:40 +02:00
e21822cdeb
Merge branch 'master' into fix-working-beatmap-double-load
2017-07-20 20:35:31 +02:00
01ff7e8f4b
Merge branch 'master' into fix-empty-carousel
2017-07-20 20:31:06 +02:00
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
8108f3e78d
Merge branch 'master' into no-set-exclusive
2017-07-20 12:11:32 +02:00
