1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 11:47:24 +08:00
Commit Graph

2166 Commits

Author SHA1 Message Date
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
Dean Herbert
a83add8540 Tidy up events 2017-12-04 20:30:56 +09: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
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
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
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
7f1f886406 implemented method formatting into chat. Also added all necessary files to the .csproj 2017-12-01 21:04:24 +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
bf386598b6 Added a new "undelete" button that restores every beatmap with "DeletePending" set to true. 2017-11-30 10:58:32 +01:00
Nicolas Brassard
36cfa552f4 Fix SensitivitySlider keyboard control 2017-11-29 23:03:26 -08: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
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
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
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
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
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
Dan Balasescu
98de969b47
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:56:44 +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
Aergwyn
ba0b16dc0b setting BeatmapSets as list to prevent endless LINQ query chain 2017-11-26 19:35:58 +01:00
Dean Herbert
c5aacb75c6 Add hover sounds to mod buttons 2017-11-26 17:21:22 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +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
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
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section 2017-11-24 22:51:11 +01:00
Dean Herbert
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09: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
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
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
Dean Herbert
6e51664544
Merge branch 'master' into beatmap-overlay-download 2017-11-23 17:11:28 +09: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
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
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
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
553a7947d7 Remove AsyncLoadWrapper dependence in MusicController 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
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +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
1f379cab8f move BeatmapMetadataContainer to a separate class 2017-11-19 14:17:14 +01:00
smoogipoo
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09: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
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
naoey
97c5956083 Make download buttons disappear instead of closing overlay.
- Also unbind event handlers
- Remove unused field
2017-11-16 19:17:22 +05:30
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
Dean Herbert
62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
naoey
df53b884ea Removed unused stuff. 2017-11-15 18:00:19 +05:30
naoey
bbe555dc3c Pass noVideo flag on... 2017-11-15 17:49:41 +05:30
naoey
5aeeb9aac6 Merge remote-tracking branch 'upstream/master' into beatmap-overlay-download 2017-11-15 17:38:38 +05:30
Dan Balasescu
70d960ba73
Merge branch 'master' into remove-sub-scroll 2017-11-15 19:26:42 +09:00
Dean Herbert
fda810eb8f Remove scrollability from sub-areas in beatmap overaly
The areas that are scrollable inside the beatmap overlay make for a very frustrating experience. Let's disable them for now.
2017-11-15 19:02:56 +09:00
Dean Herbert
af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00
EVAST9919
60a2d84e09 Make the x position depends on the avatar size 2017-11-15 10:43:32 +03:00
EVAST9919
093ebb8b17 Apply suggested changes 2017-11-15 10:21:07 +03:00
Dean Herbert
7dd2720b4b
Merge branch 'master' into beatmap_scores 2017-11-15 13:41:38 +09:00
Dean Herbert
6ef60d0b4e
Merge branch 'master' into beatmap-overlay-scores 2017-11-15 13:18:32 +09:00
EVAST9919
8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
Dean Herbert
fa4ae72a06
Merge branch 'master' into warning-fixes 2017-11-14 20:43:23 +09:00
Dean Herbert
4b9edc4645
Merge branch 'master' into profile_beatmaps 2017-11-14 20:27:17 +09:00
Dean Herbert
44671ad9cb Move common width definition to base class 2017-11-14 19:03:50 +09:00
Dean Herbert
f96f7e696d Tidy up variables a bit 2017-11-14 18:53:09 +09:00
Dean Herbert
160b988735 Reduce number of rqeuests to display beatmaps in profile
Comes at the cost of losing some information which should be loaded. This will be fixed at the osu-web end.
2017-11-14 18:51:41 +09:00
EVAST9919
08ce2705c6 Add pending and graveyarded beatmapsets to profile page 2017-11-14 08:26:44 +03:00
smoogipoo
cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
EVAST9919
fa6d3f9792 Reduce isLoading calls 2017-11-13 18:49:10 +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
0168b7eb88 Merge remote-tracking branch 'upstream/master' into profile-overlay-visual 2017-11-13 21:21:57 +09:00
Unknown
16e48ed187 Hook up download logic with BeatmapSetOverlay download buttons.
- Add noVideo option to DownloadBeatmapSetRequest
- Make Download fire an event with new download instead of returning it
2017-11-12 18:41:10 +05:30
EVAST9919
96e99d996b Add TestCase 2017-11-12 09:01:13 +03:00
EVAST9919
1792075cf9 Loading animation fix 2017-11-12 07:50:01 +03:00
EVAST9919
7c0b13f9ef CI fixes and minor visual improvements 2017-11-12 07:31:08 +03:00
EVAST9919
569780d37b Move Api request outside the scores container itself 2017-11-12 07:05:50 +03:00
EVAST9919
36ac002820 Fix incorrect null check 2017-11-11 18:25:16 +03:00
EVAST9919
74bcc61a67 Fix possible overlapping 2017-11-11 07:51:07 +03:00
EVAST9919
057ada0183 Fix nulls 2017-11-11 07:50:40 +03:00
EVAST9919
944bdc1c25 CI fixes 2017-11-11 07:07:41 +03:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
EVAST9919
3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919
c2f3971188 Extend Beatmap Set Response 2017-11-10 03:01:11 +03:00
EVAST9919
68c4da0810 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-09 20:02:47 +03:00
EVAST9919
a9b58a2ad2 Drawable score visual improvements 2017-11-09 17:12:06 +03:00
EVAST9919
edeeefea3b Fix missing text has been shown before api request has been completed 2017-11-08 20:42:24 +03:00
EVAST9919
13cc1fcc92 Fix wrong index offset 2017-11-07 14:30:44 +03:00
EVAST9919
8e806cd11c Simplify moving ball behaviour 2017-11-07 13:43:02 +03:00
EVAST9919
5946585a6f Apply suggested changes 2017-11-07 12:19:23 +03:00
EVAST9919
1b0e7e7145 Undo some useless changes 2017-11-07 03:44:21 +03:00
EVAST9919
60e6177b7f Use null propagation 2017-11-07 03:26:47 +03:00
EVAST9919
1063e18566 Don't show graph at all if there's no data to use 2017-11-07 03:16:27 +03:00
EVAST9919
461baf3b97 CI fixes 2017-11-07 03:05:12 +03:00
EVAST9919
28167388d6 Remove useless calls 2017-11-07 02:53:07 +03:00
EVAST9919
d10dcd82bc Rank Line Graph improvements 2017-11-07 02:39:48 +03:00
EVAST9919
a12052ac51 CI fix 2017-11-06 22:18:37 +03:00
EVAST9919
5d846bff7b Add (temporarily?) subrequest for each item to provide correct beatmap information 2017-11-06 22:05:04 +03:00
EVAST9919
b8b5c67cd2 Apply suggestion concerning the BeatmapSetType enum 2017-11-06 21:46:28 +03:00
EVAST9919
ebaef86432 Fix hard crash when opening beatmap with zero playcount in beatmap overlay 2017-11-06 21:28:01 +03:00
EVAST9919
21d8a18812 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-06 20:20:58 +03:00
smoogipoo
d24cd00a01 Merge remote-tracking branch 'origin/master' into settingsitem-getboundcopy 2017-11-06 12:39:35 +09:00
EVAST9919
729777a7e0 Remove useless variable 2017-11-04 18:38:02 +03:00
EVAST9919
48c39b1d19 Add "Ranked & Approved Beatmaps" section 2017-11-04 00:53:58 +03:00
EVAST9919
761d885167 Add Favourite Beatmaps section in UserProfileOverlay 2017-11-03 20:25:21 +03:00
smoogipoo
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
Dean Herbert
d871c3fdda Fix test not working due to null refs 2017-10-30 20:55:23 +09:00
Dean Herbert
1ae0eff6ad Add some sanity to request/drawable creation logic 2017-10-30 19:40:42 +09:00
Dean Herbert
a51e64b2d1 Remove unnecessary schedule 2017-10-30 19:16:16 +09:00
Dean Herbert
069f4b1fcf Make DrawableScore abstract and move shared class to own file 2017-10-30 19:15:19 +09:00
Dean Herbert
096998d5f4 Fix user bindable being assigned rather than bound 2017-10-30 19:08:15 +09:00
Dean Herbert
b660366d96 ScoreContainer -> PaginatedScoreContainer 2017-10-30 19:06:40 +09:00
Dean Herbert
dce7d1c910 Move pp score representation to own file 2017-10-30 19:05:13 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores 2017-10-30 18:48:26 +09:00
Dean Herbert
7bc0ef44f2
Merge branch 'master' into beatmap-preview-fix 2017-10-30 16:22:47 +09:00
Shane Woolcock
22d222354c Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables 2017-10-26 18:45:20 +10:30
Jorolf
b2c3ba05d7 remove redundant stuff 2017-10-25 20:15:45 +02:00
Jorolf
0449639f41 remove inner classes and make User property a bindable 2017-10-25 20:07:12 +02:00
Dean Herbert
da01e81fc4 Async direct panel lookup 2017-10-25 22:14:47 +09:00
Dean Herbert
ed84cd2035 Greatly improve performance of direct panel loading
Still needs to be async'd
2017-10-25 22:14:41 +09:00
Dean Herbert
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
Jorolf
a2dfef301a remove unused parameters 2017-10-24 20:56:05 +02:00
Jorolf
f65d4b626e don't use c# 7 feature 2017-10-24 20:46:15 +02:00
Jorolf
9109b1b3f1 Merge branch 'master' of git://github.com/ppy/osu into recent-scores 2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73 show recent scores 2017-10-24 20:31:38 +02:00
Dean Herbert
15b9307b6c Fix WaveOverlayContainer appearing incorrectly on first PopIn 2017-10-24 20:26:27 +09:00
Dan Balasescu
ecd641c44a Merge branch 'master' into startup-load-improvements 2017-10-24 11:54:31 +09:00
Dean Herbert
00bb82215b Merge branch 'master' into revert-to-default-glow 2017-10-24 10:48:08 +09:00
Dan Balasescu
9eab2deee7 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 10:10:39 +09:00
Dean Herbert
0e04260b3c Move ToolbarUserArea initialisation to BDL 2017-10-24 10:08:42 +09:00
Dean Herbert
df20845fbb Share one context per file store for performance reasons
There is now a CreateContext method for retrieving a stand-alone context for threaded use.

