1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 20:53:26 +08:00
Commit Graph

1055 Commits

Author SHA1 Message Date
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Joehu
d476842c44 Fix FooterButton clicking area 2018-07-02 22:03:17 -07:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder 2018-07-02 17:17:40 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dean Herbert
2c597874bf Fix leaderboard showing placeholder briefly when entering song select 2018-07-01 18:17:02 +09:00
smoogipoo
6d6436c8d3 Fix ruleset not getting updated if changed 2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626 SongSelect needs to recache as IBindable 2018-06-29 20:50:30 +09:00
Dean Herbert
06bd3d4815 Use IBindable where possible 2018-06-29 20:28:28 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset 2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b Ensure toolbar triggers updates to SongSelect's ruleset 2018-06-29 19:32:42 +09:00
Dean Herbert
6d6fcc953b Trim lines 2018-06-29 19:25:20 +09:00
Dean Herbert
a377e87bf6 Add missing licence headers 2018-06-28 17:34:04 +09:00
Dean Herbert
c44a81bdf5 Add word wrap support 2018-06-28 13:04:39 +09:00
Joehu
8518fce4a9 Fix osu!supporter naming 2018-06-27 17:57:55 -07:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad Fix review issues 2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f Remove error logging
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572 Move leaderboard update scheduling to a more central method 2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
96100a2200 Remove schedule logic (seems unnecessary) 2018-06-20 17:41:48 +09:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
smoogipoo
e77084bec4 Give OsuScreen a mutable BindableBeatmap 2018-06-06 20:19:53 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips 2018-06-06 09:06:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
DrabWeb
a7bab14b30 Add tooltip to ScoreComponentLabel. 2018-06-03 22:26:30 -03:00
DrabWeb
db4c26e1ab Rewrite ScoreComponentLabel. 2018-06-03 22:22:44 -03:00
Joehu
bd7c9cd8bf Set 'Colour' when creating 'textFlow' 2018-06-03 17:41:34 -07:00
Joehu
5c713ac2ab Use default colour in MetadataSection 2018-06-03 07:51:57 -07:00
Joehu
dc2a004c87 Remove link colours for all unlinked text 2018-06-02 12:04:58 -07:00
Dean Herbert
5c2a2e394e Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
2018-06-01 20:31:29 +09:00
Joehu
b4d621a2cb Add link colour to beatmap source 2018-05-31 10:21:22 -07:00
Dan Balasescu
76567ae98b
Merge branch 'master' into song-selet-enumerable 2018-05-31 14:42:58 +09:00
Dean Herbert
a28e71995d Offload database query to task
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
Dean Herbert
54e53f7190 Fix player getting loaded when exiting song select 2018-05-30 15:48:20 +09:00
smoogipoo
f1ac84d95b Fix base.CreateLocalDependencies sometimes not being called 2018-05-24 13:03:25 +09:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
Joehu
46c6c1d07e Allow drag clicking footer and filter on song select 2018-05-20 20:25:39 -07:00
Dean Herbert
d20011ba58 Fix an endless feedback loop 2018-05-17 17:56:29 +09:00
Dean Herbert
db0470243a Fix nullref when changing ruleset at main menu 2018-05-13 12:55:54 +09:00
smoogipoo
fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
smoogipoo
816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
smoogipoo
fbd7ccc03f Make BeatmapInfoWedge display properly for converts 2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00