1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:52:55 +08:00
Commit Graph

707 Commits

Author SHA1 Message Date
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b Pass input state in OnSelected. 2017-08-04 00:09:41 +08:00
Dean Herbert
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
Dean Herbert
c8b5c1b8a5 Merge branch 'master' into scroll_to_selected 2017-08-01 11:06:32 +09:00
EVAST9919
700c7753c3 Applied suggestions 2017-07-31 14:20:12 +03:00
Huo Yaoyuan
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
EVAST9919
62365090ad Removed useless variable 2017-07-29 17:51:11 +03:00
EVAST9919
6b3a81f567 Fix hard crash when pressing random if no beatmaps avaliable 2017-07-29 17:42:32 +03:00
EVAST9919
e121b119be Added "scroll to" container 2017-07-29 17:33:20 +03:00
EVAST9919
8458622c4d Add ScrollToSelected method 2017-07-29 16:03:17 +03:00
Dean Herbert
e691dd12c5 Fix potential sequen of execution issues in BeatmapCarousel 2017-07-28 15:05:08 +09:00
Dean Herbert
6f4efbeda6 Merge remote-tracking branch 'upstream/master' into database-tidy 2017-07-27 17:41:29 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
3c7546e2c1 Merge remote-tracking branch 'upstream/master' into no-more-colourinfo 2017-07-25 10:14:48 +09:00
Dean Herbert
b528568547 Merge branch 'master' into drawableflag-ctor 2017-07-25 09:46:27 +09:00
Huo Yaoyuan
47b4ef5cd2 Handle control key with OnKeyUp/OnKeyDown. 2017-07-24 22:14:21 +08:00
Huo Yaoyuan
c2e5788ed1 Make OsuScreen.Ruleset protected. 2017-07-24 21:47:31 +08:00
Huo Yaoyuan
e0b1057b87 Merge branch 'master' into fixes 2017-07-24 20:50:33 +08:00
Dean Herbert
84f12c722f Merge branch 'master' into master 2017-07-24 18:23:36 +09:00
tgi74000
d0e99f0c95 check removed beatmap being null, check promptdelete beatmap being default 2017-07-24 10:25:33 +02:00
tgi74000
5d30efc090 Do not trigger Random if no Beatmaps are imported 2017-07-24 09:57:12 +02:00
Nabile Rahmani
c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
EVAST9919
d9e9ab22db Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel 2017-07-23 13:27:03 +03:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
EVAST9919
388fcfb295 Make BeatmapCarousel inherit from OsuScrollContainer 2017-07-21 13:13:53 +03:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
9a33e77d63 Merge branch 'master' into fix-carousel-debounce-race 2017-07-21 17:44:04 +09:00
Dean Herbert
12b6b80d5c Make method to flush filter requests 2017-07-21 17:20:52 +09:00
Dean Herbert
b4dddc98ee Fix selection changing on entering song select
Conditional was backwards, easy fix.
2017-07-21 06:15:44 +09:00
Dean Herbert
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
Thomas Müller
e84d8cc020 Merge branch 'master' into fix-empty-carousel 2017-07-20 21:15:58 +02:00
Thomas Müller
4e33efd41f Merge branch 'master' into fix-empty-carousel 2017-07-20 21:04:45 +02:00
Thomas Müller
518a7c460e Merge branch 'master' into fix-beatmap-select-race 2017-07-20 21:04:40 +02:00
Thomas Müller
e21822cdeb Merge branch 'master' into fix-working-beatmap-double-load 2017-07-20 20:35:31 +02:00
Thomas Müller
01ff7e8f4b Merge branch 'master' into fix-empty-carousel 2017-07-20 20:31:06 +02:00
Dean Herbert
451f92772a Merge branch 'master' into fixes 2017-07-20 19:46:50 +09:00
Thomas Müller
8108f3e78d Merge branch 'master' into no-set-exclusive 2017-07-20 12:11:32 +02:00
Dean Herbert
6e0b7b81f8 Switch to correct ruleset when changing beatmap
This is only really noticeable when using the MusicController to change tracks while at song select.
2017-07-20 19:10:20 +09:00
Dean Herbert
577740d329 Fix footer button light fading incorrectly
Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.
2017-07-20 18:08:51 +09:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
4f10256182 Remove unnecessary count check 2017-07-20 15:34:44 +09:00
Dean Herbert
61c665f239 Add required null check 2017-07-20 15:16:07 +09:00
Dean Herbert
a59557f039 Fix selection not being reset correct when changing between rulesets
Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.
2017-07-20 15:12:20 +09:00
Dean Herbert
c130981184 Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect 2017-07-20 14:06:09 +09:00
Dean Herbert
15eb6954da Fix hitting down and enter at song select causing a hard-crash
Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
2017-07-20 11:50:52 +09:00
Dean Herbert
8d727b898f Don't rely on BeatmapSetInfo being present 2017-07-20 09:23:11 +09:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
35157ca6b8 Make DefaultBeatmap private get. 2017-07-19 18:09:59 +09:00
Dean Herbert
c8593a38c8 Remove incorrect looping reset behaviour
Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.
2017-07-19 15:55:16 +09:00
Dean Herbert
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
8e8767cd37 Give song select a better default background whecn the beatmap's can't be loaded 2017-07-19 15:16:55 +09:00
Dean Herbert
d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
Dean Herbert
0846414c5b Simplify state changes 2017-07-19 15:16:51 +09:00
Dean Herbert
632d2e8ba5 Dummy beatmap has dummy ruleset 2017-07-19 15:16:48 +09:00
Dean Herbert
f168ee660c Move dummy to BeatmapDatabase 2017-07-19 15:16:43 +09:00
Dean Herbert
21984ba764 Move DummyWorkingBeatmap to a more global level (OsuScreen) 2017-07-19 15:16:39 +09:00
Dean Herbert
df60fc0f0a Stop playing previous beatmap even if new beatmap has no track 2017-07-19 15:16:36 +09:00
Dean Herbert
e47faf4e85 Add a dummy beatmap provider for use in BeatmapInfoWedge 2017-07-19 15:16:33 +09:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Huo Yaoyuan
9cd895c249 Implement Ctrl+Enter in PlaySongSelect. 2017-07-18 15:55:21 +08:00
Dean Herbert
b5035ec245 Merge branch 'master' into songselect-preview-fix 2017-07-18 13:05:03 +09:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
Dean Herbert
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
2017-07-13 15:11:33 +09:00
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Dean Herbert
0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Thomas Müller
178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00
Thomas Müller
22a987f6cc Update test cases to new framework and fix old crashes 2017-07-07 15:05:55 +03:00
Dean Herbert
724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Dean Herbert
28f0da606a Add OsuFocusedOverlayContainer with predefined sounds. 2017-06-28 10:18:12 -07:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
Dean Herbert
480cdba023 Add OsuClickableContainer with generic sounds 2017-06-27 21:05:49 +09:00
EVAST9919
127c473f3b Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-25 23:38:39 +03:00
Thomas Müller
1bca9ca0e9 Update framework with better children list 2017-06-24 12:56:35 +02:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +02:00
Thomas Müller
f5829860a2 Get rid of AlwaysReceiveInput 2017-06-23 18:02:24 +02:00
EVAST9919
be94163d21 Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-22 04:28:47 +03:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
MrTheMake
a399b18837 Removed debug line 2017-06-19 00:11:47 +02:00
MrTheMake
3b3cc59471 Fix NullReferenceException 2017-06-18 20:21:24 +02:00
MrTheMake
23d1c89a67 Fix not applying song select preview seek 2017-06-18 20:12:28 +02:00
Dean Herbert
ae79ba48be Merge branch 'master' into numpad-enter 2017-06-16 15:32:52 +09:00
MrTheMake
06089a74e3 Handle the numpad's Enter in cases where only the normal Enter was handled 2017-06-15 23:06:28 +02:00
EVAST9919
5117baae66 Make random works with panels too 2017-06-15 06:37:20 +03:00
Dan Balasescu
5a1edaa93c Merge branch 'master' into cancel-select-random 2017-06-14 14:11:45 +09:00
Dean Herbert
3ca80eb149 Add readonly 2017-06-13 15:54:26 +09:00