We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Shane Woolcock
ea2934d92c Add KeyboardStep values for configuration options 2017-10-23 16:06:08 +10:30
Shane Woolcock
2e6a68d358 Rename indicator class, add colour/fade easing, and add tooltip 2017-10-22 16:12:30 +10:30
Shane Woolcock
5785af9f6a Reenable revert indicator on audio device since the potential crash was addressed in #1101 2017-10-22 14:22:57 +10:30
Shane Woolcock
59b10981dc CI fixes 2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07 Fix wrong license header 2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset 2017-10-21 16:05:37 +10:30
Shane Woolcock
b4d575fbcd Fix namespace and unnecessary using 2017-10-21 13:22:21 +10:30
Shane Woolcock
290fac8990 Temporarily disable revert functionality for audio device, since it crashes 2017-10-21 13:17:03 +10:30
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Shane Woolcock
2c7343e965 Add revert-to-default glow for settings items 2017-10-21 12:44:47 +10:30
Dean Herbert
35ce6fd2bd Merge branch 'master' into notification-thread-safety 2017-10-20 11:48:14 +09:00
Dan Balasescu
afaf3b4116 Merge branch 'master' into notification-thread-safety 2017-10-19 21:12:53 +09:00
Dean Herbert
518e5a2245 Make ProgressNotification's status and progress thread-safe
Quite regularly a task will hold a reference to a progress notification and udpate it as progress is made. Therefore these operations should be thread-safe.
2017-10-18 10:07:20 +09:00
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Huo Yaoyuan
5a684f926f CI fixes. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
f837117495 Use localisation engine instead of asking current culture directly. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
90592b0757 Construct DwarableScore using null weight. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
06fe874594 CI fixes. 2017-10-15 16:53:30 +08:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
Huo Yaoyuan
192ebe776f Use localisation engine instead of asking current culture directly. 2017-10-15 16:30:52 +08:00
Huo Yaoyuan
bed5a64ee2 Construct DwarableScore using null weight. 2017-10-15 16:15:35 +08:00
EVAST9919
bd7bc2c0d2 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix 2017-10-15 00:14:59 +03:00
Dan Balasescu
31b26e1d0a Merge branch 'master' into back-to-desktop 2017-10-14 16:18:28 +09:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
37ed710cbe Merge branch 'master' into fix-duplicate-user 2017-10-14 13:36:53 +09:00
Dean Herbert
9385fd1cfa Merge branch 'master' into better-medal-loading 2017-10-14 12:29:15 +09:00
smoogipoo
c3b9644d77 Move infoFlow to local variable 2017-10-14 11:59:18 +09:00
EVAST9919
e8f85a08b8 Fix audio preview still playing after closing the beatmap overlay 2017-10-14 05:58:06 +03:00
smoogipoo
1efb33210f Only update positions when the medalContainer is loaded. 2017-10-14 11:40:49 +09:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
Dean Herbert
3644fa46be Make sure the loading overlay is hidden when preview is user cancelled 2017-10-14 10:53:39 +09:00
Jorolf
2938ca9488 fix loading animation not playing 2017-10-13 20:44:05 +02:00
Dean Herbert
c660957329 Hide (most) profile sections that aren't populated yet 2017-10-13 20:29:19 +09:00
Dean Herbert
15373c71b6 Allow scores to open beatmap overlay
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
Dean Herbert
7550b461e3 Add individual beatmap set lookup request 2017-10-13 19:57:59 +09:00
Dean Herbert
ead88224c5 Move ModIcon tooltip to base implementation 2017-10-13 19:14:43 +09:00
Dean Herbert
146d800bda Make weight nullable rather than using weird negative defaults 2017-10-13 19:02:50 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
070aceef1e Move font and text size to class ProfileLink class 2017-10-13 17:03:31 +09:00
Dean Herbert
77c98a34e3 Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip 2017-10-13 17:00:26 +09:00
Dean Herbert
5b16f5d3b5 Remove unused field 2017-10-13 14:19:25 +09:00
Dean Herbert
f9a1240325 Merge remote-tracking branch 'upstream/master' into direct-previews 2017-10-13 14:06:46 +09:00
Dean Herbert
abf5418080 Apply some renames and refactoring of loading logic
Reduced publicly facing properties where possible. Also fixes a potentially bad state issue when the beatmapset was changed while a load was in progress.
2017-10-13 14:06:34 +09:00
Dean Herbert
00f7007036 Merge remote-tracking branch 'upstream/master' into fix-medal-overlay 2017-10-12 16:56:40 +09:00
EVAST9919
82b333740d Apply suggestions 2017-10-11 15:20:23 +03:00
EVAST9919
db38438a1e Merge remote-tracking branch 'refs/remotes/ppy/master' into user_overlay_tooltip 2017-10-11 15:12:17 +03:00
smoogipoo
9cb9151811 Move origin + anchor outside of ctor 2017-10-10 16:00:11 +09:00
EVAST9919
d1f02538cb Add tooltip to username in the profile overlay 2017-10-09 21:12:04 +03:00
Dean Herbert
222d0c8694 Fix visual regressions in MedalOverlay 2017-10-09 17:52:48 +09:00
Jorolf
f3ca6cc387 remove redundant stuff 2017-10-06 22:02:33 +02:00
Jorolf
de2181b8f5 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-10-06 21:02:48 +02:00
Jorolf
5a8b8dacbb move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton 2017-10-06 21:02:00 +02:00
EVAST9919
92c3d722b4 Show mapper's profile when clicking on avatar in BeatmapSetOverlay 2017-09-30 05:41:32 +03:00
Jorolf
2457df8e18 remove unused usings and reset the track to the start when playing again 2017-09-29 23:26:16 +02:00
Jorolf
259d49e6b9 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-29 23:09:33 +02:00
Jorolf
647304c14b move logic to DirectPanel and reuse stuff for the PreviewButton 2017-09-29 23:08:30 +02:00
EVAST9919
75cd6eeb1c Clean up Wave in WaveOverlayContainer 2017-09-28 14:20:19 +03:00
Dean Herbert
4a95d64239 Fix yellow line in login overlay not following size correctly
Also allows right click context menu to correctly extrude beyond the local masking.
2017-09-27 13:06:57 +08:00
Dan Balasescu
4881d01b7e Merge branch 'master' into close-beatmap-overlay 2017-09-27 13:51:13 +09:00
Dean Herbert
ec50834e98 Load osu!direct overlay to "newest maps" tab by default 2017-09-27 12:23:48 +08:00
Dean Herbert
3018d32b13 Close BeatmapSetOverlay when clicking outside of it 2017-09-27 11:22:47 +08:00
Dean Herbert
7c70d3d2cb Merge branch 'master' into storyboard_integration 2017-09-26 20:19:26 +08:00
Jorolf
355a7b6649 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-26 12:22:11 +02:00
Jorolf
1f2a82b7ab make PreviewPlaying readonly instead of abstract 2017-09-26 12:21:00 +02:00
Dean Herbert
40f597f762 Add download button to grid view panels 2017-09-26 00:18:35 +08:00
Dean Herbert
c1081e02b2 Close beatmap overlay on stray mouse clicks 2017-09-25 23:41:27 +08:00
Dean Herbert
c2bb3ea7bc Add minimal viable implementation of BeatmapSetOver in game 2017-09-25 17:58:03 +08:00
Dean Herbert
5be11f539b Rename to BeatmapSetOverlay 2017-09-25 17:26:27 +08:00
Dean Herbert
b83596b44d Merge branch 'master' into online-beatmap-set-overlay 2017-09-25 16:15:58 +08:00
Dean Herbert
a80f0d4858 Merge branch 'master' into chat-commands 2017-09-25 15:52:35 +08:00
Huo Yaoyuan
87c8278139 Use Array.Empty. 2017-09-24 03:45:46 +08:00
MrTheMake
34fb6ccdf5 Removed generic parameter function 2017-09-22 16:17:03 +02:00
MrTheMake
0a27916761 Added infoMessage class to the project, use the class for the /help command and handle command parameter better 2017-09-22 15:31:30 +02:00
MrTheMake
29707788f9 Code formatting 2017-09-22 15:29:04 +02:00
MrTheMake
dc5c046d4b Fixed wrong action message color 2017-09-22 14:33:20 +02:00
Damnae
2c245f4c22 Merge branch 'master' into storyboard_integration
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
2017-09-22 12:45:34 +02:00
MrTheMake
3e8941f8e1 Fix chat message style for non action messages 2017-09-22 11:35:07 +02:00
MrTheMake
dce577f92a Updated design 2017-09-22 11:30:01 +02:00
Dean Herbert
98c22e8111 Merge branch 'master' into master 2017-09-22 15:19:23 +08:00
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
Jorolf
9ee824ee66 some more unused stuff 2017-09-21 22:28:15 +02:00
Jorolf
14b8e9fd77 remove some redundant stuff 2017-09-21 22:15:42 +02:00
gabixdev
8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
Jorolf
72141935e8 make pagination work and remove duplication in RanksSection 2017-09-21 22:07:23 +02:00
DrabWeb
01e70f9bef Change type check to safe cast. 2017-09-21 14:53:42 -03:00
DrabWeb
46af17f00c Fix preview button potential null ref. 2017-09-21 14:46:51 -03:00
DrabWeb
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
Jorolf
5b90f45691 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-09-19 21:26:05 +02:00
jorolf
ce4a44000f Merge branch 'master' into direct-previews 2017-09-19 19:25:41 +02:00
Damnae
fcaabf7fdf Merge branch 'master' into storyboard_integration 2017-09-19 17:36:29 +02:00
Dean Herbert
096f53d769 Use new static IsDebug method 2017-09-19 16:07:00 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Jorolf
3e8ae93b34 appveyor 2017-09-17 22:54:23 +02:00
Jorolf
f8b09df13c Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-17 22:40:14 +02:00
Jorolf
be1e868a2a add previews to osu!direct 2017-09-17 22:39:34 +02:00
gabixdev
e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +02:00
DrabWeb
7e30c55bf4 CI fix. 2017-09-15 13:54:16 -03:00
DrabWeb
9787b92129 Merge branch 'online-beatmap-set-overlay' of https://github.com/DrabWeb/osu into online-beatmap-set-overlay 2017-09-15 13:47:34 -03:00
DrabWeb
1bac1e2c0e Make PreviewButton async. 2017-09-15 13:47:03 -03:00
Damnae
cb8029af9e Add a setting to hide storyboards. 2017-09-15 09:16:56 +02:00
MrTheMake
1e0ce6dabd Removed unnecessary casting of KeyBindingRow.FilterTerms 2017-09-14 13:18:50 +02:00
Dean Herbert
98b847b025 Add API retrieval support 2017-09-14 20:08:07 +09:00
Dan Balasescu
77d2b1e478 Merge branch 'master' into more_context_menus 2017-09-14 19:21:29 +09:00
Dean Herbert
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09:00
Dean Herbert
7cd6caacaa Update to support newer return structure from osu-web API 2017-09-14 18:08:12 +09:00
Dean Herbert
02fa9eeb3b Merge branch 'master' into online-beatmap-set-overlay 2017-09-14 16:52:44 +09:00
Dean Herbert
b7c9819680 Add context menus to chat names and user panels 2017-09-14 15:43:47 +09:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
DrabWeb
022e39b843 CI fixes. 2017-09-13 18:31:53 -03:00
DrabWeb
d83cd3ecf9 Make Header and it's components updateable. 2017-09-13 18:25:23 -03:00
DrabWeb
63c50f82eb Make Info updateable. 2017-09-13 12:37:18 -03:00
DrabWeb
574d7b24ff Fix some visual issues. 2017-09-13 12:07:31 -03:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert
f4f7ae12b3 Merge branch 'master' into channelselection-minimum-size 2017-09-13 15:40:22 +09:00
Dean Herbert
7681d97f10 Fix typo in user profile header
Replays watched, not replay watched.
2017-09-13 15:21:04 +09:00
Dean Herbert
7835269f95 Merge branch 'master' into channelselection-minimum-size 2017-09-13 14:21:44 +09:00
DrabWeb
0a5c963c4b Remove redundant .this 2017-09-13 00:18:00 -03:00
DrabWeb
9e6f94b818 Make BeatmapPicker buttons more independent. 2017-09-13 00:13:45 -03:00
DrabWeb
0e9dc6fb85 Don't recreate header buttons on beatmap change. 2017-09-12 23:55:48 -03:00
DrabWeb
d36fc13487 Make success rate percent move with the bar. 2017-09-12 23:46:21 -03:00
DrabWeb
97e5a0d4a3 CI fixes. 2017-09-12 23:41:10 -03:00
DrabWeb
08b5d4e16c Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-12 21:26:06 -03:00
DrabWeb
680f2e232c Cleanup. 2017-09-12 21:24:43 -03:00
DrabWeb
d09bcabc8f Add a background to the overlay. 2017-09-12 21:00:20 -03:00
DrabWeb
a291bd3020 Add second beatmap set to test, fix some visual issues. 2017-09-12 20:55:17 -03:00
DrabWeb
169bfe134b Fix incorrect BasicStats padding. 2017-09-12 20:24:48 -03:00
MrTheMake
a30bd90641 Merge branch 'channelselection-minimum-size' of https://github.com/MrTheMake/osu into channelselection-minimum-size 2017-09-12 18:48:11 +02:00
MrTheMake
9839a3b937 Smoothly transform the chat height when opening the channel selection 2017-09-12 18:47:21 +02:00
MrTheMake
c78695cfe0 Removed redundant call 2017-09-12 18:26:52 +02:00
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
DrabWeb
4be8899fb2 Move Length to BeatmapOnlineInfo. 2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0 Details and more data displaying. 2017-09-11 02:48:48 -03:00
DrabWeb
e61ab72c0d Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-11 01:24:52 -03:00
DrabWeb
54172ac6ad Move header button and details components to own files. 2017-09-11 01:21:53 -03:00
Dean Herbert
8d919e42c9 Fix nullref when loading MusicController VisualTest after Player VisualTest 2017-09-11 11:18:53 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
DrabWeb
aa9dfcc082 BeatmapPicker logic. 2017-09-09 19:05:22 -03:00
DrabWeb
cbd9c07aed BeatmapPicker design. 2017-09-09 18:19:43 -03:00
naoey
0c2bad1de4 Get rid of some properties and todos. 2017-09-09 12:44:27 +05:30
naoey
e67606e203 Return existing download if it exists. 2017-09-09 10:25:28 +05:30
DrabWeb
ecd6994d74 Added favourite/download buttons and author info. 2017-09-08 19:17:39 -03:00
DrabWeb
1d3139d3c3 Basic layout. 2017-09-08 18:32:07 -03:00
naoey
20becbe576 Use the specifically created progress action, add license header. 2017-09-09 01:53:42 +05:30
naoey
5a3814b02e
XMLdoc fixes and a cautionary check. 2017-09-09 01:04:55 +05:30
naoey
0e4973020a
Resharper and test case fixes. 2017-09-09 00:58:54 +05:30
naoey
00306b6e38
Maintain download progress between switching result views.
- Check for existing download requests on creating DirectPanel
- Actually remove downloaded beatmap from results
2017-09-09 00:57:48 +05:30
naoey
31a507372a
Don't show beatmaps that are already added. 2017-09-09 00:57:48 +05:30
naoey
20f93c83d6
Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
Dean Herbert
386147cc77 Merge branch 'master' into channelselection-minimum-size 2017-09-09 02:51:47 +09:00
MrTheMake
15dd8d9071 Mind the minimum size of the channel selection overlay 2017-09-08 18:21:42 +02:00
MrTheMake
5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert
5822a6cc96 Merge branch 'master' into ranks-section 2017-09-07 15:11:07 +09:00
Dean Herbert
e5308b6247 Method rename 2017-09-06 23:12:32 +09:00
Dean Herbert
da294c9605 Don't use base call when we don't have to 2017-09-06 23:10:08 +09:00
Dean Herbert
4f49a0c183 Simplify action 2017-09-06 22:58:21 +09:00
Dean Herbert
a7fa66b9f9 Fix CI issue 2017-09-06 22:41:03 +09:00
Dean Herbert
940c45b6d1 Fix visual styling and code styling 2017-09-06 21:43:20 +09:00
Dean Herbert
c6fa899b15 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-09-06 21:43:03 +09:00
smoogipooo
5508fa0fd9 Merge remote-tracking branch 'origin/master' into new-menus 2017-09-05 19:14:42 +09:00
smoogipooo
1904b5edfe Only store native position instead of input state. 2017-09-05 10:38:19 +09:00
smoogipooo
e9f0762440 Don't query GetContainingInputManager every Update. 2017-09-05 10:29:51 +09:00
smoogipooo
ad966f41f5 Fix CI error. 2017-09-04 15:26:09 +09:00
smoogipooo
722b7419d6 Clamp at the end points. 2017-09-04 15:06:21 +09:00
smoogipooo
04c3801fcc Add scrolling points so items can be dragged beyond the list. 2017-09-04 14:58:28 +09:00
smoogipooo
2ed20f5a6f Add better fix for items swapping erratically. 2017-09-04 14:20:40 +09:00
smoogipooo
3b575444be Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references
Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.
2017-09-04 13:12:12 +09:00
smoogipooo
9b0309e683 Use TakeWhile instead of reversing the list. 2017-09-04 11:28:15 +09:00
smoogipooo
9078444a62 Fix items jumping between two indices in the edge case, use a linear search for now. 2017-09-04 11:03:53 +09:00
smoogipooo
c72a9b1301 Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23 2017-09-04 09:42:24 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
d7d0e96e6b Merge branch 'master' into ranks-section 2017-09-01 18:46:53 +09:00
Dean Herbert
8e0d18d36f Add a button to restore all hidden difficulties 2017-09-01 18:26:01 +09:00
Kelvin
0e363fce1e Try to fix stuttering behavior 2017-08-29 22:26:06 -07:00
Dean Herbert
39b5b04700 Don't use Bindable for AccentColour
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Kelvin
e5bf3f6a6a Fix out of bounds 2017-08-29 00:46:11 -07:00
Kelvin
1eb31afd14 Get destination index using binarysearch 2017-08-29 00:39:17 -07:00
Dean Herbert
e53f2cb359 Merge branch 'master' into menu-mvvm 2017-08-29 15:57:19 +09:00
Kelvin
458c3a355f Rearrange dragging using cheeseburger icon only 2017-08-28 23:28:58 -07:00
Kelvin
636492b9cf Rearrange tracks in OnDrag 2017-08-28 22:59:28 -07:00
Kelvin
12be5b417d Use MathHelper.Clamp
- Fix formatting
2017-08-28 22:51:26 -07:00
Kelvin
2f5d8a7f88 Fixed code style errors 2017-08-28 01:08:51 -07:00
Kelvin
97ebf38288 Use PlaylistList to manage Prev/Next tracks 2017-08-28 00:56:03 -07:00
Kelvin
5c3b7ac12c Allow rearranging playlist tracks 2017-08-28 00:29:44 -07:00
smoogipooo
fc6c682d88 Update in-line with framework changes. 2017-08-28 14:42:52 +09:00
smoogipooo
66db3389f6 Update in line with framework changes. 2017-08-28 12:49:33 +09:00
Dean Herbert
ee85515d95 Changes in line with framework changes 2017-08-25 19:18:07 +09:00
smoogipooo
9f02000174 Update FilterControl using new AccentColour definition 2017-08-25 15:58:42 +09:00
smoogipooo
e83a554ffc Update CollectionsDropdown in line with framework 2017-08-25 15:58:09 +09:00
smoogipooo
923ffae42c Update SlimEnumDropdown in line with framework 2017-08-25 15:57:55 +09:00
smoogipooo
b42c9d21fe Update LoginSettings in line with framework. 2017-08-25 15:57:43 +09:00
Dean Herbert
782ab81a88 Merge branch 'master' into update-edge-effect-fades 2017-08-25 15:01:01 +09:00
Dean Herbert
70154d1036 Update usage of FadeEdgeEffect
Improves the visual appearance of DirectPanels' shadows too.
2017-08-25 14:58:19 +09:00
Dan Balasescu
0d7592d9a6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:35:38 +09:00
Dan Balasescu
ebf3300cb6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:06:33 +09:00
Dan Balasescu
1385a6a969 Merge branch 'master' into correct-direct-toolbar-icon 2017-08-25 13:05:47 +09:00
Dean Herbert
67b3cbce2f Fix beatmap background being disposed too early
Causes weird transitions on the music controller
2017-08-25 13:04:32 +09:00
Dean Herbert
86bde4b6b2 Use the correct icon for osu!direct in the toolbar 2017-08-25 13:03:34 +09:00
Dean Herbert
7055cb581d Load direct panels more asynchronously to avoid stutter 2017-08-25 11:54:35 +09:00
Dean Herbert
ca0d1b79b2 Disallow multiple download requests for the same panel 2017-08-25 11:54:18 +09:00
Dean Herbert
7f617e2c36 Remove downloaded beatmap panels from osu!direct 2017-08-25 11:53:41 +09:00
Dean Herbert
febf0348be Permit nulls to allow test cases to run successfully 2017-08-24 21:26:50 +09:00
Dean Herbert
0082640548 Add missing licence header 2017-08-24 20:25:18 +09:00
Dean Herbert
9adff5f697 Add osu!direct toggle to toolbar 2017-08-24 20:18:47 +09:00
Dean Herbert
32a23c7fe4 Add initial osu!direct beatmap download and import process 2017-08-24 20:16:03 +09:00
Dean Herbert
9c82593c9e Add cancel event to ProgressNotification 2017-08-24 20:15:45 +09:00
Dean Herbert
cacf256aad Add placeholder download method with progress bar 2017-08-24 18:51:50 +09:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
a2549157ca Add hover effects 2017-08-24 18:18:03 +09:00
Dean Herbert
4e1cf329c8 Move background logic to base class; reduce overdraw after set fades in 2017-08-24 17:39:39 +09:00
Dean Herbert
76a95495d3 Move shared code to base class 2017-08-24 17:30:10 +09:00
naoey
6291bd5ced Handle null current channel in setter, update framework. 2017-08-24 10:40:42 +05:30
naoey
3f403ba524 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-08-24 10:06:29 +05:30
naoey
2cace0e1ab Don't use virtual methods in ctor, always create closeButton. 2017-08-24 09:48:53 +05:30
Dean Herbert
c99ed6fd44 Add reset button
Also fixes a regression causing multiple rows to be displayed for a single action
2017-08-23 19:26:49 +09:00
Dan Balasescu
a18507b3b4 Merge branch 'master' into fix-incorrect-notification-count 2017-08-23 17:22:39 +09:00
Dean Herbert
efdd5eb152 Fix global key bindings being fetched with a non-null variant 2017-08-23 16:10:31 +09:00
smoogipooo
68e7cf854f Add variant names. 2017-08-23 14:19:14 +09:00
smoogipooo
c1860f2ce2 Make KeyBindingOverlay support variants as settings sub sections. 2017-08-23 12:49:30 +09:00
smoogipooo
38a4c84163 Load SettingsSubsection in load()
Fixes header not being displayed with variant bindings. This follows what SettingsSection does.
2017-08-23 12:48:53 +09:00
Dean Herbert
b2db550cb4 Fix notification count including fading (already closed) notifications 2017-08-23 12:47:20 +09:00
smoogipooo
a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
Dean Herbert
630d67405f Merge branch 'master' into update-changelog-notification 2017-08-23 00:12:59 +09:00
Dean Herbert
a257c6846e Merge branch 'master' into zero-notifications-closes 2017-08-22 22:45:52 +09:00
jorolf
3025fcdb25 Merge branch 'master' into ranks-section 2017-08-22 13:19:03 +02:00
Dean Herbert
480d839d67 Allow the notification overlay to close when all notifications are dismissed 2017-08-22 19:51:42 +09:00
Dean Herbert
ab0e3ccc55 Make SimpleNotifications support word wrap 2017-08-22 19:33:18 +09:00
Dean Herbert
97acff535d Tidy up conditionals 2017-08-22 18:21:00 +09:00
Dean Herbert
ff8ad30127 Add support for binding mousewheel actions 2017-08-22 14:44:34 +09:00
Dean Herbert
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
Dean Herbert
7693fc1382 Merge branch 'master' into mask-settings-overlay 2017-08-22 00:22:39 +09:00
Dean Herbert
1d0b89d592 Restore usage of AddRange 2017-08-21 18:51:14 +09:00
Dean Herbert
9ba2258f80 Add spaces for smoogipoo 2017-08-21 17:44:39 +09:00
Dean Herbert
877c69d5fe Add local chat echo support 2017-08-21 17:43:26 +09:00
Jorolf
9b20da94e7 change Query to AllRulesets 2017-08-19 22:07:03 +02:00
Jorolf
bae1340b50 mask the settings overlay 2017-08-19 17:00:01 +02:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
naoey
7ad4c046db Make current value behaviour between channels and tabs consistent.
- Trim whitespace
2017-08-18 13:35:48 +05:30
Dan Balasescu
f5c3af2f20 Merge branch 'master' into fix-nullref 2017-08-18 12:38:20 +09:00
Dean Herbert
02aa38d1c2 Merge branch 'master' into toolbar-button-swap 2017-08-18 11:18:19 +09:00
Dean Herbert
e4b832e8a6 Fix a possible nullref when login fails 2017-08-18 10:49:41 +09:00
MrTheMake
6118209200 Fix unlit initial state of the OnScreenDisplay 2017-08-17 18:46:16 +02:00
Dean Herbert
f459794665 Update MainSettings.cs 2017-08-17 18:11:15 +09:00
Dean Herbert
58b1e9c954 Remove unused DI retrieval 2017-08-17 17:47:55 +09:00
Dean Herbert
a19fc28cff Visually improve settings transitions and back button 2017-08-17 17:31:14 +09:00
naoey
4f7ae1ed8b Clear messages when the current channel is removed.
- Stop using TabContainer.Children
2017-08-17 09:00:45 +05:30
Dan Balasescu
69a3251f61 Merge branch 'master' into toolbar-button-swap 2017-08-17 10:39:02 +09:00
Thomas Müller
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
MrTheMake
94d664a626 Swap the order of the social and chat toolbar buttons 2017-08-16 17:00:30 +02:00
Dean Herbert
0c19202b9a Add basic back button 2017-08-16 23:20:18 +09:00
Dean Herbert
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert
71f83dbdfa Add null check for safety 2017-08-16 22:56:32 +09:00
Dean Herbert
5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Thomas Müller
16372d9b45 Merge branch 'master' into key-config-settings 2017-08-16 17:48:00 +09:00
Dean Herbert
7e1fc47b76 Fix forgotten rename 2017-08-16 17:43:01 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00
Dean Herbert
25a3835c3c Cancel pending sidebar expansion when a button is clicked 2017-08-16 17:06:20 +09:00
Dean Herbert
89987229de Merge remote-tracking branch 'origin/is-alive' into key-config-settings 2017-08-16 15:49:43 +09:00
Dean Herbert
a5007fc64f Fix some remaining usage of local InputManager instances 2017-08-16 13:07:18 +09:00
Dean Herbert
c221472d6e Code tidy-ups 2017-08-16 01:19:21 +09:00
Dean Herbert
72eb082f91 Use .Equals 2017-08-16 01:14:37 +09:00
Dean Herbert
9c75df884f Add initial implementation of KeyConfiguration overlay 2017-08-16 00:17:33 +09:00
Dean Herbert
143ff695ef Remove unused using statements 2017-08-15 17:44:04 +09: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
Dean Herbert
dccefe1c0e Make the settings sidebar optional
Also removes an unnecessary secondary list of SidebarButtons by using generic containers.
2017-08-14 14:40:48 +09:00
naoey
381c709639 Fix selectorTab Depth if it's wonky when new tabs are added. 2017-08-14 10:11:34 +05:30
naoey
8dbbc623c7 Add next tab selection logic in game, make IsRemovable public.
- Don't clear DrawableChannel when unjoined
2017-08-14 10:11:30 +05:30
naoey
3b6ffadcc7 Renaming to match framework changes.
- IsClosable -> IsRemovable
- EasingTypes -> Easing
- Also remove all messages on a channel being un-joined
2017-08-14 10:11:25 +05:30
naoey
2ae3ce8b91 Add ability to close chat tabs. 2017-08-14 10:11:14 +05:30
Dean Herbert
66fa84a451 Make settings more modular 2017-08-14 13:09:59 +09:00
Dean Herbert
fe2911f165 Fix some formatting issues 2017-08-13 10:36:57 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Jorolf
15e4e487e2 I hope this works 2017-08-09 22:58:06 +02:00
Jorolf
acc9b20b0f move another thing to LoadComplete instead of the constructor 2017-08-09 22:37:05 +02:00
Jorolf
c877a5a8b7 update TestCase 2017-08-09 19:26:27 +02:00
Jorolf
c2c9095b02 fix CI issues 2017-08-09 18:57:55 +02:00
Jorolf
274ebbd1f7 remove duplicated code and "simplify" ShowMore logic 2017-08-09 18:45:37 +02:00
Jorolf
9f005488f7 make it work again after merge 2017-08-09 17:32:09 +02:00
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
Huo Yaoyuan
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +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
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00