Aergwyn
6a8fd74e05
fix failing tests
...
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization
2017-12-22 22:45:00 +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
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
Aergwyn
ed827d5424
more visual tests for BeatmapInfoWedge
...
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Dean Herbert
e5faced9ba
Better variable name
2017-12-22 19:25:59 +09:00
Dean Herbert
82909f6585
RankChart -> RankGraph
2017-12-22 19:25:18 +09:00
Dean Herbert
1a318c5c2b
Improve LineGraph invalidation logic
2017-12-22 18:58:35 +09:00
EVAST9919
8c50fa0b84
Add testcase
2017-12-22 18:57:23 +09:00
EVAST9919
938c5feea4
Simplify interaction condition
2017-12-22 18:45:10 +09:00
EVAST9919
94a974a397
Use bindable for a user
2017-12-22 18:45:10 +09:00
EVAST9919
e48c515d52
CI fixes
2017-12-22 18:45:10 +09:00
EVAST9919
5ffdaf711e
Remove useless array
2017-12-22 18:45:10 +09:00
EVAST9919
f3c93c894b
Rank graph improvements
2017-12-22 18:45:10 +09:00
Aergwyn
07f55a2a60
remove references to DummyWorkingBeatmap
...
determine content by data that is present instead
2017-12-22 10:18:25 +01:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09: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
40ceaf12f2
Merge branch 'master' into leaderboard-scopes
2017-12-22 00:44:24 +09:00
Dean Herbert
40587411c1
Merge branch 'master' into add-confirmation-dialog
2017-12-22 00:32:25 +09:00
Dean Herbert
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking
2017-12-22 00:18:02 +09:00
Dan Balasescu
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking
2017-12-21 23:55:48 +09:00
Dean Herbert
eb1b1da732
Merge branch 'master' into overlays-block-keyboard
2017-12-21 23:51:46 +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
13fee5402a
Remove unnecessary using
...
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog
2017-12-21 22:56:31 +09:00
Dean Herbert
620e9737c3
Avoid many many unnecessary enumerations
2017-12-21 22:33:16 +09:00
Dean Herbert
a9039c71e0
Merge branch 'master' into undelete-button-add
2017-12-21 22:32:08 +09:00
Dean Herbert
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dan Balasescu
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard
2017-12-21 22:15:03 +09:00
smoogipoo
790aa8be2a
Merge master into beatmap-serialization
2017-12-21 22:13:53 +09:00
smoogipoo
866d1c6e0f
Remove now unused references
2017-12-21 22:13:18 +09:00
Dean Herbert
4bd2c7e95f
Fix minor formatting issue
2017-12-21 21:54:46 +09:00
Dean Herbert
abe465358c
Fix formatting
2017-12-21 21:46:57 +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
5b596765c8
Merge branch 'master' into dev-overlay-counter
2017-12-21 21:09:40 +09:00
FreezyLemon
e4ead36544
Added completion text
2017-12-21 13:01:14 +01:00
FreezyLemon
cbc1aacf5c
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
2017-12-21 13:00:11 +01:00
Seokho Song
6fbd06f967
Fix Not update retry counter on PauseOverlay
...
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.
Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
Dan Balasescu
50afc6e9c9
Merge branch 'master' into fix-gameplay-menu-blocking
2017-12-21 20:07:14 +09:00
smoogipoo
2fb8895e66
Add spacer to menu
2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa
Remove migration setting in favour of export option in the editor
2017-12-21 19:56:12 +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
smoogipoo
a3fcc0b60c
Back to using SortedLists
2017-12-21 19:40:41 +09:00
Dean Herbert
1895b16d67
Correctly make fullscreen overlays block keyboard input from drawables behind them
...
- [ ] Depends on #1711 to get correct global binding handling.
2017-12-21 19:34:20 +09:00
Dean Herbert
b6fd5b0f17
Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay
2017-12-21 19:19:08 +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
fdfc596abe
Merge branch 'master' into add-confirmation-dialog
2017-12-21 18:45:52 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
smoogipoo
58859f2ffb
Rework registration/instantiation of decoders to not rely on reflection
2017-12-21 15:34:00 +09:00
smoogipoo
22f8853f49
Serialize star difficulty for now
2017-12-21 14:44:51 +09:00
smoogipoo
e8e5e8270b
Rename decoder
2017-12-21 14:19:37 +09:00
smoogipoo
bfa4f1a2c3
Apply changes in line with master changes
2017-12-21 13:59:03 +09:00
smoogipoo
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
Dan Balasescu
e051353dad
Merge branch 'master' into add-deselect-mods-button
2017-12-21 11:54:46 +09:00
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
Aergwyn
ebc2ad55f8
greatly expanded tests for ModSelectOverlay
2017-12-20 19:05:23 +01: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
c871a25dfa
Remove unnecessary constructure and make ruleset required
2017-12-20 20:41:01 +09:00
Dean Herbert
1b91f24044
Simplify scope logic
2017-12-20 20:33:16 +09:00
Dean Herbert
63dce59c8c
Throw an exception if we try and retrieve local scores online
2017-12-20 20:28:00 +09:00
Dean Herbert
21829ba37b
Merge branch 'master' into leaderboard-scopes
2017-12-20 20:17:11 +09:00
Dean Herbert
fc0b97065c
Move hover sound/container to base implementation
2017-12-20 15:54:13 +09:00
Dean Herbert
a6496e35ec
Merge branch 'master' into url-parsing-support
2017-12-20 14:41:12 +09:00
FreezyLemon
270d81f816
Made the Link's OnClick() Method return true
2017-12-19 19:37:43 +01:00
FreezyLemon
4f8bec8dfc
Removed makeshift fix that has already been addressed elsewhere.
2017-12-19 19:35:42 +01:00
Dean Herbert
9940d4630f
Merge branch 'master' into customize-progress-notification
2017-12-20 02:52:57 +09:00
FreezyLemon
3644eda9a9
Changed notification from "installed" to "imported" on beatmap download
2017-12-19 11:34:23 +01:00
Aergwyn
bfe986230d
Merge branch 'master' into add-confirmation-dialog
2017-12-18 17:29:06 +01:00
Aergwyn
6ac33e3c00
made DeleteAll-button pink
2017-12-18 17:04:35 +01:00
Dean Herbert
c8afc553cb
Fix profile header not correctly being masked
...
Closes #1592 .
2017-12-18 23:55:34 +09:00
Dean Herbert
051a3c4d47
Fix line endings
2017-12-18 21:51:00 +09:00
Dean Herbert
a74ac278fe
Merge remote-tracking branch 'upstream/master' into editor-selection-tool
2017-12-18 21:48:01 +09:00
smoogipoo
fabf1bf60a
Make the captured objects not update for now
...
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
smoogipoo
5493493f82
FinishCapture -> FinishDrag from Handles
2017-12-18 19:24:41 +09:00
smoogipoo
09c51df2bd
Marker* -> Handle
2017-12-18 19:21:26 +09:00
smoogipoo
3999940538
DragSelector -> HitObjectSelectionBox
2017-12-18 19:17:26 +09:00
FreezyLemon
ba614883ea
used Any() instead of manually checking count == 0 (CI)
2017-12-18 11:16:57 +01:00
FreezyLemon
f898481523
Changed existing implementations to have a custom CompletionText
2017-12-18 11:14:07 +01:00
smoogipoo
5e111e14db
Make it possible to change the overlay actions beyond instantiation
2017-12-18 19:13:25 +09:00
smoogipoo
a17b2e4c18
Expose buttons for test cases
2017-12-18 19:13:08 +09:00
FreezyLemon
7c9d11756e
Add the ability to change what text is displayed when a ProgressNotification finishes its task.
2017-12-18 10:59:25 +01:00
FreezyLemon
d2b80fdbfc
Moved "undelete all" logic to BeatmapManager and added a progress notification
2017-12-18 10:55:07 +01:00
smoogipoo
918e7c9a4b
MenuOverlay -> GameplayMenuOverlay
2017-12-18 16:40:50 +09:00
smoogipoo
cf640d084e
Use using
2017-12-18 16:38:15 +09:00
smoogipoo
846750a190
Remove unnecessary flag
2017-12-18 16:36:11 +09:00
smoogipoo
5f538f03ea
Comments
2017-12-18 16:34:25 +09:00
smoogipoo
59365bbdce
Make MenuOverlay support key selections
2017-12-18 16:34:17 +09:00
Dean Herbert
4c45102d61
Merge branch 'master' into undelete-button-add
2017-12-18 16:28:32 +09:00
smoogipoo
8fdaf6f8f4
Restructure DialogButton to support selection
2017-12-18 14:47:17 +09:00
Dan Balasescu
812181190e
Update SelectionLayer.cs
2017-12-18 14:10:14 +09:00
smoogipoo
f3a5258c5b
Reorder file (ctor + bdl)
2017-12-18 14:05:12 +09:00
Dan Balasescu
17c58678cf
Update SelectionInfo.cs
2017-12-18 13:59:46 +09:00
Dan Balasescu
35b6114d01
Merge branch 'master' into editor-selection-tool
2017-12-18 13:57:32 +09:00
Dan Balasescu
57e5b2debe
Merge branch 'master' into add-deselect-mods-button
2017-12-18 13:48:35 +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
Aergwyn
5fbe7dfd8c
added Deselect All button to ModSelectOverlay
2017-12-16 17:53:22 +01: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
Ninjaprawn
84ed91d5c9
Remove IgnoreTooltip; Override TooltipText to null
2017-12-16 20:17:20 +11:00
Ninjaprawn
71e59bc9e7
Removed the IgnoreTooltip property
2017-12-16 20:16:40 +11: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
49ce42d90c
Add ToString() overrides on many classes to make debugging easier
2017-12-16 16:14:01 +09:00
Aergwyn
2e196661bb
Merge branch 'master' into add-confirmation-dialog
2017-12-15 18:11:13 +01: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
fd9d900ae0
Simplify StarCounter and SpriteIcon
2017-12-15 18:40:03 +09:00
Dean Herbert
acfdd32783
Move DrawableCarouselBeatmap initialisation to BDL
...
oops
2017-12-15 18:38:09 +09:00
smoogipoo
66b19b6c97
Expose selected objects from SelectionLayer
2017-12-15 14:48:24 +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
48e53a76b0
Fix incorrect line endings
2017-12-15 14:44:11 +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
1146ba02d7
Make GetWorkingBeatmap return a sane default rather than exception on lookup failure
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
2c1a83f82e
Merge branch 'master' into editor-selection-tool
2017-12-15 13:36:47 +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
59e8536ff7
moved action to construction arguments
2017-12-14 17:33:56 +01:00
smoogipoo
b28b86dea9
Use Lazy for threadsafety on playfield
2017-12-14 20:27:51 +09:00
smoogipoo
9c59db4be3
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-14 14:20:49 +09: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
69653c7f4f
Don't use nested ternary if
2017-12-12 13:07:34 +09:00
Dan Balasescu
186d347aae
Merge branch 'master' into editor-selection-tool
2017-12-11 22:24:12 +09:00
smoogipoo
3d51301e03
Add license headers
2017-12-11 22:21:33 +09:00
smoogipoo
666dcdbd62
Give HitObjectComposer a SelectionLayer
2017-12-11 22:20:02 +09:00
smoogipoo
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
smoogipoo
2f1063c5c0
Refactor into separate files + add xmldocs + rename some methods
2017-12-11 21:56:58 +09:00
FreezyLemon
d0b7c92b46
Removed unnecessary usings.
2017-12-11 13:46:23 +01:00
FreezyLemon
bfa9beb7b2
Switched to regex to handle most of the decision on what to do on click. Also updated the getIdFromUrl method to adapt to the changes
2017-12-11 13:43:47 +01:00
Dean Herbert
8dea999908
Order difficulty icons by ruleset
2017-12-11 21:35:47 +09: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
smoogipoo
c12c241633
Implement hover colours
2017-12-11 21:27:19 +09:00
Dean Herbert
fb92b3551e
Correct panel y positions when filtered panels are present
2017-12-11 21:12:06 +09:00
smoogipoo
25d80a36be
Finish up logical implementation of markers
2017-12-11 21:03:34 +09:00
Dean Herbert
970e55fc4a
Update difficulty icons on headers to match filtered difficulties
2017-12-11 20:49:27 +09:00
FreezyLemon
8a02507d44
Let regex handle "getIdFromUrl"
2017-12-11 12:40:37 +01:00
Dean Herbert
f58c554d19
Add per-difficulty filtering support
...
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
FreezyLemon
63698895a5
Removed unnecessary container and fixed "HandleInput" for ChatLinks
2017-12-11 11:40:04 +01:00
FreezyLemon
bb0a32b555
Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization.
2017-12-11 11:28:16 +01:00
smoogipoo
5147b342dc
More refactorings + add markers
...
Move
2017-12-11 19:07:40 +09:00
FreezyLemon
4d475f1c1b
Changed it so ChatLinks handle hover and click sounds themselves
2017-12-11 11:05:32 +01:00
FreezyLemon
13bc50ad56
Removed ICanDisableHoverSounds interface
2017-12-11 10:42:36 +01:00
FreezyLemon
2568ac1bf7
Fixed small merging mistake
2017-12-11 10:42:05 +01:00
Unknown
47bd97363e
Use ShortName for mode.
...
- Also set the ruleset when fetching scores in BeatmapSetOverlay
2017-12-11 15:05:12 +05:30
smoogipoo
b28306d3c0
Fix incorrect SelectionPoint
2017-12-11 18:08:16 +09:00
smoogipoo
4573cc3322
Refactor into a new DragBox class, representing a single drag
2017-12-11 17:45:03 +09:00
naoey
ccbbd09d84
Merge remote-tracking branch 'upstream/master' into leaderboard-scopes
2017-12-11 13:59:22 +05:30
FreezyLemon
f8bc52bbe6
Merged https://github.com/ppy/osu master branch
2017-12-11 09:27:54 +01:00
smoogipoo
7189446943
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-11 16:34:27 +09:00
Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata
2017-12-11 16:04:08 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
Dean Herbert
04715f9a51
Merge branch 'master' into HandleInput
2017-12-11 15:24:29 +09:00
smoogipoo
ed81ed7c54
Add back HandleInput disable overrides
2017-12-11 15:19:00 +09:00
Dean Herbert
5a6ac73fff
Fix broken tools making broken changes
2017-12-11 15:05:19 +09:00
Dean Herbert
77592ed15f
Fix comment formatting
2017-12-11 14:52:15 +09:00
Dean Herbert
de1f51269d
Merge branch 'master' into HandleInput
2017-12-11 13:53:33 +09:00
Dean Herbert
c880386fde
Merge branch 'master' into fix-crash-hidden-sets#2
2017-12-11 13:16:30 +09:00
Dean Herbert
7d8fb12332
DrawableScore -> DrawableProfileScore
...
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00
Dean Herbert
0c2158ccbd
Improve display of beatmap thumbnails
2017-12-11 12:47:31 +09:00
Dean Herbert
98ce856de1
Use more sensible names for classes and methods
...
Adds xmldoc in places too.
2017-12-11 12:33:34 +09:00
Dean Herbert
507d0e3252
Use more sensible names for classes
2017-12-11 12:26:48 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section
2017-12-11 12:12:23 +09:00
Aergwyn
e629cebe31
fix MusicController ignoring Looping property of a Track
...
my fix to prevent the MusicController from constantly trying to restart a track before accidentally removed this
2017-12-10 13:22:46 +01:00
FreezyLemon
8cbd6f32cb
Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field.
2017-12-10 11:31:37 +01:00
FreezyLemon
1691a74b14
Merge branch 'undelete-button-add' of https://github.com/freezylemon/osu into undelete-button-add
2017-12-10 11:26:31 +01:00
Aergwyn
e4628427cb
moved query into schedule
2017-12-10 08:15:29 +01:00
Dean Herbert
1417dfd67a
Merge branch 'master' into fix-crash-hidden-sets#2
2017-12-10 13:28:46 +09:00
Dean Herbert
6b63452a23
Merge branch 'master' into add-testing-tag
2017-12-10 13:09:09 +09:00
Dean Herbert
668299ef84
Merge branch 'master' into fix-userprofile-unranked
2017-12-10 13:02:32 +09:00
Dean Herbert
d02e1ae896
Update RulesetInfo and add migration
2017-12-10 12:15:55 +09:00
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03:00
Aergwyn
cdf9ea0d01
removed unnecessary variable
...
and fixed the test because of new DI letting it fail
2017-12-09 13:39:11 +01:00
Aergwyn
821154d3bb
reverted Beatmaps-setter back to its former glory
2017-12-09 08:42:59 +01:00
Dean Herbert
16b8c9bd11
Merge branch 'master' into fix-crash-hidden-sets#2
2017-12-09 11:51:47 +09:00
ColdVolcano
1f762dc6d8
Fix PreviewBar receiving a NaN Width value
2017-12-08 15:46:09 -06:00
Aergwyn
114604a642
removed unused DI
2017-12-08 14:45:40 +01:00
Aergwyn
c97646bea6
added confirmation dialog for Delete ALL beatmaps
2017-12-08 14:27:07 +01:00
Dean Herbert
c1989dbafe
Merge branch 'master' into direct-relevance-sorting
2017-12-08 22:15:57 +09:00
Dean Herbert
4160c10921
Merge branch 'master' into direct-relevance-sorting
2017-12-08 21:18:18 +09:00
Dean Herbert
40652d2e74
Merge branch 'master' into fix-importing-some-beatmaps
2017-12-08 21:18:01 +09:00
Aergwyn
dde7678095
select beatmap on import/download
2017-12-08 13:09:30 +01:00
FreezyLemon
856b56d79c
Fixed small typo.
2017-12-08 12:54:36 +01:00
FreezyLemon
e1c04a1f44
Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager.
2017-12-08 12:50:04 +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
FreezyLemon
b1270a84f8
Added handling for rank == 0 (unranked), removed " #0 " from country name if that happens, also display "no rank" when hovering over history instead of " #0 "
2017-12-08 11:31:32 +01:00
FreezyLemon
4a723f7382
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
Dean Herbert
51dc66df12
Add support for relevance based search results in osu!direct
2017-12-08 18:48:36 +09:00
FreezyLemon
d93a1fdaae
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
2017-12-08 10:30:42 +01:00
FreezyLemon
4b3cf0773d
Various CI adjustments
2017-12-08 09:52:58 +01:00
smoogipoo
5341e79102
Remove SelectionDragger for now
2017-12-08 17:51:15 +09:00
FreezyLemon
61a6a2919e
Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access
2017-12-08 09:41:13 +01:00
smoogipoo
faa921ba05
Fix up post-merge issues
2017-12-08 17:41:10 +09:00
FreezyLemon
9e3d439f0a
Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix
2017-12-08 08:30:02 +01:00
Dean Herbert
31884a951a
Remove "redundant" parenthesis
2017-12-08 15:53:59 +09:00
smoogipoo
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
Dean Herbert
2e1dfa16a2
Fix checks disallowing import of older beatmaps with no embedded online IDs
2017-12-08 14:59:32 +09:00
Ninjaprawn
a491710fe4
Override IgnoreTooltip in DisplayableModIcon
2017-12-08 14:10:23 +11:00
Ninjaprawn
9b3e666a07
Added IgnoreTooltip to all classes required
2017-12-08 14:10:23 +11:00
Ninjaprawn
f5bea077a0
Subclass ModIcon to remove the tooltip text
2017-12-08 11:26:34 +11:00
FreezyLemon
d2f3d5a807
Added basic SampleInfo.FromSoundPoint and GetChannel methods
2017-12-07 23:09:51 +01:00
Aergwyn
105d01d85b
fix crash when restoring from any non-SongSelect-screen
...
removed unwanted refresh
2017-12-07 22:02:53 +01:00
FreezyLemon
43c270ea49
Rolled back the bad earlier implementation
2017-12-07 21:18:51 +01:00
FreezyLemon
5546b8c316
Trimmed whitespace (CI)
2017-12-07 19:55:29 +01:00
FreezyLemon
68255095a6
Renamed the IHasHoverSounds interface to ICanDisableHoverSounds and made it so that if the interface is not implemented, it is just ignored (samples will always be played). If it is implemented, the ShouldPlayHoverSound bool is decisive of whether sounds are played or not
2017-12-07 19:52:40 +01:00
FreezyLemon
c5a7f5b163
Renamed the static variables and made them readonly, aswell as other small adjustments (CI)
2017-12-07 19:39:39 +01:00
FreezyLemon
34a37935e3
Removed unused property and unnecessary return statement (CI)
2017-12-07 19:38:59 +01:00
FreezyLemon
908553ffaf
Added parameter for LoadMultiplayerLobby (CI warning for unused int)
2017-12-07 19:38:03 +01:00
FreezyLemon
e05618a415
Removed unnecessary "using" directives
2017-12-07 19:36:56 +01:00
FreezyLemon
6b0b518fd2
*ahem* REVERTED the changes to GetUserRequest because they're not needed (yet)
2017-12-07 16:58:16 +01:00
FreezyLemon
ce9b003e9a
Reverted GetUserRequest because spectating is not implemented yet, and thus the additions are not needed (yet)
2017-12-07 16:52:43 +01:00
FreezyLemon
772bba27be
Small style changes
2017-12-07 16:41:46 +01:00
FreezyLemon
2ceb073b5d
Renamed OnClick to OnLinkClicked to (what should be) obvious reasons
2017-12-07 16:30:15 +01:00
FreezyLemon
d90eb2cdce
Moved "Does this channel exist" check to ChatLine so that if a #name does not exist as a channel, it does not get added as a link (and does not contain a URL or anything else to prevent jankiness)
2017-12-07 16:26:28 +01:00
FreezyLemon
18eabd35f6
Set an empty list as default for AvailableChannels (mostly so that tests don't break, but also so that if no connection exists, the links don't break)
2017-12-07 16:25:30 +01:00
FreezyLemon
2129d6cede
Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.
...
Also fixed the tooltip text up
2017-12-07 16:23:43 +01:00
Aergwyn
95955d68ef
rephrased description of local context checking
2017-12-07 14:14:50 +01:00
FreezyLemon
ca40db2b97
Fixed a bug where the hover wouldn't work correctly due to OsuLinkSpriteText assigning Action to a private property.
2017-12-07 13:57:29 +01:00
Aergwyn
1dcbfab18e
removed redundant comment
2017-12-07 13:56:37 +01:00
FreezyLemon
5ded6e877c
Added some tooltip text handling.
...
Also fixed a bug caused by SameLinkSprites where "this" is actually supposed to be included by just adding a manual function call.
2017-12-07 13:49:44 +01:00
Aergwyn
76c09ae59e
added comments for local context checking
2017-12-07 13:44:47 +01:00
FreezyLemon
8ba66015f4
Implemented the new IHasHoverSounds interface in a private "ChatHoverContainer" class which is now used for ChatLink instances.
...
Also moved the overhead for finding all sprites in the same line that reference the same URL to the LoadComplete (used to be every hover, now only once).
2017-12-07 13:17:40 +01:00
FreezyLemon
a8599a1b75
Implemented new interface which allows parent containers to decide on whether a "OnHover" sound should be played.
2017-12-07 13:12:36 +01:00
Dan Balasescu
9e37a122e1
Merge branch 'master' into fix-sensitivityslider
2017-12-07 21:01:53 +09:00
smoogipoo
d52b84df46
Move KeyboardStep assignment to ctor
2017-12-07 20:53:28 +09:00
smoogipoo
46cd6fdb45
Merge remote-tracking branch 'origin/master' into fix-sensitivityslider
2017-12-07 20:49:48 +09:00
Dean Herbert
24b3b10942
Move drawable assignment to load, remove depth overrides
2017-12-07 20:44:55 +09:00
Dean Herbert
8c89354b36
Remove extra whitespace
2017-12-07 20:44:38 +09:00
Dean Herbert
d36982b1d9
Merge branch 'master' into header-button-should-derive
2017-12-07 20:04:41 +09:00
Dean Herbert
f2eef6621a
Merge branch 'master' into fix-missing-metadata
2017-12-07 19:23:51 +09:00
FreezyLemon
f4f1291919
Removed "wiki:" prefix from wiki links (links are visible on tooltips so this is unnecessary now)
2017-12-07 11:23:31 +01:00
FreezyLemon
8a88040ef5
Added tooltip to links
2017-12-07 11:12:21 +01:00
FreezyLemon
bd11124e6d
Removed unnecessary copy (pass-by-reference anyways)
2017-12-07 11:12:12 +01:00
FreezyLemon
1b971c01e6
Fixed a bug where links would be out of order in their List which would cause the game to crash
2017-12-07 10:31:44 +01:00
FreezyLemon
ec8b5c2465
Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions
2017-12-07 10:31:02 +01:00
FreezyLemon
541c25e995
Renamed ChatLinkSpriteText to ChatLink for convenience
2017-12-07 10:28:12 +01:00
FreezyLemon
7bf25bdd4d
Changed it so the ":" character does not appear after usernames when the displayed message is an action (e.g. /np). Just makes more sense imo
2017-12-07 10:23:57 +01:00
Dean Herbert
c35c8263b9
Merge remote-tracking branch 'upstream/master' into input-revamp
2017-12-07 18:07:26 +09:00
Dean Herbert
2a1a9b9f1f
Fix post-merge issue
2017-12-07 17:26:39 +09:00
smoogipoo
bdf283a4e1
A bit more cleanup
2017-12-07 15:55:38 +09:00
smoogipoo
09f54b06ac
Just don't serialize Author altogether for now
2017-12-07 15:55:22 +09:00
smoogipoo
0ba8988580
Don't serialize Author + add SerializableAttributes
2017-12-07 15:32:39 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
smoogipoo
e573db04d4
Don't serialize HitObject.Kiai
2017-12-07 14:42:36 +09:00
smoogipoo
f5f7658e90
Don't serialize TotalBreakTime
2017-12-07 14:40:28 +09:00
smoogipoo
245b5f759f
Underscore + lowercase all keys
2017-12-07 14:37:12 +09:00
Dean Herbert
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
smoogipoo
dfc10d42e8
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-07 12:49:27 +09:00
smoogipoo
d026587a91
Add flag to explicitly serialize the type version
2017-12-07 12:49:16 +09:00
smoogipoo
9e51480aa3
Cleanup TypedListConverter a bit
2017-12-07 12:27:30 +09:00
smoogipoo
f1dbcc4f1a
Remove misleading comments
2017-12-07 12:23:53 +09:00
smoogipoo
feef4b1890
Add license header
2017-12-07 12:18:00 +09:00
smoogipoo
fcfdbc8e07
Don't show the migrate button on deployed builds for now
2017-12-07 12:02:48 +09:00
smoogipoo
851c20aff0
Add a few comments
2017-12-07 11:17:32 +09:00
smoogipoo
ea2c67ca5f
Fix incorrect serialization condition
2017-12-07 11:10:46 +09:00
smoogipoo
9597f9d46b
Resharper cleanup
2017-12-07 11:10:20 +09:00
smoogipoo
0e3b001b13
Make maps with storyboards decode correctly with OsuJsonDecoder
2017-12-07 10:37:51 +09:00
Dan Balasescu
9c4ca46786
Merge branch 'master' into shader-precompile
2017-12-07 04:15:24 +09:00
smoogipoo
a8db3a9484
Add progress notification to migration
2017-12-07 04:09:03 +09:00
smoogipoo
41b607c165
Dont serialize hitobject sample properties copied from the control point
2017-12-07 03:40:43 +09:00
smoogipoo
9787788081
Revert unintended change
2017-12-07 03:39:43 +09:00
smoogipoo
4232a54b32
Make TypedListConverter not reconstruct serializers
2017-12-07 03:04:56 +09:00
smoogipoo
b6b26cfe25
Add basic method to migrate beatmaps to the new JSON format
2017-12-07 03:04:36 +09:00
FreezyLemon
94eb853d3d
Added centralised handling for some chat links
2017-12-06 16:41:57 +01:00
Dan Balasescu
8e3cce798d
Merge branch 'master' into fix-async-is-loaded
2017-12-06 23:01:38 +09:00
Dean Herbert
34596b3368
Rename and comment for clarification
2017-12-06 21:47:48 +09:00
FreezyLemon
b04ddba2a0
Added basic "on click" actions to the in-chat links
2017-12-06 10:27:30 +01:00
smoogipoo
ed5f7e5353
Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder
2017-12-06 16:28:34 +09:00
smoogipoo
f9e34dfa3d
Assume that control points are already sequentially-ordered
...
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
Dean Herbert
04ae64e9fd
Add missing IsCompleted check to ensureValid
2017-12-06 16:20:49 +09:00
smoogipoo
887b81148d
Don't ignore RulesetId for now
2017-12-06 14:14:07 +09:00
smoogipoo
44edb8724f
Add JsonIgnores to CommandTimelineGroup
2017-12-06 13:48:44 +09:00
Dean Herbert
15ed3b4aac
Fix IsValueCreated method not cecking whether the async task was completed
...
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
smoogipoo
e199ee5225
Add a few xmldocs
2017-12-06 00:42:17 +09:00
smoogipoo
d2dc7c8937
Add OsuJsonDecoder
2017-12-06 00:38:12 +09:00
smoogipoo
b584178e85
Make Beatmap ISerializable and add more JsonIgnores
2017-12-06 00:37:37 +09:00
Dean Herbert
fb6408257a
Add shader precompile step
...
Resolves https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
Dean Herbert
c1b607fed9
Wait until track has restarted before continuing operation
...
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
FreezyLemon
63a6a8b669
Fixed messages sent by yourself not being formatted
2017-12-04 19:31:48 +01:00
FreezyLemon
bb138ccaf7
Added licence header and removed unnecessary whitespace
2017-12-04 13:55:57 +01:00
FreezyLemon
9b866d2248
Made it so the link ID is always added before loading the SpriteTexts (fixed weird bug where some sprites would be white instead of blue). Also improved XML doc on TextColour
2017-12-04 13:46:07 +01:00
Dean Herbert
caee6c1cf1
Use Restart instead of Start
2017-12-04 21:40:26 +09:00
FreezyLemon
fd13bacf4a
Made default link ID -1 (if no link is present) because linkId is currently being set to link.index which can be 0.
2017-12-04 13:34:16 +01:00
FreezyLemon
cf96323980
Added new OsuLinkSpriteText.TextColour property that sets the internal content (OsuHoverContainer)'s colour instead of the whole container, so that text colour is always changed through that (e.g. link colouring, link hover fade).
...
Implemented it to be used when adding text to an OsuLinkTextFlowContainer.
2017-12-04 13:33:42 +01:00
FreezyLemon
319f43e209
Added "getIdFromUrl" call back to content.action because performance impact is small and no unnecessary id calculations are done
2017-12-04 13:29:56 +01:00
Dean Herbert
a83add8540
Tidy up events
2017-12-04 20:30:56 +09: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
22656233d3
Merge branch 'master' into fix-playlist-audio-issue
2017-12-04 19:24:03 +09:00
Dean Herbert
d75db5046b
Merge branch 'master' into editor-composer
2017-12-04 12:41:40 +09:00
smoogipoo
5f9de399e4
Add keydown override
2017-12-04 11:30:25 +09:00
FreezyLemon
bf97f8b1b1
Added osu.ppy.sh/ss (screenshot) URL handling and calculate ID at assignment so it's not on click anymore
2017-12-03 23:55:34 +01:00
FreezyLemon
a839d0e91d
LoadComponent before assigning URL to ensure dependency loading
2017-12-03 23:55:00 +01:00
FreezyLemon
3f336b8e61
Made the style a bit better, fixed a bug or two
2017-12-03 21:02:05 +01:00
FreezyLemon
2d270a1cfe
Added ability to open other channels from chat links.
2017-12-03 20:45:30 +01:00
Aergwyn
14096c90cc
removed looping if only one song is in the list (temporarily)
...
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602
remove redundant expression
2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716
use ?: expression
2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c
fix possible NullRef
2017-12-03 14:15:08 +01:00
Aergwyn
a1dbd7916b
fixes MusicController constantly trying to start a track
...
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
FreezyLemon
c574cc4308
Removed unnecessary "using" statements
2017-12-03 11:16:34 +01:00
FreezyLemon
735dbddd17
Changed URL detection to be more reliable and generally work better
2017-12-03 06:52:57 +01:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +09:00
Aergwyn
ad8cd7eb5d
fix possible NullReference?
...
AppVeyor pls?
2017-12-02 17:04:42 +01:00
Aergwyn
cc76c58f5f
fall back to .osu file for storyboard if no .osb file is present
...
+ CI fixes
2017-12-02 16:05:39 +01:00
smoogipoo
2852337b04
Remove unused using
2017-12-02 20:35:47 +09:00
smoogipoo
cd20d6df16
Apply suggested changes
2017-12-02 20:31:15 +09:00
smoogipoo
c14d68e685
Use OsuColour for radio buttons
2017-12-02 20:30:18 +09:00
smoogipoo
a80059032c
Remove PlayfieldOverlay
2017-12-02 20:24:10 +09:00
smoogipoo
5a7c4772bd
Remove PlayfieldUnderlay for now
2017-12-02 19:53:20 +09:00
FreezyLemon
efe6245e53
Fixed a bug where Drawable.Width could potentially be set to NaN (0/0) by checking if last variable > 0.
2017-12-02 10:42:38 +01:00
FreezyLemon
6d9dcc6691
Added all files to the .csproj and also introduced basic action filtering when you set the URL on an OsuLinkSpriteText object
2017-12-02 09:48:55 +01:00
FreezyLemon
0aced85908
Changed the LinkID to the link's own Index instead of the previous one (just makes more sense imo)
2017-12-02 09:47:59 +01:00
FreezyLemon
d22a9df140
Added new request for getting the beatmapset from only a difficulty map ID
2017-12-02 09:47:20 +01:00
Aergwyn
e07b85311b
removed unnecessary using
2017-12-01 22:15:10 +01:00
Aergwyn
c466296b14
reverted split at Decoder, moved logic down
...
I'm done experimenting, sorry
- `Decoder` only returns a "Beatmap"`Decoder` now
- "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
- moved parse methods down in the hierarchy where I forgot to do that
- renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`
2017-12-01 22:05:01 +01:00
FreezyLemon
ade7311c15
Updated implementation to be based around a "LinkId" (atm the position of the link, anything unique to a link inside its message will be fine), which does not allow matching (OnHover related) between different links
2017-12-01 21:31:12 +01:00
FreezyLemon
7699a3bb38
Merge branch 'master' of https://github.com/ppy/osu into url-parsing-support
2017-12-01 21:07:31 +01:00
FreezyLemon
7f1f886406
implemented method formatting into chat. Also added all necessary files to the .csproj
2017-12-01 21:04:24 +01:00
FreezyLemon
78ff5d81d3
Fixed casting
2017-12-01 21:03:41 +01:00
FreezyLemon
152eb83c42
Added new class for chat lines, that colour the messages after formatting. URLs will become blue, and on hover (also defined here) be turned yellow-ish
2017-12-01 20:33:27 +01:00
FreezyLemon
86302716a6
Also moved LinkText to its own file so the chat could reuse it (ProfileHeader's private class ProfileLink also still inherits from this, though)
2017-12-01 20:32:08 +01:00
FreezyLemon
1f1c7dd70f
Moved LinkFlowContainer out of ProfileHeader to make it available for other uses too (e.g. chat) and renamed it to LinkTextFlowContainer bc it can contain both links and text, not only one
2017-12-01 20:26:51 +01:00
FreezyLemon
f5f287bed5
Rolled back the idea that there should be a separate class for formatted messages
2017-12-01 20:25:02 +01:00
Aergwyn
a49f3479a2
Split retrieving of beatmap and storyboard decoder
...
Storyboard works again. Not satisfied with the solution though.
2017-12-01 19:11:52 +01:00
gtensha
de94082b1e
Fix filename casing to compile on Linux
2017-12-01 18:10:39 +01:00
Aergwyn
db50ad794e
CI adjustments
...
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26
restructured OsuLegacyDecoder into LegacyDecoder
...
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
smoogipoo
cf859a6cf2
Make the dragger attach to objects it surrounds
...
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
Dean Herbert
70b29b8b62
Merge branch 'master' into fix-set-hidden-crash
2017-12-01 23:35:48 +09:00
Dean Herbert
7532795935
Lock during validity checks
2017-12-01 22:43:49 +09:00
Dean Herbert
87b6181a19
Merge remote-tracking branch 'upstream/master' into fix-track-disposal
2017-12-01 22:36:20 +09:00
FreezyLemon
01bea3bada
Re-implemented message formatting (mostly taken from osu-stable code)
2017-12-01 10:56:48 +01:00
smoogipoo
a30270658d
Merge remote-tracking branch 'origin/master' into netstandard
2017-12-01 18:50:28 +09:00
smoogipoo
5be00cb0ec
Add todo
2017-12-01 18:40:55 +09:00
smoogipoo
0b95e36675
Fix RelativeChildSize error temporarily
2017-12-01 18:00:20 +09:00
smoogipoo
f6591851c3
Implement a selection dragger box
2017-12-01 13:15:58 +09:00
Aergwyn
7080711cb2
remove unnecessary using
2017-11-30 20:13:10 +01:00
Aergwyn
be018a63c6
remove unnecessary lines
2017-11-30 19:17:11 +01:00
Aergwyn
c16925059c
split parsing a beatmap and parsing a storyboard
2017-11-30 19:16:13 +01:00
Aergwyn
016057ab01
readd storyboard to beatmap + minor cleanup
2017-11-30 16:49:53 +01:00
smoogipoo
52ba68e25d
Add/fix up license headers
2017-11-30 22:21:02 +09:00
smoogipoo
c0c051aa32
Remove unused parameter for now
2017-11-30 21:58:41 +09:00
smoogipoo
e8cbde3ae1
Add overlay/underlay
2017-11-30 21:56:19 +09:00
smoogipoo
89772f4efd
A few resharper fixes
2017-11-30 19:54:58 +09:00
smoogipoo
7e34b0f08d
Remove SelectionTool, make Select the default tool
2017-11-30 19:53:52 +09:00
smoogipoo
e9cbef88f1
Improve selection/deselection behaviour of RadioButtonCollections
2017-11-30 19:50:07 +09:00
smoogipoo
677f3653eb
Hide osu! playfield cursor
2017-11-30 19:19:34 +09:00
FreezyLemon
b09ba19d3f
Used the already-existing private method to undelete a mapset
2017-11-30 11:02:53 +01:00
FreezyLemon
bf386598b6
Added a new "undelete" button that restores every beatmap with "DeletePending" set to true.
2017-11-30 10:58:32 +01:00
smoogipoo
efa39f38ca
CI fixes
2017-11-30 18:49:08 +09:00
smoogipoo
e5353bb53e
Add border to playfield, add shadow to toolbox buttons
2017-11-30 17:38:55 +09:00
smoogipoo
456bbe25f3
Implement toolbox into HitObjectComposer
2017-11-30 16:58:14 +09:00
smoogipoo
73e41f9dde
Add constructors to RadioButton
2017-11-30 16:57:30 +09:00
Nicolas Brassard
36cfa552f4
Fix SensitivitySlider keyboard control
2017-11-29 23:03:26 -08:00
smoogipoo
ead7456978
Add compose radio buttons + testcase
2017-11-30 15:43:19 +09:00
smoogipoo
abd6125691
Make sure that composerContainer is cleared for testing purposes
2017-11-30 14:00:17 +09:00
smoogipoo
a7a9569aee
Don't exit when we don't have composer for now
2017-11-30 13:53:57 +09:00
smoogipoo
fd3049fd65
Merge remote-tracking branch 'origin/master' into editor-composer
2017-11-30 13:47:47 +09:00
jorolf
22403cac89
Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section
2017-11-29 23:09:04 +01:00
jorolf
14fdf98abc
rename GetBeatmapSetsResponse
2017-11-29 23:08:46 +01:00
Aergwyn
96f5bd3323
remove Storyboard from Beatmap, add it to WorkingBeatmap
2017-11-29 21:54:04 +01:00
Aergwyn
cd653c1cbc
split storyboard loading into GetStoryboard()
2017-11-29 21:28:02 +01:00
Aergwyn
acb2cafa58
fix wedge not appearing
2017-11-29 21:09:08 +01:00
Dean Herbert
d402222f17
Fix DisposeTrack and improve AsyncLazy to support disposal
2017-11-30 05:05:07 +09:00
smoogipoo
36be171c29
Fix up/clean up csprojs for C#7 support
2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935
Add LangVer.props and osu.Game.props for common csproj properties
2017-11-30 00:45:37 +09:00
smoogipoo
0ec10ba32d
CI fixes
2017-11-30 00:11:00 +09: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
Dean Herbert
801d81ecfc
Add a notice when not logged in
2017-11-29 19:00:08 +09:00
smoogipoo
ee35422efc
Handle rulesets that don't support composition a bit better
2017-11-29 18:38:12 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator
2017-11-29 18:37:07 +09:00
Dean Herbert
404e7d62ff
Merge branch 'master' into mania-important-frames
2017-11-29 18:12:57 +09:00
smoogipoo
309eb4edd7
Integrate HitObjectComposer into Compose
...
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
Dean Herbert
bad970d1d1
Add wait steps to ensure the player is completely loaded before continuing
2017-11-29 17:25:55 +09:00
smoogipoo
f586cbac32
Restructure Compose to use grids and eventually support HitObjectContainer
2017-11-29 16:47:52 +09:00
smoogipoo
8c30fd490c
Add HitObjectComposer class
2017-11-29 16:22:11 +09:00
FreezyLemon
bc3f11fdb8
Added PlaysSamples property to prevent certain DrawableHitObjects from playing their samples on hit. Also added this to TaikoObjects so their hitsounds won't be played (will be done by the TaikoRulesetContainer)
2017-11-29 06:24:13 +01:00
smoogipoo
1136db1556
Fix mania replays not defining important frames
...
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
Dean Herbert
85201ea30c
Merge branch 'master' into performance-calculator
2017-11-29 13:23:40 +09:00
Dean Herbert
d1afbf8055
Load Player-based TestCases asynchronously
2017-11-29 13:10:33 +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
Santeri
898c49c19d
remove unnecessary assignments
2017-11-28 16:14:32 +02:00
Dean Herbert
66fa108696
Vertically centre the panels in osu!direct
2017-11-28 22:25:20 +09:00
smoogipoo
a9cc156d7a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-28 21:38:26 +09:00
Dean Herbert
23b4d2163c
Fix spelling and grammar
2017-11-28 21:30:03 +09:00
Dean Herbert
bd88df2722
Add note about sequential execution of ConvertHitObject
2017-11-28 18:33:41 +09: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
473eba9776
Remove precision limitation on chat height to allow pixel-perfect dragging
2017-11-28 12:09:44 +09:00
Santeri
e9277d8cb1
last directive error...
2017-11-28 00:27:58 +02:00
Santeri
49949bf698
fix minor param/directive errors
2017-11-28 00:20:44 +02:00
Santeri
86de6f8252
derives from trianglebutton rather than osubutton
2017-11-28 00:09:58 +02:00
Santeri
0a8fa2e6de
Merge branch 'master' into header-button-should-derive
2017-11-27 23:16:42 +02:00
jorolf
7f068c0c68
correct string mistake
2017-11-27 21:13:01 +01:00
Aergwyn
c058065a3a
remove unnecessary using
2017-11-27 20:24:01 +01:00
Aergwyn
d87235a289
prevent inserting duplicate metadata
2017-11-27 20:08:16 +01:00
Santeri Nogelainen
96f782e75a
fix object reference issue maybe?
2017-11-27 13:51:56 +02:00
Santeri Nogelainen
bf8d15108e
headerbutton now derives from osubutton
2017-11-27 13:39:01 +02:00
Dean Herbert
3a01bfc1ef
Remove unnecessary new prefix
2017-11-27 18:53:19 +09:00
Dean Herbert
bf5ea027ef
Add xmldoc to TriangleButton
2017-11-27 18:26:20 +09:00
Dean Herbert
96d42b3e5b
Fix redundant string interpolation
2017-11-27 18:20:13 +09:00
Dean Herbert
51372d7cda
Remove HandleInput override from TriangleButton
2017-11-27 18:19:06 +09:00
Dean Herbert
760f7d02d9
Remove AlwaysPresent (not actually required)
2017-11-27 18:12:52 +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
Dean Herbert
2dcc3b9e74
Merge branch 'master' into fix-missing-metadata
2017-11-27 12:28:33 +09:00
Dean Herbert
3e0f282d52
Merge branch 'master' into global-track-volume-reduction
2017-11-27 12:27:01 +09:00
Dan Balasescu
00c552dea1
Merge branch 'master' into panel-hover-effect
2017-11-27 11:14:04 +09:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate
2017-11-27 10:42:32 +09:00
Dan Balasescu
77bfc6037d
Merge branch 'master' into fix-stuck-in-play
2017-11-27 10:06:34 +09:00
Dean Herbert
c555867aaf
Merge remote-tracking branch 'upstream/master' into panel-hover-effect
2017-11-27 10:01:47 +09:00
Dean Herbert
f189de437a
Simplify blending assignment
2017-11-27 10:01:44 +09:00
Dan Balasescu
98de969b47
Merge branch 'master' into fix-reload-all-panels
2017-11-27 09:56:44 +09:00
Dan Balasescu
bb9e399808
Merge branch 'master' into fix-reload-all-panels
2017-11-27 09:50:17 +09:00
Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle
2017-11-27 09:41:30 +09:00
Dan Balasescu
3f65c19bce
Merge branch 'master' into fix-sprite-icon
2017-11-27 09:32:37 +09:00
jorolf
70b6071898
add license header
2017-11-26 22:13:52 +01:00
jorolf
4c68090e59
separate GetUserBeatmapsRequest and GetUserMostPlayedBeatmapsRequest
2017-11-26 22:06:03 +01:00
jorolf
02fa1f9dd6
move shared stuff between MostPlayedBeatmapDrawable and DrawableScore to DrawableBeatmapRow
2017-11-26 21:52:35 +01:00
Unknown
ae55d392de
only use == for comparion on primitive types
2017-11-26 19:37:46 +01:00
Aergwyn
ba0b16dc0b
setting BeatmapSets as list to prevent endless LINQ query chain
2017-11-26 19:35:58 +01:00
Unknown
ae201f0ef5
R#
2017-11-26 15:03:49 +05:30
Dean Herbert
671b3d01ff
Fix OsuClickableContainer's local content geting overwritten
2017-11-26 17:21:23 +09:00
Dean Herbert
9c90d9ca45
Add panel hover effects
2017-11-26 17:21:23 +09:00
Dean Herbert
5aa6615107
Add confirm-selection sound in song select
2017-11-26 17:21:22 +09:00
Dean Herbert
c5aacb75c6
Add hover sounds to mod buttons
2017-11-26 17:21:22 +09:00
Dean Herbert
880418fd0d
Split out click and hover sound layers
2017-11-26 17:21:22 +09:00
Dean Herbert
0c6a125777
Remove custom colour handling
2017-11-26 17:21:21 +09:00
Dean Herbert
ac7e373f40
Add hover/click sound effects to more stuff everywhere
2017-11-26 17:21:21 +09:00
Dean Herbert
8f57bf2498
Add choices of hover sample sets
2017-11-26 17:17:50 +09:00
Dean Herbert
8d7c891882
Add hover and click sound effects to settings sidebar buttons
2017-11-26 17:17:49 +09:00
Dean Herbert
af499df6dd
Make a base OsuButton class to handle default samples
2017-11-26 17:17:48 +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
07d6a70028
New sound effects with better names
2017-11-26 17:17:46 +09:00
Dean Herbert
4067b6129b
Add visual highlighting on song select panel hover
...
Prerequisite for adding hover sound effects. Didn't feel right without this change.
2017-11-26 17:14:13 +09:00
Dean Herbert
df16a019ed
Add a global reduction of audio track volume
...
Music is overpowering compared to our current game samples. We will need to do further adjustments on this, but for now let's reduce the track volume globally.
2017-11-26 17:08:58 +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
7be55df790
fix being stuck in gameplay if exit is pressed too fast
...
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00
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
Unknown
5da1466e28
requested changes
...
use IEquatable<T> instead of overriding Equals and `==` operator for primitive types.
2017-11-25 15:05:59 +01:00
Unknown
f6a33b3ea2
fix osu!direct download reloading all panels
...
This fixes the recreation of all panels when a download completes.
Also fixes NullReference when you download without ever opening the details of one Set.
2017-11-25 14:45:57 +01:00
Huo Yaoyuan
d955229ee5
Handle user rating metrics when no maps by using more linq.
2017-11-25 21:29:23 +08:00
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section
2017-11-24 22:51:11 +01:00
jorolf
21d5d10738
replace BeatmapResponse with BeatmapInfo
2017-11-24 22:48:56 +01: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
d6ac724f10
Merge branch 'master' into fix-sprite-icon
2017-11-24 13:41:23 +09:00
smoogipoo
3d8432aecf
Merge branch 'master' into fix-player-testcases
2017-11-24 13:23:42 +09:00
Dean Herbert
7ff39d62a1
Fix SpriteIcon potentially not updating texture during a load race condition
...
Better fix for #1577 .
2017-11-24 12:48:02 +09:00
Aergwyn
e3a230320a
compare metdata and remove duplicate from beatmap to prevent redundant storage
2017-11-23 19:46:58 +01:00
Dean Herbert
95fbe6a4a2
Update framework
2017-11-23 23:43:27 +09:00
Dean Herbert
c7a5a7cd93
Merge remote-tracking branch 'upstream/master' into fix-player-testcases
2017-11-23 23:42:19 +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
Dean Herbert
9565a9c352
Fix TestCasePlayer not working as expected
2017-11-23 20:42:07 +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
5ea3292dc5
Merge remote-tracking branch 'upstream/master' into load-optimization
2017-11-23 20:21:44 +09:00
Dean Herbert
292b44d896
Merge branch 'master' into fix-nullref-on-dispose
2017-11-23 19:22:23 +09:00
Dean Herbert
4ab919263d
Merge remote-tracking branch 'upstream/master' into attribute-descriptions
2017-11-23 18:53:22 +09:00
Dean Herbert
4986ad73f7
Merge remote-tracking branch 'upstream/master' into load-optimization
2017-11-23 18:44:17 +09:00
Dean Herbert
38f5c55f80
Remove not-accessed field
2017-11-23 18:11:35 +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
Dean Herbert
30db2ce18a
Rename KudosuValue to count and remove pointless local storage
2017-11-23 17:37:02 +09:00
Dean Herbert
cf4fc05be3
Fix nullref on disposing BeatmapSetOverlay before load
...
Only affects VisualTests
2017-11-23 17:33:46 +09:00
Dean Herbert
6d9951d9af
Use FillFlow rather than manually specifying positions
2017-11-23 17:32:41 +09:00
Dean Herbert
2ff21bbc6c
Move descriptions to constructor
2017-11-23 17:29:20 +09:00
Dean Herbert
9d481eba96
Merge branch 'master' into kudosu-section
2017-11-23 17:19:42 +09:00
FreezyLemon
2cc2323791
Style changes (removing newline from before second constructor parameter)
2017-11-23 09:12:23 +01:00
FreezyLemon
d6f532171b
Implementation fix (since the default delay is now 500 and not 0 this is necessary to ensure the same functionality)
2017-11-23 09:11:52 +01:00
Dean Herbert
6e51664544
Merge branch 'master' into beatmap-overlay-download
2017-11-23 17:11:28 +09:00
Dean Herbert
85827f83eb
Perform a reload on objects when Refreshing them
...
Previously, it was possible for an object to be "refreshed" with a stale cached state from the current thread's context.
This ensures a check against the database is performed as well.
Resolves #1562 .
2017-11-23 17:04:39 +09: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
Dean Herbert
288c21dfec
Move TestCase descriptions to attributes
...
Depends on https://github.com/ppy/osu-framework/pull/1186 .
2017-11-23 16:09:32 +09:00
Aergwyn
0df5432f5e
removed line that set metadata per beatmap to null
2017-11-22 21:45:18 +01:00
FreezyLemon
18b0b77f0a
Added requested changes. Mainly changing lambdas to direct function references.
2017-11-22 21:41:50 +01:00
jorolf
22348a3d67
Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section
2017-11-22 21:14:11 +01: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
Aergwyn
e5dfe4ff2e
Make error more verbose when beatmap import fails ( #1537 )
...
Add name of beatmap set to error message if import fails
2017-11-22 19:35:25 +09:00
Dean Herbert
517a9ec40f
Merge branch 'master' into async-beatmap-panels
2017-11-22 19:05:42 +09:00
Dean Herbert
95275cd2ef
Merge branch 'master' into fix-playback-control
2017-11-22 18:49:25 +09:00
Dan Balasescu
c7a6c90249
Merge branch 'master' into working-beatmap-async-2
2017-11-22 18:32:47 +09:00
Dan Balasescu
4cbdd97ed3
Merge branch 'master' into fix-playback-control
2017-11-22 18:21:35 +09:00
Brayzure
782a739370
Fix Results Screen After Failing Last Note
...
Fixes a bug where if you failed on the last hitobject, the AllJudged event will have already been invoked.
2017-11-21 23:00:00 -05:00
Dean Herbert
36d45f633d
Reorder methods
2017-11-22 11:57:09 +09:00
Dean Herbert
e3c5a599b6
Tidy some regressions
2017-11-22 11:36:29 +09:00
Dean Herbert
27fb598352
Update colours to match design
2017-11-22 11:34:54 +09:00
Dean Herbert
0f8499c580
Rename to PlaybackControl and add a TestCase
2017-11-22 11:22:46 +09:00
Dean Herbert
ff5404e57f
Remove need for AlwaysPresent
...
Also self-contains the tab options inside the tab control.
2017-11-22 11:21:48 +09:00
Dean Herbert
855acc9401
Fix leading space before percent sign
2017-11-22 11:17:10 +09:00
Dean Herbert
c06d6d0bbb
Rename weird method
2017-11-22 10:59:31 +09:00
Dean Herbert
461c8e8be0
Clean up state change logic
2017-11-22 10:55:06 +09:00
Dean Herbert
63d366ea4b
Bindables should be readonly
2017-11-22 10:54:33 +09:00
FreezyLemon
1d41e7cc8a
Removed newline at end
2017-11-21 20:15:42 +01:00
FreezyLemon
bf0184c06d
One more small style fix
2017-11-21 19:34:01 +01:00
FreezyLemon
2203a84300
Small fixes and style corrections
2017-11-21 19:16:44 +01:00
FreezyLemon
fd7ac9b6fc
Switched to the new LoadWrapper class for asynchronous loading (LoadComponentAsync not used here since it's not possible to call that method on a component that has not finished loading, and we're in the constructor where it would be called)
2017-11-21 16:18:32 +01:00
FreezyLemon
870807c265
Switched over to the new LoadWrapper class for all delayed loading.
2017-11-21 16:17:33 +01:00
FreezyLemon
a033eb46d3
Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance.
2017-11-21 16:12:23 +01:00
Dean Herbert
33936b0939
Merge branch 'master' into async-beatmap-panels
2017-11-21 23:33:15 +09:00
Miterosan
b3b1f2018e
Fix osu crashing if a invalid gamerule is given in the game.ini
2017-11-21 15:13:00 +01:00
Dean Herbert
5e70b7a9f7
Add async load methods for WorkingBeatmap properties
2017-11-21 22:34:53 +09:00
Dean Herbert
2603219350
Load beatmap carousel panels asynchronously
2017-11-21 22:30:09 +09:00
smoogipoo
6686fe9ecd
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-21 19:55:28 +09:00
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
Dean Herbert
aff217cd03
Fix early access to beatmap in LogoVisualisation
...
Missed this one..
2017-11-21 19:47:12 +09:00
smoogipoo
0f8d4a455a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-21 19:18:06 +09:00
Dean Herbert
7b916806f9
Merge branch 'master' into fix-info-wedge
2017-11-21 19:12:19 +09:00
Dean Herbert
c2fcb2f9c7
Fix info wedge not displaying
2017-11-21 18:45:12 +09:00
EVAST9919
10f730a004
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
2017-11-21 12:39:14 +03:00
EVAST9919
41498ffad3
Apply suggestions
2017-11-21 12:22:19 +03:00
smoogipoo
217554f587
Remove redundant interface
2017-11-21 18:06:24 +09:00
smoogipoo
0d1b5ae44f
Adjust bottom bar sizing as suggested
2017-11-21 17:51:07 +09:00
smoogipoo
238756ec5d
Merge remote-tracking branch 'origin/master' into editor-playback-speed
2017-11-21 17:41:16 +09:00
Dan Balasescu
c39e76fdea
Merge branch 'master' into sudden-death
2017-11-21 17:37:40 +09:00
Dan Balasescu
142b74cc47
Merge branch 'master' into sudden-death
2017-11-21 17:32:31 +09:00
smoogipoo
c30d31e037
Remove extra alternateFailConditions function in Player
2017-11-21 17:30:19 +09:00
smoogipoo
fea56322f0
Fix SD not failing for the first note
2017-11-21 17:28:51 +09:00
Dean Herbert
10e835aea6
Merge branch 'master' into async-beatmap-properties
2017-11-21 17:18:19 +09:00
smoogipoo
18b9828c49
Merge UpdateFailed and CheckAlternateFailConditions
2017-11-21 17:11:07 +09:00
smoogipoo
1b27ce6198
Cleanup + renaming
2017-11-21 17:09:22 +09:00
smoogipoo
44168b1654
Fix incorrect license
2017-11-21 16:42:54 +09:00
Dean Herbert
8452446803
Merge branch 'master' into user-panels
2017-11-21 16:41:48 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
smoogipoo
a66edea6dc
Move sqlite batteries to osu.Desktop
...
Fixes e_sqlite.dll not being copied to output on Windows
2017-11-21 15:33:05 +09:00
Dean Herbert
553a7947d7
Remove AsyncLoadWrapper dependence in MusicController
2017-11-21 12:42:28 +09:00
Dean Herbert
66f72baa39
Avoid LogoVisualisation accessing the track before it's loaded
2017-11-21 12:42:28 +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
5db2d383ed
Remove temporary variable in beatmap background update
2017-11-21 12:42:28 +09:00
Dean Herbert
2610cadd3c
CI fixes
2017-11-21 12:11:29 +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
Brayzure
2b0295ed86
Proper Public Method Case
...
- onFailCheck to OnFailCheck
2017-11-20 20:49:31 -05:00
Brayzure
6d74fd254c
Remove Extraneous Using Statement
...
- System.Collections.Generic was leftover from a previous attempt
2017-11-20 20:25:14 -05:00
Dean Herbert
881b4aa547
Merge branch 'master' into fix-import-duplicates
2017-11-20 21:20:32 +09:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
Dan Balasescu
2c4a068940
Merge branch 'master' into fix-escape-no-repeat
2017-11-20 18:37:12 +09:00
Dan Balasescu
7906bc030d
Merge branch 'master' into fix-result-screen
2017-11-20 18:19:46 +09:00
Dan Balasescu
a2e45293d6
Merge branch 'master' into fix-result-screen
2017-11-20 18:18:08 +09:00
Dean Herbert
6df18ffb7a
FocusedTextBox should not handle repeated escapes
2017-11-20 18:14:58 +09:00
Brayzure
da30d76f9b
Implement Score Processor Mod Interface
...
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
EVAST9919
ecc2877be6
Fix possible null and adjust timeline width
2017-11-20 09:29:26 +03:00
EVAST9919
9fe7ebc0ce
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
2017-11-20 09:18:22 +03:00
Dean Herbert
8919e98d13
Fix CI issue
2017-11-20 11:32:20 +09:00
smoogipoo
756f6f2d16
Remove net461 targets
2017-11-20 10:10:28 +09:00
jorolf
66c51c7b44
cleanup
2017-11-19 14:33:50 +01:00
jorolf
4281d76bcf
historical section now shows the most played beatmaps
2017-11-19 14:19:05 +01:00
jorolf
48b44e8e4e
add a user most played beatmaps request/response
2017-11-19 14:18:14 +01:00
jorolf
1f379cab8f
move BeatmapMetadataContainer to a separate class
2017-11-19 14:17:14 +01:00
jorolf
fe7f9cccaa
BeatmapSetCover can display other types of covers now
2017-11-19 14:16:00 +01:00
smoogipoo
067c018422
Cleanups
2017-11-19 17:31:35 +09:00
Dean Herbert
492120e88c
Add migration for unique constraint on online id
2017-11-19 16:02:08 +09:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +09:00
Aergwyn
0b5614e4ee
fix result screen not showing name of mapper
2017-11-18 22:12:15 +01:00
jorolf
9aaefb5e97
same for PaginatedScoreContainer
2017-11-18 20:09:31 +01:00
jorolf
4264641303
fix missing text appearing when request returns nothing but beatmaps are already there
2017-11-18 18:27:30 +01:00
Dean Herbert
d704e9cf7e
Ensure we correctly handle importing beatmaps/sets when the onlineID already exists locally
2017-11-19 01:45:17 +09:00
Dean Herbert
7d2bbc50a3
Add unique constraint on OnlineBeatmapID
2017-11-19 01:45:17 +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
2ff88c86ea
CI fixes
2017-11-18 18:53:21 +03:00
EVAST9919
915ccf3c84
Fix some layout issues
2017-11-18 18:41:00 +03:00
EVAST9919
87f1368869
Add KudosuInfo container in the kudosu section
2017-11-18 18:19:35 +03:00
Dean Herbert
60778593c3
Make pressing space twice at main menu a bit smoother
2017-11-18 22:24:51 +09:00
Dean Herbert
b835f1b708
Merge branch 'master' into fix-main-menu-osu-logo
2017-11-18 21:53:04 +09:00
Brayzure
de4d8eb196
Implement Sudden Death and Perfect
...
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
EVAST9919
4ee3a89c12
Remove using
2017-11-18 08:35:00 +03:00
EVAST9919
34d8f94f99
Add track timer
2017-11-18 08:24:09 +03:00
Dean Herbert
c2d1de34fc
Fix logo not always returning to the correct state when rapidly changing menus
...
Fixes #1005 for real
2017-11-18 11:19:15 +09:00
EVAST9919
a741d6cea7
Fix incorrect score indexes in leaderboard
2017-11-18 04:46:02 +03:00
Dean Herbert
322dd1bd05
Rename variables to make more sense
2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590
Remove duplicated code
2017-11-18 10:34:17 +09:00
Dean Herbert
c2b6e958f7
Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo
2017-11-18 10:28:00 +09:00
EVAST9919
58e7263108
CI fixes
2017-11-18 03:09:09 +03:00
EVAST9919
0b8fed4e5a
Remove useless Dimention params
2017-11-18 01:51:23 +03:00
EVAST9919
7492ab6495
Use GridContainer to place the bottom bar objects
2017-11-18 01:48:50 +03:00
EVAST9919
0cad5a5ca3
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
2017-11-18 01:15:50 +03:00
