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

1002 Commits

Author SHA1 Message Date
Aergwyn
3e417d8e30 removed specific AddBeatmap method
the way UpdateBeatmapSet was extended it can handle all of this and better
2017-12-08 12:47:28 +01:00
Aergwyn
105d01d85b fix crash when restoring from any non-SongSelect-screen
removed unwanted refresh
2017-12-07 22:02:53 +01:00
Aergwyn
12665fb8cf remove unnecessary declaration + revert accidental formatting 2017-12-04 12:11:28 +01:00
Aergwyn
011223048b fix crash if any amount of maps were restored from main menu
also fixes preview not playing if an entire set is restored
2017-12-04 11:47:27 +01:00
Dean Herbert
70b29b8b62
Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
Aergwyn
acb2cafa58 fix wedge not appearing 2017-11-29 21:09:08 +01:00
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
Dean Herbert
28d925dc1d
Merge branch 'master' into random-song-fix 2017-11-29 20:32:10 +09:00
Dean Herbert
b2fc50247c Hide metadata by default to avoid initial jump when no data present 2017-11-29 20:13:00 +09:00
Dean Herbert
2b7bf285e4 Improve code quality 2017-11-29 20:07:00 +09:00
mattiapette
6dd6f08bd0 Random song selection when entering the select menu with default osu theme or invalid beatmap 2017-11-29 11:51:56 +01:00
Dean Herbert
d4c1359a49
Merge branch 'master' into update-statistics-async 2017-11-29 19:27:22 +09:00
Aergwyn
3bdf82d8df refactor newly added code to be less redundant 2017-11-28 21:38:11 +01:00
Aergwyn
6a4cc93360 fixes crash if all beatmaps of a set are hidden 2017-11-28 21:26:13 +01:00
Unknown
a30cd42ba2 Make retry button not look drunk. 2017-11-28 14:38:35 +05:30
Unknown
e832f163e7 Add failure test case.
- Only show failure if request wasn't cancelled
2017-11-28 12:09:32 +05:30
Unknown
ac1fb5118c Fix line endings and derp that was causing request failures. 2017-11-28 11:35:39 +05:30
Dean Herbert
96d42b3e5b Fix redundant string interpolation 2017-11-27 18:20:13 +09:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
FreezyLemon
82a9b57277 Removed unnecessary "using" statement 2017-11-27 08:58:09 +01:00
FreezyLemon
b4513497d6 Added a textContainer reference to MetadataSection so casting is no longer required for setting new text 2017-11-27 08:52:26 +01:00
FreezyLemon
507da0dfb7 Renamed addTextAsync to setTextAsync 2017-11-27 08:48:47 +01:00
FreezyLemon
ac0942df86 Removed unnecessary private method to update the metadata 2017-11-27 08:48:12 +01:00
FreezyLemon
d49ee295d9 Removed unnecessary schedule and null checks 2017-11-27 08:47:36 +01:00
FreezyLemon
b34e724b8d Changed MetadataSection so that the Text setter loads the new text in async before displaying it. 2017-11-27 08:18:09 +01:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle 2017-11-27 09:41:30 +09:00
Unknown
ae201f0ef5 R# 2017-11-26 15:03:49 +05:30
Dean Herbert
5aa6615107 Add confirm-selection sound in song select 2017-11-26 17:21:22 +09:00
Dean Herbert
ae48b85827 Don't play logo select sample when actions are playing their own 2017-11-26 17:17:47 +09:00
Dean Herbert
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
Unknown
4212315504 Use a single placeholder container for empty and retry. 2017-11-26 12:50:20 +05:30
Unknown
b261d32588 Put retry button in a BeatSyncedContainer and change error message. 2017-11-26 12:25:48 +05:30
Unknown
f4f732ca43 Remove unnecessary null check and tweak transform a bit. 2017-11-26 11:19:42 +05:30
Unknown
ae9ce2f122 Unbind ruleset event from leaderboard. 2017-11-25 21:23:36 +05:30
Unknown
0b3f75505e Don't break VisualTests and add a real beatmap step. 2017-11-25 20:59:03 +05:30
Huo Yaoyuan
d955229ee5 Handle user rating metrics when no maps by using more linq. 2017-11-25 21:29:23 +08:00
Unknown
e723e66850 Merge remote-tracking branch 'upstream/master' into leaderboard-scopes 2017-11-24 19:14:50 +05:30
Unknown
c5a78e54e9 Add a retry button for when scores request fails. 2017-11-24 18:40:52 +05:30
Dean Herbert
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09:00
Dean Herbert
6ddefa5f8c
Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 23:33:05 +09:00
Dean Herbert
dbb03bcff2 Handle the case where a map hasn't been rated yet 2017-11-23 23:30:57 +09:00
Dan Balasescu
dd78479a1a
Merge branch 'master' into fix-ef-issues 2017-11-23 21:18:20 +09:00
Dean Herbert
2f3e4a27c6
Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 20:55:55 +09:00
FreezyLemon
00830c190c Merge branch 'master' of https://github.com/ppy/osu 2017-11-23 12:39:36 +01:00
FreezyLemon
a60e53c382 Changed the text updates into a scheduled (async) operation, and implemented this in the updateStatistics and clearStats methods 2017-11-23 12:31:18 +01:00
Dean Herbert
9db6ef6657 Fix unfixed regressions 2017-11-23 20:23:47 +09:00
Dean Herbert
4986ad73f7 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 18:44:17 +09:00
Dean Herbert
d93911ae97 Improve user ratings calculations to make more sense
Closes #1552.
2017-11-23 18:10:08 +09:00
naoey
b6de1ce5b6 Handle query params better. 2017-11-23 14:36:12 +05:30
Unknown
096e98b5d3 Add game mode query to request.
- Also update scores when game mode is changed
2017-11-23 14:36:12 +05:30
naoey
487483eadd Move loader hiding to a better place. 2017-11-23 14:36:12 +05:30
naoey
a58bd72c6e Add placeholder when there are no scores. 2017-11-23 14:36:12 +05:30
naoey
fe559f4b62 Add respective query params to GetScoreRequest based on selected tab. 2017-11-23 14:36:12 +05:30
FreezyLemon
2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +01:00
Dean Herbert
1824540325 Schedule calls to correct thread
These could be fired from an async worker thread (for instance, maintenance operations).
2017-11-23 17:02:54 +09:00
FreezyLemon
7d428875b8 Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor) 2017-11-22 15:46:04 +01:00
smoogipoo
de7c571be3 Merge remote-tracking branch 'origin/master' into netstandard 2017-11-22 19:46:17 +09:00
FreezyLemon
870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
Dean Herbert
2603219350 Load beatmap carousel panels asynchronously 2017-11-21 22:30:09 +09:00
Dean Herbert
c2fcb2f9c7 Fix info wedge not displaying 2017-11-21 18:45:12 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
bd616c1307 Simplify some property access 2017-11-21 12:42:28 +09:00
Dean Herbert
be9c99ade3 Remove AsyncLoadWrapper dependence 2017-11-21 12:42:28 +09:00
Dean Herbert
e7654254d2 Remove unused code 2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
Dean Herbert
9325730f5d Fix leaderboard fadeout causing constant flow changes
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
EVAST9919
a741d6cea7 Fix incorrect score indexes in leaderboard 2017-11-18 04:46:02 +03:00
Dean Herbert
6c40cf08cc Optimise leaderboard display
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dean Herbert
eaf1a60fe1
Merge branch 'master' into beatmap_scores 2017-11-15 17:58:07 +09:00
EVAST9919
ea2fa5fa00 Fix wrong ratings calculations 2017-11-15 09:48:40 +03:00
EVAST9919
d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert
49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
Dean Herbert
9e82fc21ac Improve transition when exiting song select
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
4874371dbf Rename methods back 2017-11-09 17:38:20 +09:00
Dean Herbert
c2d4a213b1 Rename logo-related methods 2017-11-08 16:34:03 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
f486ab1f6c
Merge branch 'master' into song_select_delete 2017-10-30 21:07:02 +09:00
Dean Herbert
5001e9f264 Fix Hide/Restore/Delete etc. 2017-10-25 22:08:34 +09:00
Dean Herbert
f69fa0cf1f Fix selection after hiding all difficulties in a set 2017-10-20 11:16:56 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
a85de09c0f Fix beatmap carousel interactions with deletion when not yet displayed 2017-10-18 18:36:35 +09:00
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
Huo Yaoyuan
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
EVAST9919
24ca7a5119 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-15 00:09:50 +03:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
EVAST9919
502940ddf3 Fix deleting last visible beatmap doesn't trigger selecting null beatmap 2017-10-14 05:05:38 +03:00
EVAST9919
7cff413ab0 Fix wrong beatmap selection in song-select menu on deleting selected beatmap 2017-10-11 20:25:12 +03:00
smoogipoo
d3109a5950 Hook up BeatmapPanel "Edit" item 2017-10-07 00:59:14 +09:00
Dean Herbert
f129902ee0 Avoid nullrefs when data is not present 2017-09-25 23:35:02 +08:00
Huo Yaoyuan
442259d9e0 Fix overlay toggling in song select. 2017-09-23 19:47:23 +08:00
Dean Herbert
120446e4a7 Ensure only one dialog is being displayed by the SongSelect footer at a time
Fixes #1208
2017-09-20 14:32:15 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
b72921b30e Ensure an OnlineBeatmapID is present before attempting API requests 2017-09-15 12:44:48 +09:00
Dean Herbert
396a56ddf4 Remove global OsuContextMenuContainer 2017-09-14 15:41:32 +09:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
6d33e39c5e Merge branch 'master' into beatmap-details-rewrite 2017-09-10 11:26:00 +09:00
DrabWeb
d95940ed5e CI fixes. 2017-09-08 14:25:41 -03:00
DrabWeb
ce68b6661e Update visual test. 2017-09-08 14:15:28 -03:00
DrabWeb
55e8bdfb05 CI fixes. 2017-09-07 15:38:23 -03:00
DrabWeb
109531b66c Cleanup, remove unneeded files. 2017-09-07 15:21:18 -03:00
DrabWeb
2153865de5 Adjust fail on missing logic to match original. 2017-09-07 15:09:50 -03:00
DrabWeb
fd2700a5b4 Fix .00 being displayed for star difficulty when the value is 0. 2017-09-07 15:01:31 -03:00
DrabWeb
5e685ff5b1 Rewrite BeatmapDetails to be more modular for future code sharing. 2017-09-07 14:53:53 -03:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
5508fa0fd9 Merge remote-tracking branch 'origin/master' into new-menus 2017-09-05 19:14:42 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
543a71efcc Fix ObjectDisposal exceptions due to lingering event binds 2017-09-04 08:21:07 +09:00
Dean Herbert
dd26c80837 Delete -> Hide 2017-09-04 07:59:32 +09:00
Dan Balasescu
19ad5d5328 Merge branch 'master' into song-select-context-menus 2017-09-04 07:56:31 +09:00
Dean Herbert
3ede685ee9 Fix crash on random selection from a previously null selection 2017-09-01 18:44:51 +09:00
Dean Herbert
3d61cde266 Correctly delay loading of PlaySongSelect-specific components 2017-09-01 18:22:38 +09:00
Dean Herbert
f9d02afb00 Don't allow selection of a hidden beatmap 2017-09-01 18:13:21 +09:00
Dean Herbert
1f646e6d54 Add hiding support for beatmap difficulties 2017-09-01 17:57:12 +09:00
Dean Herbert
3b4b4b669b Add framework for deleting difficulties 2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc Use BeatmapSetInfo instead of WorkingBeatmap 2017-08-30 20:53:33 +09:00
Dean Herbert
07da29ea1c Add context menu to beatmap set header 2017-08-30 20:41:41 +09:00
Huo Yaoyuan
4aa5ce8b41 Always load background and info wedge when no beatmap available. 2017-08-28 17:53:57 +08:00
MrTheMake
6d401b5f21 Merge branch 'master' into leaderboard-scores 2017-08-19 00:00:40 +02:00
Shane Woolcock
4901ac9e35 Add some comments explaining why the Track is being forcefully added to the TrackManager 2017-08-18 18:01:18 +09:30
Dean Herbert
ffc8f763e5 Merge branch 'master' into fix-track-not-resetting 2017-08-18 17:24:22 +09:00
Dan Balasescu
cc6a5824f0 Merge branch 'master' into fix-ruleset-changing 2017-08-18 13:40:52 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
MrTheMake
105048500a Made modString private and moved the beatmap assignment inside GetScoresRequest 2017-08-15 15:30:53 +02:00
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
MrTheMake
920710e7d0 Assign a score's beatmap and cleanup to the Score class 2017-08-14 13:30:54 +02:00
Dean Herbert
9e1ffa27dc Fix leaderboard icons not displaying correctly 2017-08-14 12:52:20 +09:00
MrTheMake
6b1184e8af General formatting 2017-08-14 00:27:54 +02:00
MrTheMake
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3 Fix nullref in the leaderboard's test case 2017-08-13 18:00:53 +02:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
Dean Herbert
94b8d1de8b Merge branch 'master' into fix-ruleset-changing 2017-08-13 11:14:41 +09:00
Dean Herbert
fe2911f165 Fix some formatting issues 2017-08-13 10:36:57 +09:00
Shane Woolcock
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
Shane Woolcock
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
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
e8021c2b92 Move line inside if 2017-08-04 17:20:05 +09:00
Huo Yaoyuan
74facb32b4 Use removeAutoModOnResume as a field. 2017-08-04 15:34:11 +08:00
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
Dean Herbert
e94425f311 Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
2017-06-12 17:04:42 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
EVAST9919
e552c39444 change function to a property 2017-06-11 22:04:35 +03:00
EVAST9919
c3f4b1b3cb Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-11 21:56:55 +03:00
John Neijzen
aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00