FreezyLemon
c737e5245e
Removed unnecessary SelectNext() call and change to dummy map when no items present
2017-12-26 01:50:05 +01:00
Dean Herbert
798c2c6666
Add special logic to song select to avoid obvious clipping when notifications are displayed
...
Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.
2017-12-26 02:52:43 +09:00
Dean Herbert
3c8d30f8e6
Add a dialog offering to import beatmaps from stable
2017-12-26 00:52:11 +09:00
Dean Herbert
3c1654e5e4
Fix many instances of non-osu-prefixed text classes being used
...
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
482e10966c
Ensure a selection is made on entering song select if no selection is current
2017-12-24 17:02:56 +09:00
Dean Herbert
cf316b3c51
Add tests for initial load states of PlaySongSelect
2017-12-24 15:39:25 +09:00
Dean Herbert
8e644e878a
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-23 21:40:27 +09:00
Aergwyn
1d67746d32
fix crash in SongSelect when traversing while zero beatmaps are loaded
2017-12-23 12:53:11 +01:00
Dean Herbert
117b744e37
Merge branch 'master' into fix-info-wedge
2017-12-23 20:36:24 +09:00
Dean Herbert
bdda1570d1
Move Placeholder classes to own files
2017-12-22 22:44:18 +09:00
Dean Herbert
26bb3715fe
Improve state and feel of leaderboard placeholders
...
Closes #1721 .
2017-12-22 22:42:23 +09:00
Dean Herbert
2313ff0ddb
Fix beatmap info wedge not showing up when zero beatmaps are loaded
...
Closes #1722 .
2017-12-22 22:19:11 +09:00
Aergwyn
ed827d5424
more visual tests for BeatmapInfoWedge
...
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Aergwyn
07f55a2a60
remove references to DummyWorkingBeatmap
...
determine content by data that is present instead
2017-12-22 10:18:25 +01:00
Aergwyn
214154c512
hide unnecessary lines on empty BeatmapInfoWedge
...
adding back deleted line
ooops
meh
2017-12-21 20:23:10 +01:00
Dean Herbert
aa388885b7
Adjust animation slightly
2017-12-22 00:53:34 +09:00
Dean Herbert
5c9d484395
Adjust debounce a bit
2017-12-22 00:50:32 +09:00
Dean Herbert
57fdbda16d
Remove unnecessary IsLoaded check
...
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06
Use local bindable
2017-12-21 23:48:35 +09:00
Dean Herbert
4bd2c7e95f
Fix minor formatting issue
2017-12-21 21:54:46 +09:00
naoey
644aaa8167
Unsubscribe from API state change event.
2017-12-21 18:00:10 +05:30
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes
2017-12-21 21:18:56 +09:00
Dean Herbert
052badc1bd
Add a right-click context option to carousel panels to view online beatmap details
2017-12-21 19:42:44 +09:00
naoey
01c4b1e544
Maintain a placeholder state and add tests showing all the states.
...
- Also don't replace placeholder if new one is same as old
2017-12-21 15:27:20 +05:30
Dean Herbert
afcb9912e4
Reorder API / logged in checks to make more sense
2017-12-21 03:11:44 +09:00
Dean Herbert
2ff351c6cb
Show retrieval failure when OnlineBeatmapID is missing
2017-12-21 03:10:09 +09:00
naoey
85dee3abac
Increase GetScoresRequest timeout & leave existing scores when API dies.
2017-12-20 20:48:30 +05:30
naoey
8d24a04641
Remove unused usings.
2017-12-20 20:26:59 +05:30
naoey
c8c8b6810a
Kill ugly retry button bounce.
2017-12-20 20:11:48 +05:30
naoey
23f4799840
Create placeholder classes instead of changing Children.
...
- Add MessagePlaceholder
- Use MessagePlacholder for when API is offline/user isn't a supporter
- Remove unnecessary placeholderFlow field
- Hook into API state changes
2017-12-20 20:00:52 +05:30
Dean Herbert
6d471da459
Remove unnecessary workaround
2017-12-20 21:52:03 +09:00
Dean Herbert
3292ef33fd
Fix test edge cases
2017-12-20 21:16:19 +09:00
Dean Herbert
1b91f24044
Simplify scope logic
2017-12-20 20:33:16 +09:00
Dean Herbert
21829ba37b
Merge branch 'master' into leaderboard-scopes
2017-12-20 20:17:11 +09:00
Dean Herbert
6121cd3b67
Remove animating skipping and reorder file a bit
2017-12-18 12:30:39 +09:00
Dean Herbert
23e014b52d
Simplify drawable removal logic
2017-12-18 12:05:49 +09:00
Dean Herbert
b2cd32eb95
Move children to CarouselGroup
2017-12-18 11:57:13 +09:00
Dean Herbert
7173829896
Add filter checks to difficulty selection
2017-12-18 11:43:10 +09:00
Dean Herbert
4c1f00567b
Fix incorrect flush logic when starting play from non-selected difficulty using context menu
2017-12-18 11:31:38 +09:00
Dean Herbert
4e46565f6e
Remove todo
2017-12-18 11:25:02 +09:00
Dean Herbert
5bfb6d1f58
Remove unused variable
2017-12-18 11:13:51 +09:00
Dean Herbert
b21c22085d
Make more things private
2017-12-18 11:13:16 +09:00
Dean Herbert
954bc77a71
Indicate unused variable
2017-12-18 08:05:57 +09:00
Dean Herbert
dfd7787b15
Move more overhead from ctor to BDL
2017-12-18 07:58:48 +09:00
Dean Herbert
c10288541c
Avoid redundant IndexOf calls
2017-12-18 07:58:34 +09:00
Dean Herbert
482941b333
Preload drawables to force asynchronous construction
2017-12-18 06:59:32 +09:00
Dean Herbert
30a15729ec
Fix event handling from outside carousel being scheduled at the wrong level
...
Was causing BeatmapSet's Set to run *after* newer events were received.
2017-12-18 02:46:53 +09:00
Dean Herbert
942054a30f
Re-fix null selection
2017-12-18 02:26:40 +09:00
Dean Herbert
19643ba5e6
Resolve scroll animation/position issues
2017-12-18 02:23:03 +09:00
Dean Herbert
54cc6fadf9
Greatly improve performance when many hidden panels are on-screen
2017-12-17 05:57:50 +09:00
Dean Herbert
5d7413f19c
Improve performance with large numbers of panels visible
2017-12-17 04:30:56 +09:00
Dean Herbert
c02ce16f47
Remove unnecessary capture
2017-12-17 03:04:57 +09:00
Dean Herbert
d27047f94d
Remove logging
2017-12-17 03:04:37 +09:00
Dean Herbert
e2710a309c
Fix panel animation and depth
2017-12-17 02:43:24 +09:00
Dean Herbert
29a8ade59f
Rename "Hidden" to "Collapsed"
2017-12-16 23:56:14 +09:00
Dean Herbert
da0940ae0b
Only apply criteria if there are items populated in the carousel
2017-12-16 23:55:55 +09:00
Dean Herbert
33f8c8419a
Fix initial beatmap selection potentially being incorrect
2017-12-16 21:25:54 +09:00
Dean Herbert
bd9056c709
Better choose new selection when multiple items are removed including current
2017-12-16 17:32:21 +09:00
Dean Herbert
59dbca2612
Fix ScrollToSelected being called in too many cases
2017-12-16 16:44:42 +09:00
Dean Herbert
df7e795aa3
Simplify and rename filter methods
2017-12-16 16:27:39 +09:00
Dean Herbert
3c406662ed
Ensure correct selection after deletion of currently selected
...
Also fixes a lot of bad interactions and simplifies further.
2017-12-16 16:18:44 +09:00
Dean Herbert
a8a2c233a0
Add tests for (and fix) removal of last item in carousel
2017-12-16 00:33:09 +09:00
Dean Herbert
acfdd32783
Move DrawableCarouselBeatmap initialisation to BDL
...
oops
2017-12-15 18:38:09 +09:00
Dean Herbert
59d512762e
SongSelect tidying
2017-12-15 14:44:14 +09:00
Dean Herbert
ed5b6cc16f
Add back ctrl-enter autoplay shortcut
2017-12-15 14:44:13 +09:00
Dean Herbert
192ceb5465
Avoid multiple access to selectedBeatmap during y position computation
2017-12-15 14:44:12 +09:00
Dean Herbert
2e3332e3fe
Shortcut non-visible panels to avoid adding as drawables
2017-12-15 14:44:12 +09:00
Dean Herbert
67f05977ea
Add sorting support
2017-12-15 14:36:51 +09:00
Dean Herbert
b4b2f12116
Add support for adding/removing items
...
Tests accompany of course
2017-12-15 14:36:51 +09:00
Dean Herbert
7814b2df14
More renaming
2017-12-15 14:36:51 +09:00
Dean Herbert
5cbb9b9b18
Fix random and add tests
...
Also exposes SelectedBeatmapSet.
2017-12-15 14:36:51 +09:00
Dean Herbert
8646d5d1e0
Add testing and fix filtering only some difficulties
2017-12-15 14:36:51 +09:00
Dean Herbert
ec4f99c92e
Clean up tests some more
2017-12-15 14:36:51 +09:00
Dean Herbert
1b85952441
Cleanup and basic TestCase
2017-12-15 14:36:51 +09:00
Dean Herbert
b9298325a3
Rename weird config setting
2017-12-15 14:36:51 +09:00
Dean Herbert
99b00143eb
More clean-ups and event bindings
2017-12-15 14:36:51 +09:00
Dean Herbert
78dd975a35
Initial carousel infrastructue changes
2017-12-15 14:36:51 +09:00
smoogipoo
33654ee5b4
Remove explicit padding on icon
2017-12-15 13:01:06 +09:00
Aergwyn
f329b1ed72
add Spinner Count to BeatmapInfoWedge
...
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
2017-12-14 19:55:15 +01:00
Aergwyn
9fed972678
removed unnecessary using
2017-12-12 11:15:34 +01:00
Aergwyn
d11bf379d8
no longer select beatmapsets on import/download
...
let's save some ears and eyes for now
2017-12-12 11:04:11 +01:00
Dean Herbert
b10240d7ef
Handle the case where the selected panel is no longer a valid selection better
2017-12-11 21:31:26 +09:00
Dean Herbert
fb92b3551e
Correct panel y positions when filtered panels are present
2017-12-11 21:12:06 +09:00
Dean Herbert
970e55fc4a
Update difficulty icons on headers to match filtered difficulties
2017-12-11 20:49:27 +09:00
Dean Herbert
f58c554d19
Add per-difficulty filtering support
...
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
Unknown
47bd97363e
Use ShortName for mode.
...
- Also set the ruleset when fetching scores in BeatmapSetOverlay
2017-12-11 15:05:12 +05:30
naoey
ccbbd09d84
Merge remote-tracking branch 'upstream/master' into leaderboard-scopes
2017-12-11 13:59:22 +05:30
Aergwyn
e4628427cb
moved query into schedule
2017-12-10 08:15:29 +01:00
Aergwyn
821154d3bb
reverted Beatmaps-setter back to its former glory
2017-12-09 08:42:59 +01:00
Aergwyn
dde7678095
select beatmap on import/download
2017-12-08 13:09:30 +01:00
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
