MrTheMake
be3c7ec5f8
Added missing space
2017-08-02 16:17:33 +02:00
MrTheMake
79724e8018
Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified
2017-08-02 16:05:09 +02:00
Dan Balasescu
1f205d87f8
Merge branch 'master' into import-from-stable-part-two
2017-08-02 17:05:46 +09:30
Dean Herbert
7cb87c7145
Run each import in a single transaction
...
Improves performance substantially.
2017-08-02 14:18:35 +09:00
Dean Herbert
256daeaf68
Rename variable
2017-08-02 11:56:29 +09:00
MrTheMake
4d8e5898fd
Updates according to the framework and formatting
2017-08-01 17:28:18 +02:00
Dean Herbert
6eb960010f
Speed up startup cleanup operations.
2017-08-01 17:58:21 +09:00
Dean Herbert
3b1166d1e6
Optimise file lookups and other database operations
...
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Dean Herbert
941f3f0934
Tidy up osu-stable import process
...
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Dean Herbert
209d024caa
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-08-01 11:54:05 +09:00
Dean Herbert
fc7f9cbae2
Merge branch 'master' into master
2017-08-01 11:34:59 +09:00
Alex Park (박상희)
bb3a8a29ea
Hide Notification when playing osu
...
Hide Notification Overlay when playing osu
2017-08-01 11:31:11 +09:00
Dean Herbert
024a34a9b3
Merge branch 'master' into scroll_to_selected
2017-08-01 11:17:16 +09:00
Dean Herbert
c8b5c1b8a5
Merge branch 'master' into scroll_to_selected
2017-08-01 11:06:32 +09:00
Dean Herbert
b4acdd5f90
Merge remote-tracking branch 'upstream/master' into fix-file-references
2017-08-01 11:05:38 +09:00
Dean Herbert
9d630e446e
Use new storage methods to reset FileStore
...
Guarantees that backing files are cleaned up correctly. Also handles lingering "beatmaps" directory from older builds.
2017-08-01 10:57:46 +09:00
Dean Herbert
821f65c381
Actually delete files
2017-08-01 10:24:12 +09:00
Dean Herbert
c73e139954
Add "migration"
...
Also simplify initial migration for BeatmapStore by just nuking everything.
2017-08-01 10:24:04 +09:00
Dean Herbert
c060d32765
Separate out startup tasks to ensure they run after migrations
2017-08-01 10:24:00 +09:00
Dean Herbert
ed3e78452e
Lock beatmaps for good measure
2017-08-01 09:38:43 +09:00
Dean Herbert
6af0629cc0
Remove unnecessary newline
2017-08-01 09:37:33 +09:00
Dean Herbert
404497fa10
Allow a single beatmap to reference the same file multiple times
...
This fixes incorrect reference counts causing database desync.
2017-07-31 21:49:57 +09:00
EVAST9919
700c7753c3
Applied suggestions
2017-07-31 14:20:12 +03:00
EVAST9919
1ce4966644
Merge remote-tracking branch 'refs/remotes/ppy/master' into scroll_to_selected
2017-07-31 14:08:15 +03:00
Dean Herbert
f67822a59b
Add progress for deleting all maps
2017-07-31 18:52:59 +09:00
Huo Yaoyuan
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
Dean Herbert
bc8f8de049
Make QueryAndPopulate's filter non-optional (you basically *never* want this missing)
2017-07-31 18:41:54 +09:00
Dean Herbert
92b3c7ac08
Fix the whole database being retrieved when importing each beatmap
2017-07-31 18:38:42 +09:00
Dean Herbert
df5094c0d4
Rework how notifications are distributed
2017-07-31 18:03:55 +09:00
Dean Herbert
57d45b180c
Merge remote-tracking branch 'upstream/master' into import-from-stable
2017-07-31 17:31:10 +09:00
Dean Herbert
502ccae0ca
Merge branch 'master' into notification-improvements
2017-07-31 17:12:11 +09:00
Dean Herbert
063add6d10
Merge branch 'master' into fix-notification-threading
2017-07-31 16:39:53 +09:00
Dean Herbert
fcd502642d
Merge branch 'master' into button-visually-disables
2017-07-31 16:38:33 +09:00
Dean Herbert
17c5bdbc92
Merge branch 'master' into fix-notification-threading
2017-07-31 16:33:34 +09: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
b45f1e5381
Merge branch 'master' into transaction-on-import
2017-07-28 17:43:18 +09:00
Thomas Müller
88265c3223
Merge branch 'master' into store-migration
2017-07-28 10:34:22 +02:00
Dean Herbert
6807caa752
Use a transaction when adding a beatmap
...
Fixes flakey unit test.
2017-07-28 17:31:50 +09:00
Dean Herbert
4bb8f40b49
AutoSize notifications (and add animation)
2017-07-28 17:00:30 +09:00
Dean Herbert
74044baeff
Don't cancel a ProgressNotification when clicking by default
2017-07-28 17:00:27 +09:00
Dean Herbert
b3e3c4a226
Fix setting a ProgressNotification's progress too early crashing
2017-07-28 17:00:24 +09:00
Dean Herbert
5dfed1dba5
Add word-wrap functionality of ProgressNotification
...
Fixes a potential threading issue when updating Text.
2017-07-28 17:00:20 +09:00
Dean Herbert
0d332d4754
Fix NotificationOverlay no longer automatically displaying
2017-07-28 16:59:42 +09:00
Dean Herbert
c48bf3940e
Add a progress notification when importing beatmaps
2017-07-28 16:57:33 +09:00
Dean Herbert
f5b0253e82
Apply CI fixes
2017-07-28 15:36:23 +09:00
Dean Herbert
d93d9e6190
Tidy up file deletion after import
2017-07-28 15:08:56 +09:00
Dean Herbert
6616721e37
Don't block imports and BeatmapStore operations using the same lock
2017-07-28 15:05:12 +09:00
Dean Herbert
e691dd12c5
Fix potential sequen of execution issues in BeatmapCarousel
2017-07-28 15:05:08 +09:00
Dean Herbert
a55586f2ad
FIx potential sequence of execution issues in PlaylistOverlay
2017-07-28 15:04:58 +09:00
Dean Herbert
02a04afb29
Ensure notification posts are always scheduled to local thread
...
Posts can be triggered by Logger.Log events which are not guaranteed to be on the update thread.
2017-07-28 15:03:53 +09:00
Dean Herbert
f705589bf2
Rename NotificationManager to NotificationOverlay
2017-07-28 15:03:42 +09:00
Dean Herbert
e448f79154
Fix deleted beatmaps not correctly being removed from the playlist
2017-07-28 12:58:35 +09:00
Dean Herbert
d51ce896f9
Add locking to all BeatmapManager operations
2017-07-28 12:58:35 +09:00
Dean Herbert
7d4218ea6c
Add option to import from osu-stable
...
Also adds an option to delete all beatmaps for testing purposes.
2017-07-28 12:58:35 +09:00
Dean Herbert
9ee59dd637
Add the ability to create migrations on a per-store level
...
Now stores store versions to the database itself.
2017-07-28 12:58:35 +09:00
Dean Herbert
6a36fa7809
Make OsuButtons visually disable when not enabled
2017-07-28 12:58:03 +09:00
EVAST9919
3263aa2ca7
Always return true while dragging
2017-07-27 17:02:23 +03:00
EVAST9919
eb4880cdd5
Applied suggestions
2017-07-27 16:33:10 +03:00
EVAST9919
ed08bcf844
Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging
2017-07-27 16:19:21 +03:00
Dean Herbert
3a6f3cdd8a
Add the ability to create migrations on a per-store level
...
Now stores store versions to the database itself.
2017-07-27 20:38:40 +09:00
Dean Herbert
b64fe68233
Allow OsuColour.FromHex to support prefix #.
...
Coincides with https://github.com/ppy/osu-web/pull/1373
2017-07-27 18:03:35 +09:00
Dean Herbert
6f4efbeda6
Merge remote-tracking branch 'upstream/master' into database-tidy
2017-07-27 17:41:29 +09:00
Dean Herbert
996e5e8b4a
Use SHA2 for hashing
2017-07-27 17:40:08 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dan Balasescu
fe193207c5
Merge branch 'master' into chat-line-word-wrap
2017-07-27 16:57:15 +09:30
Dan Balasescu
d375459fa9
Merge branch 'master' into chat-line-word-wrap
2017-07-27 16:54:15 +09:30
Dean Herbert
fdc6666c71
Simplify hashing method
...
Also exit the import process before importing files to the file store to avoid incorrect reference count increments.
2017-07-27 15:55:55 +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
a90eff69db
Simplify BeatmapSetInfo deletion by relying on cascading deletes
2017-07-27 12:51:49 +09:00
Dean Herbert
c7a6343985
Never cascade-delete rulesets
2017-07-27 12:51:21 +09:00
Dean Herbert
aa81397df4
Recursively retrieve files
2017-07-27 12:41:34 +09:00
Dean Herbert
690b41b1e9
Fix join rows not being deleted when a beatmap is cleaned up
2017-07-27 12:37:37 +09:00
Dean Herbert
4e742959f2
CI fixes
2017-07-27 00:21:57 +09:00
Dean Herbert
87add0765e
Initial documentation pass on BeatmapDatabase
...
Also a bit of tidying up.
2017-07-27 00:08:19 +09:00
Dean Herbert
07d4d2dbe4
Secondary documentation pass on BeatmapStore
2017-07-26 23:13:02 +09:00
Dean Herbert
99e53b5109
Initial documentation pass on BeatmapStore
2017-07-26 22:48:16 +09:00
Dean Herbert
898a601098
Introduce a reference counting file store
2017-07-26 20:22:02 +09:00
Dean Herbert
5fc68aabbf
Fix reset function not running in correct order
2017-07-26 17:14:38 +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
cb4563d169
Revert "Load UserProfileOverlay with a lower depth."
...
This reverts commit 11cba0638d
2017-07-24 21:49:39 +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
Dean Herbert
7fcd24ab69
Merge branch 'master' into scrollable_carousel
2017-07-24 18:16:47 +09:00
Dean Herbert
ed7bb329de
Add word wrap support to chat
2017-07-24 18:11:25 +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
Dean Herbert
038e47ceda
Merge branch 'master' into drawableflag-ctor
2017-07-24 16:46:20 +09:00
Nabile Rahmani
c80f5c708a
Less verbose DrawableFlag constructor.
2017-07-24 09:25:49 +02:00
Dean Herbert
750d96be8f
Merge branch 'master' into playlist-beatmaplist-sync
2017-07-24 14:12:04 +09:00
Ben Pig Chu
950c55d6d0
No need to dispose/unbind the delegates
2017-07-24 13:10:51 +08: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
EVAST9919
dd96e101d4
Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging
2017-07-23 13:26:23 +03:00
Ben Pig Chu
76edcb4a67
Update playlist when adding or removing beatmap set
2017-07-23 14:21:10 +08:00
Dean Herbert
831bd24b00
Merge branch 'master' into easing
2017-07-23 13:46:35 +09:00
Dean Herbert
c6250e1da5
Supress compiler warning
...
I don't think this is a sustainable solution if we start doing this in more places.
2017-07-23 11:34:09 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
750fc0db0e
Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
2017-07-22 11:34:27 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
dae0f61b2b
Don't obtain DependencyContainer via DI
2017-07-22 11:09:13 +02:00
Thomas Müller
95684f7d40
Merge branch 'master' of github.com:ppy/osu into prevent-dependency-pollution
2017-07-22 10:56:28 +02:00
Thomas Müller
e36b65bfe0
Merge branch 'master' into better-transforms
2017-07-22 10:50:58 +02:00
Dean Herbert
7549d3a2c4
Allow ChatLines to exist without UserProfileOverlay
...
Fixes testcases failing when logged in.
2017-07-22 17:18:20 +09:00
Thomas Müller
e469a114a6
Update dependency caching according to framework
2017-07-21 19:03:43 +02:00
Thomas Müller
0f2bcb2904
Update framework
2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
EVAST9919
66f816692f
Better boolean naming
2017-07-21 13:40:09 +03:00
EVAST9919
270ab5c987
Allow ChatOverlay resize only if it dragged by the tabs area only
2017-07-21 13:37:22 +03: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
Thomas Müller
3a086534f8
Merge branch 'master' into fix-selection-changing
2017-07-21 10:22:11 +02:00
Dean Herbert
12b6b80d5c
Make method to flush filter requests
2017-07-21 17:20:52 +09:00
Dean Herbert
bf254bf5cf
Merge branch 'master' into fix-songprogress-endtime
2017-07-21 16:46:41 +09:00
Dean Herbert
6bdf6bb675
Merge branch 'master' into previewtime-seeking
2017-07-21 15:06:18 +09:00
Dean Herbert
f7b64a458a
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:10:25 +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
ed6478be8b
Merge branch 'master' into always-load-storyboard
2017-07-20 20:54:16 +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
MrTheMake
22f3e97241
Small optimization to the main menu intro seeking.
2017-07-20 17:15:39 +02:00
Dean Herbert
c1a3e4a008
Remove unnecessary using
2017-07-20 20:06:24 +09:00
Dean Herbert
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
Dean Herbert
cb3402098a
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
2017-07-20 19:32:00 +09:00
Dean Herbert
781d76d094
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
2017-07-20 19:15:21 +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
d6968ca09c
Remove FullyLoaded logic
...
Always parse storyboards for now.
Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
Dean Herbert
b00fc857dd
Merge branch 'master' into fix-beatmap-null
2017-07-20 09:33:14 +09:00
Dean Herbert
8d727b898f
Don't rely on BeatmapSetInfo being present
2017-07-20 09:23:11 +09:00
Dean Herbert
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
MrTheMake
fd518e2294
Don't start a beatmap's track until the intro is done playing
2017-07-20 01:57:46 +02:00
Jorolf
bac8693c81
Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes
2017-07-20 01:08:42 +02:00
Jorolf
e0fb2563b5
remove using
2017-07-20 01:08:26 +02:00
jorolf
c2a2f77210
Merge branch 'master' into user-profile-fixes
2017-07-20 01:06:36 +02:00
Jorolf
b016103894
add link to user page
2017-07-20 01:03:00 +02: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
smoogipooo
d75e439f94
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 01:27:27 +09:30
MrTheMake
6ff2b73c30
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
2017-07-19 16:50:29 +02:00
Dean Herbert
38431f8555
Fix remaining test case issues
2017-07-19 19:10:04 +09:00
Dean Herbert
8ce71ef235
Fix broken test case
2017-07-19 18:48:27 +09:00
Dean Herbert
da92fccdb0
Merge branch 'master' into non-null-beatmap
2017-07-19 18:32:42 +09:00
Dean Herbert
d7dddec328
Set zero-difficulty values local to the dummy beatmap
2017-07-19 18:32:11 +09:00
Dean Herbert
2c5019ff7c
Forward action in saner way
2017-07-19 18:22:46 +09:00
Dean Herbert
b6b7ae47db
Merge branch 'master' into user-profile-fixes
2017-07-19 18:15:38 +09:00
Dean Herbert
0b53f1a7e3
Reference system
2017-07-19 18:09:59 +09:00
Dean Herbert
a01209cfe0
Simplify comparator
2017-07-19 18:09:59 +09:00
Dean Herbert
35157ca6b8
Make DefaultBeatmap private get.
2017-07-19 18:09:59 +09:00
Dean Herbert
2eccb3822a
Make link text not suck
2017-07-19 17:54:04 +09:00
Dan Balasescu
42af26a5a5
Merge branch 'master' into beatmap-delete-fixes
2017-07-19 17:34:12 +09:30
Dean Herbert
c34856922c
Gratify CI
2017-07-19 16:34:18 +09:00
Dean Herbert
2a2f4e2a8b
Ensure side flashes are not visible during moving transitions
2017-07-19 16:13:01 +09:00
Dean Herbert
2b1e19814c
Side flashes should not be affected by parallax
2017-07-19 16:07:11 +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
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
Dean Herbert
007b343854
Fix incorrect equality check when TimingPointAt returns a default T
2017-07-19 15:16:40 +09:00
Dean Herbert
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
Dean Herbert
6016310b09
Use a better default for difficulty values
2017-07-19 15:16:37 +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
59416584c1
Don't show theme song in playlist
2017-07-19 15:16:35 +09:00
Dean Herbert
e47faf4e85
Add a dummy beatmap provider for use in BeatmapInfoWedge
2017-07-19 15:16:33 +09:00
Dean Herbert
6f59e5feec
Add null check on stream
2017-07-19 14:56:27 +09:00
Dean Herbert
f00140f0a4
Avoid crashes on attempting to import the same path twice in quick succession
2017-07-19 14:56:24 +09:00
Dean Herbert
5761eb30a0
Fix nullref error on re-importing a DeletePending beatmap
...
Callback was expecting the beatmap to be populated where it wasn't being.
2017-07-19 14:56:20 +09:00
Thomas Müller
3ba119c115
Ensure toolbar disappears when osu logo transition is cancelled
2017-07-18 17:09:53 +03:00
Thomas Müller
b40c897dbd
Fix osu logo shockwave playing when transition is aborted
...
This is a very nice use-case scenario for TransformSequence.OnComplete
2017-07-18 15:28:56 +03: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
ef2770b718
Bypass commit in SearchTextBox regardless of Shift and Ctrl.
2017-07-18 17:40:34 +08:00
Thomas Müller
6d8bdadf2d
Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
2017-07-18 12:35:48 +03:00
Thomas Müller
a225b542d5
Sender is always non-null
2017-07-18 12:35:36 +03:00
Thomas Müller
fce5a191f1
Migrate padding into the scroll content to not cut off effects
2017-07-18 12:26:27 +03:00
Thomas Müller
e58ea97604
Improve design as requested
2017-07-18 12:26:05 +03:00
