Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle
2017-11-27 09:41:30 +09:00
Unknown
ae201f0ef5
R#
2017-11-26 15:03:49 +05:30
Dean Herbert
5aa6615107
Add confirm-selection sound in song select
2017-11-26 17:21:22 +09:00
Dean Herbert
ae48b85827
Don't play logo select sample when actions are playing their own
2017-11-26 17:17:47 +09:00
Dean Herbert
69e388dd52
Adjust background blur rate
2017-11-26 17:08:14 +09:00
Unknown
4212315504
Use a single placeholder container for empty and retry.
2017-11-26 12:50:20 +05:30
Unknown
b261d32588
Put retry button in a BeatSyncedContainer and change error message.
2017-11-26 12:25:48 +05:30
Unknown
f4f732ca43
Remove unnecessary null check and tweak transform a bit.
2017-11-26 11:19:42 +05:30
Unknown
ae9ce2f122
Unbind ruleset event from leaderboard.
2017-11-25 21:23:36 +05:30
Unknown
0b3f75505e
Don't break VisualTests and add a real beatmap step.
2017-11-25 20:59:03 +05:30
Huo Yaoyuan
d955229ee5
Handle user rating metrics when no maps by using more linq.
2017-11-25 21:29:23 +08:00
Unknown
e723e66850
Merge remote-tracking branch 'upstream/master' into leaderboard-scopes
2017-11-24 19:14:50 +05:30
Unknown
c5a78e54e9
Add a retry button for when scores request fails.
2017-11-24 18:40:52 +05:30
Dean Herbert
09facdc838
Add a setting to toggle showing converted beatmaps
2017-11-24 18:34:20 +09:00
Dean Herbert
6ddefa5f8c
Merge branch 'master' into improve-user-ratings-calculations
2017-11-23 23:33:05 +09:00
Dean Herbert
dbb03bcff2
Handle the case where a map hasn't been rated yet
2017-11-23 23:30:57 +09:00
Dan Balasescu
dd78479a1a
Merge branch 'master' into fix-ef-issues
2017-11-23 21:18:20 +09:00
Dean Herbert
2f3e4a27c6
Merge branch 'master' into improve-user-ratings-calculations
2017-11-23 20:55:55 +09:00
FreezyLemon
00830c190c
Merge branch 'master' of https://github.com/ppy/osu
2017-11-23 12:39:36 +01:00
FreezyLemon
a60e53c382
Changed the text updates into a scheduled (async) operation, and implemented this in the updateStatistics and clearStats methods
2017-11-23 12:31:18 +01:00
Dean Herbert
9db6ef6657
Fix unfixed regressions
2017-11-23 20:23:47 +09:00
Dean Herbert
4986ad73f7
Merge remote-tracking branch 'upstream/master' into load-optimization
2017-11-23 18:44:17 +09:00
Dean Herbert
d93911ae97
Improve user ratings calculations to make more sense
...
Closes #1552 .
2017-11-23 18:10:08 +09:00
naoey
b6de1ce5b6
Handle query params better.
2017-11-23 14:36:12 +05:30
Unknown
096e98b5d3
Add game mode query to request.
...
- Also update scores when game mode is changed
2017-11-23 14:36:12 +05:30
naoey
487483eadd
Move loader hiding to a better place.
2017-11-23 14:36:12 +05:30
naoey
a58bd72c6e
Add placeholder when there are no scores.
2017-11-23 14:36:12 +05:30
naoey
fe559f4b62
Add respective query params to GetScoreRequest based on selected tab.
2017-11-23 14:36:12 +05:30
FreezyLemon
2cc2323791
Style changes (removing newline from before second constructor parameter)
2017-11-23 09:12:23 +01:00
Dean Herbert
1824540325
Schedule calls to correct thread
...
These could be fired from an async worker thread (for instance, maintenance operations).
2017-11-23 17:02:54 +09:00
FreezyLemon
7d428875b8
Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor)
2017-11-22 15:46:04 +01:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09:00
FreezyLemon
870807c265
Switched over to the new LoadWrapper class for all delayed loading.
2017-11-21 16:17:33 +01:00
Dean Herbert
2603219350
Load beatmap carousel panels asynchronously
2017-11-21 22:30:09 +09:00
Dean Herbert
c2fcb2f9c7
Fix info wedge not displaying
2017-11-21 18:45:12 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
bd616c1307
Simplify some property access
2017-11-21 12:42:28 +09:00
Dean Herbert
be9c99ade3
Remove AsyncLoadWrapper dependence
2017-11-21 12:42:28 +09:00
Dean Herbert
e7654254d2
Remove unused code
2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
Dean Herbert
9325730f5d
Fix leaderboard fadeout causing constant flow changes
...
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
EVAST9919
a741d6cea7
Fix incorrect score indexes in leaderboard
2017-11-18 04:46:02 +03:00
Dean Herbert
6c40cf08cc
Optimise leaderboard display
...
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
f912744acc
Fix sizing of ModIcon
2017-11-16 00:15:27 +09:00
Dean Herbert
eaf1a60fe1
Merge branch 'master' into beatmap_scores
2017-11-15 17:58:07 +09:00
EVAST9919
ea2fa5fa00
Fix wrong ratings calculations
2017-11-15 09:48:40 +03:00
EVAST9919
d157e6baf1
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores
2017-11-13 16:02:44 +03:00
Dean Herbert
49a5af60e2
Fix multiple order-of-execution issues with osu! logo
...
Also sets better defaults.
2017-11-13 18:43:16 +09:00
EVAST9919
5bf756c3c6
Add DrawableTopScore
2017-11-11 06:54:52 +03:00
Dean Herbert
9e82fc21ac
Improve transition when exiting song select
...
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
4874371dbf
Rename methods back
2017-11-09 17:38:20 +09:00
Dean Herbert
c2d4a213b1
Rename logo-related methods
2017-11-08 16:34:03 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo
2017-11-08 14:37:20 +09:00
Dean Herbert
b8b05fe8d2
Make the osu! logo shared game-wide
...
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
f486ab1f6c
Merge branch 'master' into song_select_delete
2017-10-30 21:07:02 +09:00
Dean Herbert
5001e9f264
Fix Hide/Restore/Delete etc.
2017-10-25 22:08:34 +09:00
Dean Herbert
f69fa0cf1f
Fix selection after hiding all difficulties in a set
2017-10-20 11:16:56 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
a85de09c0f
Fix beatmap carousel interactions with deletion when not yet displayed
2017-10-18 18:36:35 +09:00
Dean Herbert
31dc5c97f2
Fix intro and duplicate inserts
2017-10-17 11:22:42 +09:00
Huo Yaoyuan
c2836a8393
Use format string for double instead of Math.Round.
2017-10-16 12:59:59 +09:00
EVAST9919
24ca7a5119
Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
2017-10-15 00:09:50 +03:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
EVAST9919
502940ddf3
Fix deleting last visible beatmap doesn't trigger selecting null beatmap
2017-10-14 05:05:38 +03:00
EVAST9919
7cff413ab0
Fix wrong beatmap selection in song-select menu on deleting selected beatmap
2017-10-11 20:25:12 +03:00
smoogipoo
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
Dean Herbert
f129902ee0
Avoid nullrefs when data is not present
2017-09-25 23:35:02 +08:00
Huo Yaoyuan
442259d9e0
Fix overlay toggling in song select.
2017-09-23 19:47:23 +08:00
Dean Herbert
120446e4a7
Ensure only one dialog is being displayed by the SongSelect footer at a time
...
Fixes #1208
2017-09-20 14:32:15 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Dean Herbert
b72921b30e
Ensure an OnlineBeatmapID is present before attempting API requests
2017-09-15 12:44:48 +09:00
Dean Herbert
396a56ddf4
Remove global OsuContextMenuContainer
2017-09-14 15:41:32 +09:00
Dean Herbert
b1145272d1
Update code to support new inspectcode analysis rules
2017-09-14 12:58:32 +09:00
smoogipooo
58c875bdca
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 15:02:12 +09:00
smoogipooo
cde22865b9
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
6d33e39c5e
Merge branch 'master' into beatmap-details-rewrite
2017-09-10 11:26:00 +09:00
DrabWeb
d95940ed5e
CI fixes.
2017-09-08 14:25:41 -03:00
DrabWeb
ce68b6661e
Update visual test.
2017-09-08 14:15:28 -03:00
DrabWeb
55e8bdfb05
CI fixes.
2017-09-07 15:38:23 -03:00
DrabWeb
109531b66c
Cleanup, remove unneeded files.
2017-09-07 15:21:18 -03:00
DrabWeb
2153865de5
Adjust fail on missing logic to match original.
2017-09-07 15:09:50 -03:00
DrabWeb
fd2700a5b4
Fix .00 being displayed for star difficulty when the value is 0.
2017-09-07 15:01:31 -03:00
DrabWeb
5e685ff5b1
Rewrite BeatmapDetails to be more modular for future code sharing.
2017-09-07 14:53:53 -03:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +09:00
smoogipooo
5508fa0fd9
Merge remote-tracking branch 'origin/master' into new-menus
2017-09-05 19:14:42 +09:00
smoogipooo
57678a13d9
Update in-line with framework changes.
2017-09-04 09:32:35 +09:00
Dean Herbert
543a71efcc
Fix ObjectDisposal exceptions due to lingering event binds
2017-09-04 08:21:07 +09:00
Dean Herbert
dd26c80837
Delete -> Hide
2017-09-04 07:59:32 +09:00
Dan Balasescu
19ad5d5328
Merge branch 'master' into song-select-context-menus
2017-09-04 07:56:31 +09:00
Dean Herbert
3ede685ee9
Fix crash on random selection from a previously null selection
2017-09-01 18:44:51 +09:00
Dean Herbert
3d61cde266
Correctly delay loading of PlaySongSelect-specific components
2017-09-01 18:22:38 +09:00
Dean Herbert
f9d02afb00
Don't allow selection of a hidden beatmap
2017-09-01 18:13:21 +09:00
Dean Herbert
1f646e6d54
Add hiding support for beatmap difficulties
2017-09-01 17:57:12 +09:00
Dean Herbert
3b4b4b669b
Add framework for deleting difficulties
2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc
Use BeatmapSetInfo instead of WorkingBeatmap
2017-08-30 20:53:33 +09:00
Dean Herbert
07da29ea1c
Add context menu to beatmap set header
2017-08-30 20:41:41 +09:00
Huo Yaoyuan
4aa5ce8b41
Always load background and info wedge when no beatmap available.
2017-08-28 17:53:57 +08:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Shane Woolcock
4901ac9e35
Add some comments explaining why the Track is being forcefully added to the TrackManager
2017-08-18 18:01:18 +09:30
Dean Herbert
ffc8f763e5
Merge branch 'master' into fix-track-not-resetting
2017-08-18 17:24:22 +09:00
Dan Balasescu
cc6a5824f0
Merge branch 'master' into fix-ruleset-changing
2017-08-18 13:40:52 +09:00
Dean Herbert
7e21ddb5eb
Remove usage of HideOnEscape
2017-08-16 22:56:32 +09:00
MrTheMake
105048500a
Made modString private and moved the beatmap assignment inside GetScoresRequest
2017-08-15 15:30:53 +02:00
Dean Herbert
6ded194c53
Remove all usage of DI to retrieve InputManager
...
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
MrTheMake
920710e7d0
Assign a score's beatmap and cleanup to the Score class
2017-08-14 13:30:54 +02:00
Dean Herbert
9e1ffa27dc
Fix leaderboard icons not displaying correctly
2017-08-14 12:52:20 +09:00
MrTheMake
6b1184e8af
General formatting
2017-08-14 00:27:54 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3
Fix nullref in the leaderboard's test case
2017-08-13 18:00:53 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Dean Herbert
94b8d1de8b
Merge branch 'master' into fix-ruleset-changing
2017-08-13 11:14:41 +09:00
Dean Herbert
fe2911f165
Fix some formatting issues
2017-08-13 10:36:57 +09:00
Shane Woolcock
096e574401
Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)
2017-08-12 19:52:09 +09:30
Shane Woolcock
e48c5898bd
Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.
2017-08-11 17:26:30 +09:30
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
e8021c2b92
Move line inside if
2017-08-04 17:20:05 +09:00
Huo Yaoyuan
74facb32b4
Use removeAutoModOnResume as a field.
2017-08-04 15:34:11 +08:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b
Pass input state in OnSelected.
2017-08-04 00:09:41 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
c8b5c1b8a5
Merge branch 'master' into scroll_to_selected
2017-08-01 11:06:32 +09:00
EVAST9919
700c7753c3
Applied suggestions
2017-07-31 14:20:12 +03:00
Huo Yaoyuan
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
EVAST9919
62365090ad
Removed useless variable
2017-07-29 17:51:11 +03:00
EVAST9919
6b3a81f567
Fix hard crash when pressing random if no beatmaps avaliable
2017-07-29 17:42:32 +03:00
EVAST9919
e121b119be
Added "scroll to" container
2017-07-29 17:33:20 +03:00
EVAST9919
8458622c4d
Add ScrollToSelected method
2017-07-29 16:03:17 +03:00
Dean Herbert
e691dd12c5
Fix potential sequen of execution issues in BeatmapCarousel
2017-07-28 15:05:08 +09:00
Dean Herbert
6f4efbeda6
Merge remote-tracking branch 'upstream/master' into database-tidy
2017-07-27 17:41:29 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777
Simplify and document DatabaseStore API
2017-07-27 15:06:10 +09:00
Dean Herbert
31bfa00d60
Schedule API callback to own scheduler
...
Fixes race condition when API returns a failure after exiting song select. Note that the API does also schedule to the correct thread, but this schedule ensures the callback is never run, which is what we want in this case.
2017-07-27 12:55:14 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Dean Herbert
3c7546e2c1
Merge remote-tracking branch 'upstream/master' into no-more-colourinfo
2017-07-25 10:14:48 +09:00
Dean Herbert
b528568547
Merge branch 'master' into drawableflag-ctor
2017-07-25 09:46:27 +09:00
Huo Yaoyuan
47b4ef5cd2
Handle control key with OnKeyUp/OnKeyDown.
2017-07-24 22:14:21 +08:00
Huo Yaoyuan
c2e5788ed1
Make OsuScreen.Ruleset protected.
2017-07-24 21:47:31 +08:00
Huo Yaoyuan
e0b1057b87
Merge branch 'master' into fixes
2017-07-24 20:50:33 +08:00
Dean Herbert
84f12c722f
Merge branch 'master' into master
2017-07-24 18:23:36 +09:00
tgi74000
d0e99f0c95
check removed beatmap being null, check promptdelete beatmap being default
2017-07-24 10:25:33 +02:00
tgi74000
5d30efc090
Do not trigger Random if no Beatmaps are imported
2017-07-24 09:57:12 +02:00
Nabile Rahmani
c80f5c708a
Less verbose DrawableFlag constructor.
2017-07-24 09:25:49 +02:00
Dean Herbert
64f2e2dc32
Use Colour instead of ColourInfo
2017-07-23 13:06:16 +02:00
EVAST9919
d9e9ab22db
Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel
2017-07-23 13:27:03 +03:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
EVAST9919
388fcfb295
Make BeatmapCarousel inherit from OsuScrollContainer
2017-07-21 13:13:53 +03:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
9a33e77d63
Merge branch 'master' into fix-carousel-debounce-race
2017-07-21 17:44:04 +09:00
Dean Herbert
12b6b80d5c
Make method to flush filter requests
2017-07-21 17:20:52 +09:00
Dean Herbert
b4dddc98ee
Fix selection changing on entering song select
...
Conditional was backwards, easy fix.
2017-07-21 06:15:44 +09:00
Dean Herbert
fb2f1224b3
Fix carousel filter debounce causing a race condition
...
Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.
2017-07-21 05:58:58 +09:00
Thomas Müller
e84d8cc020
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:15:58 +02:00
Thomas Müller
4e33efd41f
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:04:45 +02:00
Thomas Müller
518a7c460e
Merge branch 'master' into fix-beatmap-select-race
2017-07-20 21:04:40 +02:00
Thomas Müller
e21822cdeb
Merge branch 'master' into fix-working-beatmap-double-load
2017-07-20 20:35:31 +02:00
Thomas Müller
01ff7e8f4b
Merge branch 'master' into fix-empty-carousel
2017-07-20 20:31:06 +02:00
Dean Herbert
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
Thomas Müller
8108f3e78d
Merge branch 'master' into no-set-exclusive
2017-07-20 12:11:32 +02:00
Dean Herbert
6e0b7b81f8
Switch to correct ruleset when changing beatmap
...
This is only really noticeable when using the MusicController to change tracks while at song select.
2017-07-20 19:10:20 +09:00
Dean Herbert
577740d329
Fix footer button light fading incorrectly
...
Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.
2017-07-20 18:08:51 +09:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
4f10256182
Remove unnecessary count check
2017-07-20 15:34:44 +09:00
Dean Herbert
61c665f239
Add required null check
2017-07-20 15:16:07 +09:00
Dean Herbert
a59557f039
Fix selection not being reset correct when changing between rulesets
...
Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.
2017-07-20 15:12:20 +09:00
Dean Herbert
c130981184
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
2017-07-20 14:06:09 +09:00
Dean Herbert
15eb6954da
Fix hitting down and enter at song select causing a hard-crash
...
Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
2017-07-20 11:50:52 +09:00
Dean Herbert
8d727b898f
Don't rely on BeatmapSetInfo being present
2017-07-20 09:23:11 +09:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
35157ca6b8
Make DefaultBeatmap private get.
2017-07-19 18:09:59 +09:00
Dean Herbert
c8593a38c8
Remove incorrect looping reset behaviour
...
Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.
2017-07-19 15:55:16 +09:00
Dean Herbert
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
Dean Herbert
8e8767cd37
Give song select a better default background whecn the beatmap's can't be loaded
2017-07-19 15:16:55 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Dean Herbert
0846414c5b
Simplify state changes
2017-07-19 15:16:51 +09:00
Dean Herbert
632d2e8ba5
Dummy beatmap has dummy ruleset
2017-07-19 15:16:48 +09:00
Dean Herbert
f168ee660c
Move dummy to BeatmapDatabase
2017-07-19 15:16:43 +09:00
Dean Herbert
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
Dean Herbert
df60fc0f0a
Stop playing previous beatmap even if new beatmap has no track
2017-07-19 15:16:36 +09:00
Dean Herbert
e47faf4e85
Add a dummy beatmap provider for use in BeatmapInfoWedge
2017-07-19 15:16:33 +09:00
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Huo Yaoyuan
9cd895c249
Implement Ctrl+Enter in PlaySongSelect.
2017-07-18 15:55:21 +08:00
Dean Herbert
b5035ec245
Merge branch 'master' into songselect-preview-fix
2017-07-18 13:05:03 +09:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
ce204b8e7b
Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
2017-07-14 06:23:07 +09:00
Dean Herbert
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09:00
Dean Herbert
9d47dd9ff9
Add support for right mouse absolute scrolling (when enabled)
...
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Dean Herbert
0322e66c25
Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist
2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Thomas Müller
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
Thomas Müller
178685292a
Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode
2017-07-08 12:25:08 +03:00
Thomas Müller
22a987f6cc
Update test cases to new framework and fix old crashes
2017-07-07 15:05:55 +03:00
Dean Herbert
724e5aa99e
Merge master into better-input
2017-07-05 13:59:40 -07:00
Thomas Müller
bb15bc0467
Use ReceiveMouseInputAt whenever possible
2017-06-30 09:54:03 +03:00
Dean Herbert
28f0da606a
Add OsuFocusedOverlayContainer with predefined sounds.
2017-06-28 10:18:12 -07:00
Thomas Müller
40225238d9
Set RelativeSizeAxes for updated FillMode behavior
2017-06-28 12:24:23 +03:00
Dean Herbert
480cdba023
Add OsuClickableContainer with generic sounds
2017-06-27 21:05:49 +09:00
EVAST9919
127c473f3b
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
2017-06-25 23:38:39 +03:00
Thomas Müller
1bca9ca0e9
Update framework with better children list
2017-06-24 12:56:35 +02:00
Thomas Müller
e3489928b7
Remove now obsolete InternalContains
2017-06-24 09:21:08 +02:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
EVAST9919
be94163d21
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
2017-06-22 04:28:47 +03:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
MrTheMake
a399b18837
Removed debug line
2017-06-19 00:11:47 +02:00
MrTheMake
3b3cc59471
Fix NullReferenceException
2017-06-18 20:21:24 +02:00
MrTheMake
23d1c89a67
Fix not applying song select preview seek
2017-06-18 20:12:28 +02:00
Dean Herbert
ae79ba48be
Merge branch 'master' into numpad-enter
2017-06-16 15:32:52 +09:00
MrTheMake
06089a74e3
Handle the numpad's Enter in cases where only the normal Enter was handled
2017-06-15 23:06:28 +02:00
EVAST9919
5117baae66
Make random works with panels too
2017-06-15 06:37:20 +03:00
Dan Balasescu
5a1edaa93c
Merge branch 'master' into cancel-select-random
2017-06-14 14:11:45 +09:00
Dean Herbert
3ca80eb149
Add readonly
2017-06-13 15:54:26 +09:00
Dean Herbert
e94425f311
Improve the loading animation and use it in multiple places
...
- Supersedes https://github.com/ppy/osu/pull/926 .
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817 .
2017-06-12 17:04:42 +09:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
EVAST9919
e552c39444
change function to a property
2017-06-11 22:04:35 +03:00
EVAST9919
c3f4b1b3cb
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
2017-06-11 21:56:55 +03:00
John Neijzen
aa3a231763
Review Changes
2017-06-07 22:00:14 +08:00
John Neijzen
f9c466eee9
bit more readable
2017-06-07 20:12:16 +08:00
John Neijzen
23a7045eef
More Clean UP
2017-06-07 20:07:18 +08:00
John Neijzen
9b0e1c26a3
Clean Up Code
2017-06-07 19:53:37 +08:00
EVAST9919
78500eec21
Applied suggested changes
2017-06-05 12:24:28 +03:00
EVAST9919
a42c67ee97
Cancel beatmap random selection
2017-06-01 20:54:42 +03:00
Patrick Andersson
94294e4b45
Changed default selection type and added suggestions from PR feedback
2017-06-01 08:54:48 +02:00
Patrick Andersson
a3945bb11d
Added suggestions by code inspector
2017-05-31 22:04:29 +02:00
Patrick Andersson
9592e9778b
Trim whitespace
2017-05-31 20:31:05 +02:00
Patrick Andersson
1dd85b5986
Add alternative for random beatmap selection
...
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
Dean Herbert
8544b45443
Update in line with framework
2017-05-30 22:23:51 +09:00
Dean Herbert
d749fc516d
Update focus handling in line with framework changes
2017-05-28 20:08:46 +09:00
Dean Herbert
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
Dean Herbert
dee6a1e2be
Merge branch 'master' into songselect-fix
2017-05-24 09:45:34 +09:00
MrTheMake
24f64c8815
More formatting
2017-05-24 02:38:05 +02:00
MrTheMake
67774192dd
Formatting fixes
2017-05-24 02:30:32 +02:00
MrTheMake
0616256bd0
CI fix
2017-05-24 02:23:52 +02:00
MrTheMake
09adb23591
Fix scheduled task not being canceled
2017-05-24 02:22:30 +02:00
Dean Herbert
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
MrTheMake
e9c2b51012
Random the difficulty too
2017-05-22 01:59:10 +02:00
MrTheMake
5ef7451dba
Improved LEFTand RIGHT key behaviour
2017-05-22 01:53:36 +02:00
MrTheMake
4056338203
Remove unnecessary track starting
2017-05-21 21:35:49 +02:00
MrTheMake
0539584578
CI fix
2017-05-21 21:33:54 +02:00
MrTheMake
b543b1f9fc
Remove unnecessary restart
2017-05-21 21:20:59 +02:00
MrTheMake
6219b8e6dd
Fixed an error with looping
2017-05-21 20:27:41 +02:00
MrTheMake
974e8d1f82
Fix pressing up always goes to the first beatmap group difficulty, not the last
2017-05-21 19:27:34 +02:00
MrTheMake
9b87f5d8db
Reformating
2017-05-21 18:16:54 +02:00
MrTheMake
6d7f70d0ea
Fix CI warnings
2017-05-21 18:00:31 +02:00
MrTheMake
34653eb8c0
Fixed null references
2017-05-21 17:20:20 +02:00
MrTheMake
7db45cb58f
Moved the whole looping assignments inside PlaySongSelect
2017-05-21 17:09:56 +02:00
MrTheMake
ec213efc49
Trimmed whitespaces
2017-05-21 16:13:20 +02:00
MrTheMake
cc35cc281c
Fixed null reference in case there are no beatmaps
2017-05-21 16:10:10 +02:00
MrTheMake
48f4879157
Use the track's implemented looping algorithm to loop tracks in the song select screen
2017-05-21 15:57:41 +02:00
MrTheMake
043d1ed20a
Updated preload condition to handle special case
2017-05-21 14:08:04 +02:00
MrTheMake
662ea0ec2d
Repeat a beatmap's track if it has ended
2017-05-21 14:00:40 +02:00
MrTheMake
1546bbc66b
Updated preload condition.
2017-05-21 13:04:04 +02:00
MrTheMake
44cad4e0ac
Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen.
2017-05-21 03:04:12 +02:00
MrTheMake
33ebc8fd49
Trimmed more whitespaces
2017-05-20 22:23:49 +02:00
MrTheMake
97aadad113
Trimmed spaces.
2017-05-20 22:16:05 +02:00
MrTheMake
f76abe2329
Disallow clicking through the song select footer.
2017-05-20 22:13:23 +02:00
MrTheMake
306feb177a
Fix null pointer reference
2017-05-20 20:18:29 +02:00
MrTheMake
031fddc995
Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set.
2017-05-20 19:53:18 +02:00
Dean Herbert
0b987be600
Merge branch 'master' into osu-direct
2017-05-20 16:17:59 +09:00
DrabWeb
e030573436
Add ReverseDepthFillFlowContainer to remove code duplication
2017-05-19 23:44:36 -03:00
Dean Herbert
5ae3a7143e
Fix audio seeking when entering play mode in certain cases
...
Resolves #794
2017-05-19 13:23:11 +09:00
Dean Herbert
7bb38e927b
Fix song select reverting to first difficulty of current group on entering
2017-05-17 17:33:20 +09:00
Dean Herbert
cab12ee55a
Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed
2017-05-17 17:33:16 +09:00
nyaamara
a3e93afb37
Merge pull request #3 from ppy/master
...
cool
2017-05-16 16:57:45 -04:00
nyaamara
b22c84287a
Fix typo.
2017-05-16 16:54:33 -04:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
Dean Herbert
622b155fda
OsuConfig -> OsuSetting
2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586
Change all instances of options to settings where applicable
2017-05-15 10:55:29 +09:00
Dean Herbert
e096dd8126
Merge branch 'master' into fix-beatmap-population
2017-05-12 20:30:06 +09:00
Dean Herbert
a9b3f74218
Fix ruleset not always getting populated in a WorkingBeatmap
2017-05-12 20:05:44 +09:00
Dean Herbert
d2e066ca35
Move SearchTextBox to better namespace
...
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
Huo Yaoyuan
f37c857af8
CI fixes.
2017-05-06 16:06:38 +08:00
Huo Yaoyuan
767cfaaac3
Access database recursively.
2017-05-06 15:37:53 +08:00
Huo Yaoyuan
146d57953d
Use metadata field of WorkingBeatmap.
2017-05-06 14:57:11 +08:00
skettios
36dff94802
removed check if ModSelectOverlay is open
2017-05-05 18:16:48 -07:00
skettios
d129bd0c1f
Fix ModSelectOverlay accepting escape when it shouldn't
...
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
2017-05-05 17:03:24 -07:00
Dean Herbert
6074cb5979
Make playlist filtering work.
...
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
ColdVolcano
f2b0602f90
Double check if the selectedpanel is not the provided as argument
2017-05-01 00:13:00 -05:00
Dean Herbert
1e3847c73c
Cancel the existing scheduled task when running it ahead of time.
2017-04-29 20:28:56 +09:00
Dean Herbert
2dcb4e9b93
Fix race condition when attempting to start a beatmap during debounce.
2017-04-29 20:12:09 +09:00
Dean Herbert
2ece1cbd07
CI Fixes.
2017-04-28 22:26:51 +09:00
Dean Herbert
a681e3e380
Remove unused method.
2017-04-28 22:17:42 +09:00
Dean Herbert
4e65da0fd1
Fix regression in panel select animation.
...
Currently we are required to update computeYPositions twice per selection. Without doing this, panels are in the wrong place when using keyboard selection.
There's still a bit of work to be done to make this work correctly. It's caused by a race condition of state application for panels which have not yet been presented (and get their state applied in LoadComplete which breaks the order of things).
2017-04-28 22:17:35 +09:00
Dean Herbert
70e81115f4
Refactor BeatmapInfoWedge to suck a little less.
2017-04-28 21:16:37 +09:00
Dean Herbert
59cc5ea00a
CI Fixes.
2017-04-28 20:50:23 +09:00
Dean Herbert
45729a8881
Add debounce to WorkingBeatmap creation at song select.
...
Improves perceived performance when quickly moving through carousel.
2017-04-28 20:44:16 +09:00
Dean Herbert
003cf53441
Streamline panel selection event logic.
...
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
2017-04-28 20:43:42 +09:00
Dean Herbert
b78fa99620
Don't perform a selection if we already have the correct panel selected.
2017-04-28 20:31:09 +09:00
Dan Balasescu
91b264da1a
Merge branch 'master' into info-wedge-design-update
2017-04-25 08:14:59 +09:00
Dan Balasescu
f329587bd4
Fix mismatched braces.
2017-04-25 08:02:09 +09:00
Dean Herbert
43d09a9734
CI fixes
2017-04-24 20:31:25 +09:00
Dean Herbert
c7b789424b
Update BeatmapInfoWedge design
...
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00
Dean Herbert
d84f1f05e2
Add better commenting for ambiguous parameter
2017-04-24 20:16:53 +09:00
Dean Herbert
9670ea9a2a
CI fixes
2017-04-24 20:16:41 +09:00
Dean Herbert
8b048a6706
Fix typo.
2017-04-24 19:33:48 +09:00
Dean Herbert
c55d406b44
Fix nullref possibility.
2017-04-24 19:25:35 +09:00
Dean Herbert
6aa6e5eef7
Store and restore the selected details tab at song select.
2017-04-24 19:25:27 +09:00
Dean Herbert
e1a2f1bc7a
Add beatmap metrics lookup.
2017-04-24 19:17:11 +09:00
Dean Herbert
d6c5654924
Reduce paddings and lock in some fixed heights for BeatmapDetails.
2017-04-24 18:55:49 +09:00
Dean Herbert
4fa22146b8
Increase safety of score lookups when leaderboard isn't visible.
2017-04-24 18:48:28 +09:00
Dean Herbert
ee659e7307
Fix decimal display of beatmap details being too precise.
2017-04-24 18:34:27 +09:00
Dean Herbert
7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen
...
# Conflicts:
# osu.Game/Users/User.cs
2017-04-19 20:51:05 +09:00
Dean Herbert
afcd7d7fa0
Format accuracy better in LeaderboardScores.
2017-04-19 16:05:17 +09:00
Dean Herbert
7d32cc85c8
Make leaderboard scores clickable.
2017-04-18 22:22:14 +09:00
Dean Herbert
64a8992153
Merge branch 'master' into general-fixes
2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
Dean Herbert
727086c0b2
Updates in-line with framework.
2017-04-18 15:34:53 +09:00
Dean Herbert
8ef675d9b3
Add fallback to allow FilterCriteria to run without a ruleset being set.
2017-04-18 10:55:45 +09:00
Dean Herbert
6b6690caf7
Fix filtering by ruleset.
2017-04-18 10:04:41 +09:00
Dean Herbert
f2174054ea
Fix song select.
2017-04-18 10:04:32 +09:00
Dean Herbert
928550b1a8
Merge branch 'master' into remove-playmode
2017-04-17 21:01:10 +09:00
Huo Yaoyuan
c235a14e3e
Don't block input in BeatmapInfoWedge.
2017-04-17 17:08:01 +08:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
smoogipooo
ddce3c157f
Clean up a few remaining stragglers.
2017-04-15 06:15:55 +09:00
smoogipooo
4a149c4ab8
Better default values + don't set Mode from outside.
2017-04-15 06:14:31 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be
Make BeatmapInfo expose Ruleset instead of PlayMode.
2017-04-15 05:01:36 +09:00
smoogipooo
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
Dean Herbert
2c3fa30386
Metric -> Metrics.
2017-04-12 21:09:39 +09:00
Dean Herbert
157ad17606
Merge branch 'master' into details
2017-04-12 20:25:51 +09:00
Jorolf
98ce9e0724
remove ??
2017-04-12 11:25:32 +02:00
Jorolf
e285d33f8c
fails, retries and size not enforced
2017-04-12 11:05:10 +02:00
Jorolf
d2affe6867
requested changes
2017-04-12 10:52:24 +02:00
ColdVolcano
50cb9e0fe7
Match stable search parameters
2017-04-11 18:07:54 -05:00
Jorolf
ed2f5d210e
condensed some commits because they were small or already reversed
2017-04-11 22:48:53 +02:00
Jorolf
50b6bcd574
Merge branch 'master' into details
2017-04-11 19:06:58 +02:00
Jorolf
d4e5f55091
the power of linq
2017-04-11 18:43:48 +02:00
Jorolf
9026880495
fix
2017-04-11 14:40:12 +02:00
Jorolf
9dd8920c2c
🤔 I hope this works
2017-04-11 14:22:13 +02:00
Jorolf
bfebba3a20
null reference fixes
2017-04-11 14:12:23 +02:00
Jorolf
fb5952186c
changes and fixes
2017-04-11 14:02:56 +02:00
Dean Herbert
dc3a2d45fe
Move API lookup from BeatmapDetailArea to Leaderboard.
2017-04-11 16:36:50 +09:00
Dean Herbert
ecfe68d6fb
Hide deprecated API storage variables and populate Score.User automatically.
2017-04-11 16:36:47 +09:00
Jorolf
ad41fd5c1a
more unnecessary stuff
2017-04-10 16:49:48 +02:00
Jorolf
a597149b7f
Merge branch 'details' of github.com:Jorolf/osu into details
2017-04-10 16:42:42 +02:00
Jorolf
24b4b3ad7d
update to everything
2017-04-10 16:42:23 +02:00
Dean Herbert
c6a24bb549
Merge branch 'master' into details
2017-04-10 20:07:13 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes.
2017-04-10 14:54:23 +09:00
Jorolf
bcef1ce2b6
replace space in text with Spacing in FillFlowContainer
2017-04-08 13:59:22 +02:00
Jorolf
f7a9a11ae5
Bar uses AccentColour aswell
2017-04-08 13:53:11 +02:00
Jorolf
5e56e84c4a
change SRGBColour to Color4 and use IHasAccentColour in some places
2017-04-08 13:31:55 +02:00
Jorolf
c60a55285c
updated TestCase and some null checks
2017-04-07 20:32:09 +02:00
Jorolf
6a87fd6112
retries and fails hide if they're not present
2017-04-07 20:19:03 +02:00
Jorolf
899e559b5c
ratings hide now + remove unnessary stuff
2017-04-07 19:58:49 +02:00
Jorolf
65d9f4fc45
hide MetadataSegments without content and remove fail/retry initialisations
2017-04-07 19:27:14 +02:00
Jorolf
9881889f88
removed some unused stuff
2017-04-07 18:24:36 +02:00
Jorolf
eb4b3772e9
put Bar into its own file and let it only add a background if BackgroundColour is changed
2017-04-07 18:13:55 +02:00
Jorolf
28193cbaaa
hide BeatmapDetails on entering the Select screen
2017-04-06 15:39:23 +02:00
Huo Yaoyuan
411988f038
Remove all trailing whitespaces in this repo.
2017-04-06 16:21:18 +08:00
Dean Herbert
942699218a
Merge branch 'master' into details
2017-04-06 15:44:43 +09:00
Dean Herbert
4b1588a21d
Fix correct mode filter not being applied when first entering song select.
2017-04-05 17:33:19 +09:00
Dean Herbert
8173d01d78
Fix crash on changing play mode too early.
2017-04-05 17:26:45 +09:00
Jorolf
b2731bb0a1
some formatting
2017-04-04 17:27:08 +02:00
Jorolf
58f8dc8254
add direction to graphs
2017-04-04 17:17:22 +02:00
Dean Herbert
7c74951454
Update bindables.
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseResults.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
f6303d55ec
Upodate some tab usages.
2017-04-04 11:13:09 +09:00
Dean Herbert
d0ebbad0fa
Fix avatar display.
2017-04-04 10:33:41 +09:00
Jorolf
8e689a06d8
change font
2017-04-03 23:03:49 +02:00
Jorolf
5a694e0c9d
changed location of BarGraph to be more generic
2017-04-03 19:29:13 +02:00
Jorolf
f3946bebb4
Merge branch 'master' of git://github.com/ppy/osu into details
2017-04-03 18:33:47 +02:00
Dean Herbert
bfa2e68bfb
Container->Wrapper.
2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Jorolf
017281246d
changed SpriteText to OsuSpriteText
2017-04-01 18:12:44 +02:00
Jorolf
d0b4f86725
fix errors from merge
2017-04-01 14:16:18 +02:00
Jorolf
072a77b4d9
Merge branch 'master' of git://github.com/ppy/osu into details
2017-04-01 14:12:20 +02:00
Jorolf
e380254386
remove unnecessary code
2017-03-31 22:32:09 +02:00
Jorolf
1f19d72474
removed wrong using >.>
2017-03-31 21:24:05 +02:00
Jorolf
d8bb72dd78
remove unused using-directive
2017-03-31 21:19:23 +02:00
Jorolf
50b8580141
add license header
2017-03-31 21:13:20 +02:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox.
2017-03-31 17:38:33 +09:00
Jorolf
0d4f2c59a5
there's probably something in here I overlooked
2017-03-30 17:32:18 +02:00
Jorolf
15326204d5
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-30 16:38:25 +02:00
Jorolf
a3430dd072
add culture info
2017-03-29 16:10:07 +02:00
Jorolf
cdb3150c56
add readonlies and remove unused using directives
2017-03-29 16:00:29 +02:00
Jorolf
6982529481
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-29 15:47:00 +02:00
Jorolf
ab4d1c7725
better maxValue calculation for the retry and fail graph
2017-03-29 15:33:36 +02:00
Jorolf
7bd13d76a8
fixes + updates to DetailsBar and a button for the TestCaseDetails
2017-03-29 14:48:43 +02:00
Dean Herbert
6afa6f30cc
Keep selected beatmap in centre of screen post-filter.
2017-03-29 20:01:46 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter.
2017-03-29 19:48:13 +09:00
Dean Herbert
b96a153e0e
Resize ranks better.
2017-03-29 12:24:04 +09:00
Dan Balasescu
bca18ce209
Merge branch 'master' into move-easingtypes
2017-03-29 08:14:13 +09:00
Dan Balasescu
e53a5a3521
Merge branch 'master' into avatars-and-login
2017-03-29 07:52:43 +09:00
Jorolf
199c70ff95
Added fails and retries
2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c
Added ratings and different bar rotations
2017-03-28 17:12:54 +02:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places.
2017-03-28 15:28:58 +09:00
Dean Herbert
f690e1d0c4
Move async logic to framework.
2017-03-28 14:24:34 +09:00
Dean Herbert
13272e6995
Make Avatar accept a user.
...
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
Dean Herbert
0ad070c2d8
Update grade textures.
2017-03-27 22:24:47 +09:00
Jorolf
775fd63d0f
Added difficulty container
2017-03-25 23:33:03 +01:00
Jorolf
d8724e5e3e
Add metadata details
2017-03-24 23:02:24 +01:00
Dean Herbert
cb0c7dca71
Merge branch 'master' into taiko_scoreprocessing
2017-03-24 12:25:19 +09:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting.
2017-03-23 19:35:46 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie.
2017-03-23 19:32:58 +09:00
Dean Herbert
644e9ae9d5
Increase padding to make flyte happy.
2017-03-23 16:36:52 +09:00
Dean Herbert
6bcbd116c8
Only get APIAccess from DI (it's all we need).
2017-03-23 16:32:35 +09:00
Dean Herbert
3ae7d0cb98
Better handle the passing of Beatmap and updating of scores.
...
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
2017-03-23 16:31:08 +09:00
Dean Herbert
a561611125
Set default tab to global scores.
...
This will need to be saved to the config file eventually.
2017-03-23 16:29:10 +09:00
Dean Herbert
022fd625df
Remove transitions for now
...
If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.
2017-03-23 16:28:45 +09:00
DrabWeb
88d878e1d5
Formatting
2017-03-23 02:47:27 -03:00
DrabWeb
b8129526a4
Typo
2017-03-23 02:29:23 -03:00
Dean Herbert
e77229b34b
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5
Formatting
2017-03-23 01:35:55 -03:00
DrabWeb
67421cdf1c
Even though it was 5 minutes ago what was I thinking
2017-03-23 01:34:06 -03:00
DrabWeb
677b8afc1f
Integration
2017-03-23 01:19:29 -03:00
DrabWeb
87b8015e8f
Cleanup
2017-03-23 00:29:28 -03:00
DrabWeb
c173c4b7ee
Tab control
2017-03-23 00:22:31 -03:00
Dean Herbert
f3486b7288
Add correct lifetime expiry for leaderboard content
2017-03-22 09:07:02 +09:00
Dean Herbert
7387dbd9fc
Tidy up LeaderboardScore
2017-03-22 09:04:33 +09:00
Dean Herbert
1699daaf7f
Make DrawableRank safer.
2017-03-22 08:32:28 +09:00
Dean Herbert
8983bbcaad
Merge branch 'master' into leaderboards
2017-03-22 08:24:49 +09:00
smoogipooo
d27f37beb5
Hard-code text size in cases it wasn't set.
2017-03-20 13:48:06 +09:00
Dean Herbert
09bf014ded
Simplify fade out gradient code.
2017-03-19 21:49:29 +09:00
Dean Herbert
5d0adc6454
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
2017-03-19 18:51:53 +09:00
Dean Herbert
256a3268ac
Inline single usage of EdgeEffect.
2017-03-19 18:51:40 +09:00
Dean Herbert
8cb334a118
Adjust sizing a touch.
2017-03-19 16:34:29 +09:00
DrabWeb
b0e7296e25
-IHasDrawableRepresentation, User.Region -> Country
2017-03-19 00:09:58 -03:00
Dean Herbert
3d8ec4fa05
FIx transition not always being correct.
2017-03-19 02:33:25 +09:00
DrabWeb
0bc8ed9c9e
Use Colour for non-faded scores
2017-03-18 01:56:19 -03:00
DrabWeb
e78069af12
Parenthesis
2017-03-18 01:48:29 -03:00
DrabWeb
b9d5ab5d8c
Only calculate fade for fading leaderboard scores
2017-03-18 01:44:05 -03:00
DrabWeb
fbb8e79f1a
Move ctor above methods
2017-03-17 19:45:51 -03:00
DrabWeb
137611ecf3
Use LeaderboardScore height for fade
2017-03-17 19:07:45 -03:00
DrabWeb
82c02fa1fc
Formatting
2017-03-17 18:29:55 -03:00
Seth
4aea06be22
Merge branch 'master' into leaderboards
2017-03-17 18:23:01 -03:00
DrabWeb
27ab8e2e86
Merge
2017-03-17 18:21:35 -03:00
DrabWeb
0834b5b794
Made requested changes
2017-03-17 18:16:59 -03:00
smoogipooo
bcaf12e3d9
Rename Criteria -> CreateCriteria and make into method.
2017-03-18 02:11:14 +09:00
Dean Herbert
3e3cde01ef
Fix missing permitNulls.
2017-03-17 21:21:16 +09:00
Dean Herbert
0a03bdc428
Add missing license header.
2017-03-17 20:44:02 +09:00
Dean Herbert
c7fa79b027
Fix nullref.
2017-03-17 20:09:23 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.
2017-03-17 19:54:51 +09:00
Dean Herbert
4b97304603
CarouselContainer -> BeatmapCarousel.
2017-03-17 19:12:54 +09:00
Dean Herbert
dc28f8c79e
Remove all external access to BeatmapGroup.
2017-03-17 19:12:15 +09:00
Dean Herbert
9c664e5b05
Reorganise song select methods to allow for more flexibility.
2017-03-17 11:52:54 +09:00
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes.
2017-03-17 00:39:40 +09:00
Dean Herbert
60fc782e93
Merge branch 'master' into beatmap_timinginfo
2017-03-16 23:08:24 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files.
2017-03-16 21:17:14 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
smoogipooo
5137338c7c
Replace List<ControlPoint> with TimingInfo in Beatmap.
2017-03-16 17:11:24 +09:00
Dean Herbert
e17f728282
Fix CI.
2017-03-16 17:04:03 +09:00
Dean Herbert
1a7c2eda5e
Size FilterControl relatively now that we can.
2017-03-16 17:01:02 +09:00
Dean Herbert
bd5493fb25
Add back correct defaults.
2017-03-16 16:44:14 +09:00
Dean Herbert
334e389518
Tidy up OsuTabControl and FilterControl.
2017-03-16 16:35:44 +09:00
Dean Herbert
4bedd4d2d7
Block input behind FilterControl.
2017-03-16 14:33:31 +09:00
Dean Herbert
da6b98db10
fixup! Filter doesn't need to be public, nor have a property.
2017-03-16 14:23:48 +09:00
Dean Herbert
269c1a5e5c
Reword some comments.
2017-03-16 14:08:37 +09:00
Dean Herbert
352de22590
Filter doesn't need to be public, nor have a property.
2017-03-16 14:08:29 +09:00
Dean Herbert
4d84bf7350
Change difficulty sort to be based on MaxStarDifficulty.
2017-03-16 13:59:23 +09:00
Dean Herbert
ff37d2da03
Index -> Rank + some formatting.
2017-03-16 13:15:06 +09:00
Dean Herbert
8e5d83b857
Isolate leaderboard retrieval code into its own method.
2017-03-16 12:56:59 +09:00
Dean Herbert
a22b34817c
Merge branch 'master' into leaderboards
2017-03-16 11:12:53 +09:00
Drew DeVault
01cca1a4d2
Refactor color handling
...
colour*
2017-03-15 20:52:31 -04:00
Drew DeVault
db5a1e241a
Don't crash on unimplemented sorts
2017-03-15 20:18:20 -04:00
Drew DeVault
3aecbf5739
Rearrange things somewhat
2017-03-15 20:15:40 -04:00
Drew DeVault
cac6c42aac
Merge remote-tracking branch 'upstream/master' into tab-control
2017-03-15 20:15:28 -04:00
DrabWeb
cf81467e13
Move fade start out of loop
2017-03-15 14:00:31 -03:00
DrabWeb
cd37ebdff2
Fading
2017-03-15 13:57:41 -03:00
DrabWeb
efd617dd34
Formatting
2017-03-15 08:53:36 -03:00
DrabWeb
20685d51cd
Adjust delays to start at 0
2017-03-15 08:51:07 -03:00
DrabWeb
847d485d5f
Remove schedules
2017-03-15 08:49:17 -03:00
DrabWeb
aea9a7b795
LeaderboardScore state, initial delay handled by leaderboard
2017-03-15 08:44:29 -03:00
DrabWeb
7572947214
Badge -> Team
2017-03-15 08:09:44 -03:00
Dan Balasescu
a3906820ec
Merge branch 'master' into beatmap_parsing
2017-03-15 19:29:45 +09:00
Dean Herbert
56868e3c06
Make a few more strings literals.
2017-03-15 19:21:55 +09:00
Dean Herbert
1855f48997
Add cancellation support for API requests.
2017-03-15 18:07:26 +09:00
Dean Herbert
295f821025
Add leaderboard to song select.
2017-03-15 17:11:08 +09:00
Dean Herbert
4f95378f27
Add fade out of previously displayed scores.
2017-03-15 17:10:54 +09:00
Dean Herbert
78efecb89d
Remove Alpha 0.001 hack.
2017-03-15 17:07:56 +09:00
Dean Herbert
775a86e798
Add null-checks and fallbacks to make display work with current API version.
2017-03-15 15:22:46 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages).
2017-03-15 15:22:28 +09:00
Dean Herbert
7bc0a1fdfe
Use fixed-width for score display.
2017-03-15 15:21:07 +09:00
Dean Herbert
dfc4bccbe0
Add some padding to leaderboard.
2017-03-15 14:42:56 +09:00
Dean Herbert
c1f56c7c0e
Scores should be enumerable.
2017-03-15 14:38:38 +09:00
Dean Herbert
15e713899d
Add a left content area to song select.
2017-03-15 14:34:19 +09:00
Dean Herbert
d96a78459d
Rename ScoreRanks to be in line with current API.
2017-03-15 13:55:29 +09:00
Kelvin
4353c9dc3d
Fixed Warnings
2017-03-14 20:42:02 -07:00
Kelvin
18afd8eabe
Fixed license headers
2017-03-14 20:30:42 -07:00
Dean Herbert
253bcebf51
Merge remote-tracking branch 'upstream/master' into leaderboards
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-03-15 12:23:34 +09:00
Kelvin
20e2e7a8c8
Sort on SortTabs ValueChanged
2017-03-14 20:19:41 -07:00
Kelvin
755fb260db
Updated TabControl Usage
2017-03-14 19:52:21 -07:00
Kelvin
ee3d3b682f
Updated usage for DropDownHeader of FilterTabControl
2017-03-14 19:49:40 -07:00
Kelvin
40bcc63a90
Added and styled FilterTabControls
2017-03-14 19:49:40 -07:00
Kelvin
2629f78afc
Add FilterControl and FilterTabControl
2017-03-14 19:49:40 -07:00
Huo Yaoyuan
37ff1f3971
Control footer by virtual property.
2017-03-15 10:10:59 +08:00
DrabWeb
09cb0d6bbc
Proper icons
2017-03-14 12:58:22 -03:00
DrabWeb
94c2734b09
More warnings
2017-03-14 12:15:19 -03:00
DrabWeb
55187a8380
Warnings, accuracy formatting
2017-03-14 11:55:19 -03:00
Huo Yaoyuan
8c991eae01
Fix CI issues.
2017-03-14 22:27:24 +08:00
DrabWeb
4c03b62a75
More usings
2017-03-14 11:23:48 -03:00
Huo Yaoyuan
a8d15e616b
Remove parameter of OnSelected.
2017-03-14 22:22:23 +08:00
Huo Yaoyuan
b2dd9afcf3
Update editor workflow and make edit button works.
2017-03-14 22:18:40 +08:00
DrabWeb
ebe48b7c24
Removed D rank
2017-03-14 11:14:27 -03:00
DrabWeb
322446effe
-Unused usings
2017-03-14 11:11:23 -03:00
DrabWeb
650fc7563d
ScoreRank, Avatar to own files, +DrawableRank
2017-03-14 10:58:28 -03:00
Huo Yaoyuan
f068f7c4bd
No footer in EditSongSelect.
2017-03-14 21:51:26 +08:00
Huo Yaoyuan
f97e8ae97f
Fix typo and warnings.
2017-03-14 21:20:38 +08:00
Huo Yaoyuan
c939897a8a
Revert "Auto assign hotkeys for BeatmapOptionsButton."
...
This reverts commit beb0a8ff03
2017-03-14 21:13:57 +08:00
Dean Herbert
8176b4ef77
Fix merge errors.
2017-03-14 22:11:38 +09:00
Dean Herbert
12326f610e
Adjust transition to flyte's liking.
2017-03-14 22:11:29 +09:00
Seth
21a9996225
Merge branch 'master' into leaderboards
2017-03-14 10:07:33 -03:00
DrabWeb
d53f219051
Adjusted score rank size
2017-03-14 10:04:42 -03:00
Huo Yaoyuan
beb0a8ff03
Auto assign hotkeys for BeatmapOptionsButton.
2017-03-14 20:50:43 +08:00
Huo Yaoyuan
35a60a8f7d
Use depth to arrange buttons.
2017-03-14 20:19:05 +08:00
Huo Yaoyuan
618e8e822b
Implement EditSongSelect and MatchSongSelect.
2017-03-14 19:53:20 +08:00
Huo Yaoyuan
3871a350f8
Move BeatmapOptions buttons to derived class and simplify.
2017-03-14 19:38:21 +08:00
smoogipooo
72e1612f32
Null-safety in the case where there are no HitObjects.
2017-03-14 19:44:14 +09:00
Huo Yaoyuan
c4e5eac35b
Move footer stuff to derived.
2017-03-14 18:38:06 +08:00
Huo Yaoyuan
9a4247f67e
Make Footer handles hotkey.
2017-03-14 18:16:04 +08:00
Huo Yaoyuan
c3a0549cdd
Move player specific stuff to derived PlaySongSelect.
2017-03-14 16:58:34 +08:00
Huo Yaoyuan
fae6afa9e3
Create basic SongSelect class.
2017-03-14 16:44:35 +08:00
Huo Yaoyuan
0198593697
Make BeatmapInfoWedge:OverlayContainer and unify transforms.
2017-03-14 16:29:20 +08:00
smoogipooo
854212a7aa
Merge branch 'master' into beatmap_parsing
...
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
Huo Yaoyuan
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
DrabWeb
6bd9e3cac1
+Score ranks
2017-03-13 18:34:43 -03:00
Huo Yaoyuan
14a22f032f
Fix beatmap panel removal.
2017-03-14 04:35:43 +08:00
DrabWeb
8e90e05f23
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
2017-03-13 12:31:46 -03:00
DrabWeb
442a2c97db
Merge conflicts
2017-03-13 09:44:22 -03:00
DrabWeb
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
DrabWeb
9912f5f9e1
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
2017-03-13 09:33:25 -03:00
smoogipooo
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
Dean Herbert
01c379da19
User invariant culture sorting.
2017-03-09 14:02:20 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
Dean Herbert
9908c1905d
Add keyboard shortcuts at song select for mod/random/options.
2017-03-06 17:32:12 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome.
2017-03-06 17:06:48 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support.
2017-03-06 14:52:37 +09:00
Dean Herbert
81cc27e104
Fix typo.
2017-03-06 10:06:25 +09:00
Dean Herbert
7afcac3660
Move PreferredPlayMode to WorkingBeatmap.
2017-03-05 17:45:40 +09:00
DrabWeb
5719c6656a
Update to work with latest framework
2017-03-04 22:38:01 -04:00
DrabWeb
9cde20ffc7
Merge https://github.com/ppy/osu into leaderboards
2017-03-04 22:33:05 -04:00
DrabWeb
b02e413e56
Removed LeaderboardFade fully
2017-03-04 22:30:48 -04:00
DrabWeb
269c139d2a
Flags(redoing later), glowing text, proper Score and User usage
2017-03-04 22:29:52 -04:00
Thomas Müller
73fef85b12
Remove unnecessary usings
2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
Jorolf
7eebee36ab
Merge branch 'master' into moarOptions
2017-03-04 16:11:27 +01:00
Jorolf
5c5066e1ae
renamed local groups
2017-03-04 15:30:14 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow
2017-03-04 23:28:39 +09:00
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers).
2017-03-04 23:24:13 +09:00
Dean Herbert
389635c7ed
Avoid panel state changes when performing a sort.
2017-03-04 22:05:16 +09:00
Dean Herbert
8f3621ca24
Make selectGroup a private method.
2017-03-04 22:05:02 +09:00
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01:00
DrabWeb
d1bad34434
Enter animation, remove testing mod icons
2017-03-04 05:01:55 -04:00
Thomas Müller
a2b79de672
Add comments to CarouselContainer
2017-03-04 09:34:39 +01:00
Thomas Müller
aaa1f766af
Fix beatmap removal
2017-03-04 09:34:28 +01:00
Thomas Müller
9bddd1ed4b
Fix broken CarouselContainer animations
...
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
2017-03-04 09:33:24 +01:00
DrabWeb
d6f53c8b77
Moved test data to visual test
2017-03-04 04:05:31 -04:00
Thomas Müller
a97a7f1024
No more custom lifetimelist in CarouselContainer
2017-03-04 08:54:14 +01:00
DrabWeb
a112b354f0
Basic implementation of score UI
2017-03-04 03:37:34 -04:00
Jorolf
b9e4c920c5
SelectRandom doesnt select hidden groups now
2017-03-03 21:11:38 +01:00
DrabWeb
9d75ab85e9
Put mod select over beatmap options
2017-03-03 04:19:03 -04:00
Seth
fde509ab1d
Merge branch 'master' into mod-overlay
2017-03-03 04:12:42 -04:00
Dean Herbert
bdb130fabc
Avoid using right-to-left fill direction for now.
2017-03-03 16:54:59 +09:00
Dean Herbert
47845a7fbd
Fix button input handling.
2017-03-03 16:54:43 +09:00
Dean Herbert
b0ee728528
Remove full-screen background layer and add half-height holder.
...
Doesn't interact well with dialog popups. May add back later with complementing logic.
2017-03-03 16:11:23 +09:00
Seth
1891bdf51e
Merge branch 'master' into mod-overlay
2017-03-03 01:11:15 -04:00
Dean Herbert
fb6c25edf8
Fix more silly hacks.
2017-03-03 13:58:46 +09:00
Dean Herbert
2e01857782
Better constants.
2017-03-03 13:58:46 +09:00
Dean Herbert
00b139b3df
Remove hack (fixed at framework level).
2017-03-03 13:58:46 +09:00
Seth
2e74b4be60
Merge branch 'master' into beatmap-options
2017-03-03 00:52:45 -04:00
DrabWeb
f872330902
Fix BeatmapDeleteDialog namespace
2017-03-02 21:28:05 -04:00
DrabWeb
7a4b9c5571
osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options
2017-03-02 21:20:30 -04:00
Dean Herbert
ecd3453774
Fix potential nullref.
2017-03-02 22:17:14 +09:00
Dean Herbert
f9b87ad08c
Fix selection on entry to song select.
...
Also only shows sets with beatmaps for current play mode.
2017-03-02 22:02:32 +09:00
Dean Herbert
9ea83230aa
Formatting fixes.
2017-03-02 22:01:53 +09:00
DrabWeb
b856fb5991
Implemented beatmap options overlay
2017-03-02 08:40:55 -04:00
Dean Herbert
e399d6c6d1
Use bindable for PlayMode.
2017-03-02 21:16:58 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
Dean Herbert
51950eef43
Merge branch 'master' into master
2017-03-02 18:06:31 +09:00
Dean Herbert
ff5f0af2d3
Merge branch 'master' into popup-dialog
2017-03-02 16:42:20 +09:00
DrabWeb
6c680825ed
ModSections in Ruleset, fixed toolbar play mode changed not firing
2017-03-01 22:05:52 -04:00
DrabWeb
befdf68abe
Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
2017-03-01 18:41:00 -04:00
Thomas Müller
4d28696479
FlowDirection -> FillDirection
2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465
Update framewörk
2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
DrabWeb
d5d8352b62
Testing build
2017-02-28 17:09:31 -04:00
DrabWeb
570c95cb98
Merge https://github.com/ppy/osu into mod-overlay
2017-02-28 02:22:59 -04:00
DrabWeb
ce1798b8bc
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
2017-02-28 02:09:36 -04:00
DrabWeb
50d172be39
Added DialogManager(not wired up for desktop project yet)
2017-02-28 00:59:36 -04:00
DrabWeb
fbd9523596
Added beatmap delete dialog
2017-02-27 23:19:28 -04:00
default0
03889e6ca6
Update References to FlowStrategies
...
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Dean Herbert
e8b027130f
Remove unused variable.
2017-02-27 23:17:21 +09:00
Alex Amadori
8b336156f0
Merge remote-tracking branch 'upstream/master'
2017-02-27 14:55:44 +01:00
Dean Herbert
afdb95f4d5
Fix even more test regressions.
2017-02-27 20:39:04 +09:00
Dean Herbert
7c602a2af3
Update framework.
2017-02-27 15:55:57 +09:00
default0
8d91519d59
Update usage of FlowContainer and its subclasses
2017-02-26 21:32:43 +01:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Thomas Müller
f7d985fe18
Fix and refactor star difficulty calculation boilerplate
...
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
Alex Amadori
ace023f0c7
Refactor local vars named in a c-like fashion
2017-02-24 17:08:18 +01:00
Alex Amadori
90b0f035ad
Compute average of star ratings
2017-02-24 17:01:14 +01:00
Alex Amadori
51b6075210
Merge remote-tracking branch 'upstream/master'
2017-02-24 16:54:37 +01:00
Alex Amadori
e2ae03e798
Merge with upstream/master
2017-02-24 16:54:27 +01:00
Dean Herbert
ea4639932c
Simplify event names.
2017-02-24 17:21:14 +09:00
Dean Herbert
d24403e58e
Remove unused using statement.
2017-02-24 17:20:00 +09:00
Dean Herbert
958bf54c31
Add safe deletion support.
2017-02-24 17:08:13 +09:00
Dean Herbert
6c3bda18b6
Add beatmap deletion support.
...
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
2017-02-24 14:37:54 +09:00
Dean Herbert
3a89348413
Centralise access to WorkingBeatmaps.
...
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
2017-02-24 13:43:21 +09:00
Dean Herbert
355bbb6324
SearchTextBox should not handle shift-delete.
2017-02-24 11:44:40 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings
2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c
Update framework and add "Async" suffix to asynchronous methods
2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Seth
b4b88712ad
Merge branch 'master' into mod-overlay
2017-02-23 08:00:24 -04:00
Dean Herbert
6701cd9016
Merge branch 'master' into general-fixes
2017-02-23 17:04:53 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
DrabWeb
99f1f88c75
Merge https://github.com/ppy/osu into mod-overlay
2017-02-22 12:35:55 -04:00
Dean Herbert
aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
Alex Amadori
3d19199218
Fixed for star difficulty
2017-02-21 18:27:39 +01:00
Alex Amadori
6c161fb167
Merge remote-tracking branch 'upstream/master'
2017-02-21 18:15:46 +01:00
Dean Herbert
afba4fbfad
Merge remote-tracking branch 'upstream/master' into chat-improvement
2017-02-21 15:46:28 +09:00
Thomas Müller
417f146386
Add difficulty calculation
...
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Dean Herbert
520e040396
Add FocusedTextBox abstraction.
2017-02-19 17:59:22 +09:00
Alex Amadori
21cf96ec10
More sorting rookie mistakes
2017-02-18 16:23:13 +01:00
Alex Amadori
f48c83b787
Fix silly sorting mistakes
2017-02-18 15:56:29 +01:00
Alex Amadori
d92382c1aa
Merge remote-tracking branch 'upstream/master'
2017-02-18 15:18:26 +01:00
Alex Amadori
6bbbbd8f96
Implemented sorting in TestCasePlaySong
2017-02-18 15:11:40 +01:00
DrabWeb
006fb5502d
ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
2017-02-18 07:28:22 -04:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
Alex Amadori
1cd93f79b3
General sorting improvements
2017-02-18 07:59:01 +01:00
Alex Amadori
6b3ecc28b8
Fixed BeatmapPanels disappearing
2017-02-17 23:32:14 +01:00
Alex Amadori
7dcbefd50f
Implemented basic sorting logic
2017-02-17 17:41:53 +01:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
DrabWeb
9fc3726925
ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
2017-02-16 18:32:27 -04:00
DrabWeb
0a58fc62db
Added mod selection overlay
2017-02-16 16:05:03 -04:00
Dean Herbert
04346dbb92
Make osu! logo at song select correctly handle mouse focus.
2017-02-16 22:24:25 +09:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText.
2017-02-15 21:37:43 +09:00
Dean Herbert
d570a6d308
Handle cases where HitObjects were not parsed.
2017-02-15 12:38:10 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Dean Herbert
faa805e437
Fix SearchTextBox's handling of keyboard input to allow for IME input.
2017-02-09 12:33:24 +09:00
Dean Herbert
d230c3f9ac
Correct masking layers on song select.
2017-02-08 20:39:17 +09:00
Dean Herbert
050fa7fbe8
Adjust FilterControl to match design and give an absolute height.
2017-02-08 20:30:45 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better.
2017-02-08 20:30:45 +09:00
Dean Herbert
417b0817a9
Improve arrow key redirection at song select.
2017-02-08 15:30:20 +09:00
Dean Herbert
937c065af7
Clear content of SearchTextBox on first escape keypress.
2017-02-08 15:14:15 +09:00
Dean Herbert
bbf8d1000b
Update focus requesting code in SearchTextBox.
2017-02-08 15:13:56 +09:00
Dean Herbert
a6f02106a4
Use new placeholder logic.
2017-02-08 14:08:01 +09:00
Dean Herbert
5a89ba1040
Make OsuTextBox use OsuSpriteText.
2017-02-08 11:22:46 +09:00
