1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 19:18:03 +08:00
Commit Graph

4498 Commits

Author SHA1 Message Date
Dean Herbert
a73d672c2f Tidy up judgement line logic (and fix it displaying at the wrong place) 2019-08-30 16:40:39 +09:00
Dean Herbert
6640161bc1 Simplify event propagation 2019-08-30 15:51:36 +09:00
Dean Herbert
bdbfa7bd2f Fix class naming 2019-08-30 15:32:47 +09:00
Dean Herbert
835ee0aa2f Code quality fixes 2019-08-30 15:29:13 +09:00
Dean Herbert
1d77e3764d
Merge branch 'master' into accuracy-bar 2019-08-30 15:21:32 +09:00
Dean Herbert
84e4748268 Remove duplicate getAnimation function and improve namespacing 2019-08-30 12:59:58 +09:00
Dean Herbert
dc1046bf0c Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 12:53:05 +09:00
Dean Herbert
3f500131d4 Add basic xmldoc 2019-08-30 11:33:50 +09:00
smoogipoo
6641811125 Add EditorWorkingBeatmap for reuse of the playable beatmap 2019-08-29 19:41:12 +09:00
smoogipoo
b04a8ae856 Add xmldocs 2019-08-29 16:31:43 +09:00
smoogipoo
5db813b7a4 Add secondary interface for further abstraction 2019-08-29 16:26:39 +09:00
smoogipoo
7927b684d3 Hook up + use editor beatmap 2019-08-29 16:06:40 +09:00
smoogipoo
840f224619 Remove typed events to reduce complexity 2019-08-29 16:05:44 +09:00
smoogipoo
6949c96aaa Add initial EditorBeatmap structure 2019-08-29 15:17:27 +09:00
Joehu
73fd3cf03c Fix gameplay menu button initial hover animation 2019-08-28 19:00:01 -07:00
Dean Herbert
7ccc409df7 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7 Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
7885c79467 Make bindables private 2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence 2019-08-27 14:12:59 +09:00
smoogipoo
6368189d46 Refactor 2019-08-27 11:59:25 +09:00
Andrei Zavatski
9321f20884 Move arrow to the first line 2019-08-26 14:32:27 +03:00
Andrei Zavatski
fd0f42eee4 Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load 2019-08-26 14:11:24 +03:00
Dean Herbert
5e362d10b1 Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Dean Herbert
9881d3677d Simplify icon creation 2019-08-25 12:05:46 +09:00
Dean Herbert
ef397434f6 use GroupBy instead of Distinct+FindAll 2019-08-25 12:00:06 +09:00
Dean Herbert
a19a9b90ed Simplify group filter display 2019-08-25 11:39:26 +09:00
Lucas A
b204e4419a Rename SelectSortingMode & SelectGroupingMode -> SongSelectSortingMode & SongSelectGroupingMode 2019-08-24 10:34:54 +02:00
iiSaLMaN
8ccbe84f67 Loop on distinct rulesets of beatmap instead of all 2019-08-24 01:30:33 +03:00
iiSaLMaN
87340061e1 Add logic to create grouped difficulty icons in carousel beatmap set 2019-08-24 00:06:28 +03:00
Lucas A
ce5ee095b9 Fetch config bindables in BDL. 2019-08-23 14:03:56 +02:00
Lucas A
6bf31e8f91 Make song select grouping & sorting filters persistent 2019-08-23 13:15:38 +02:00
Dean Herbert
900df5d72f Fix crash on closing game 2019-08-23 13:02:50 +09:00
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop 2019-08-22 17:02:13 +09:30
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
Dean Herbert
7bf430afd5 Add padding back to difficulty icons on carousel 2019-08-21 21:16:06 +09:00
Andrei Zavatski
0ccfaeb8d9 Simplify moving average 2019-08-21 10:13:59 +03:00
Andrei Zavatski
a5acc913ea CI fixes 2019-08-21 09:58:47 +03:00
Andrei Zavatski
a994ad9c84 Use moving average to calculate arrow position 2019-08-21 09:40:15 +03:00
Andrei Zavatski
336f979480 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:39:28 +03:00
Andrei Zavatski
71cbc3525d Add/remove displays only if necessary 2019-08-21 09:16:09 +03:00
Andrei Zavatski
ab1586ff33 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 08:56:34 +03:00
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
Dean Herbert
724365c6d1 Minor tidying 2019-08-21 14:01:07 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Lucas A
33946f0458 Fix CI issues and update comments. 2019-08-20 11:18:41 +02:00
Andrei Zavatski
f72edb8bf8 Add missing blank line 2019-08-20 09:03:31 +03:00
Andrei Zavatski
596ee150c6 Add xmldoc for not obvious const 2019-08-20 08:51:41 +03:00
Andrei Zavatski
9f64e09625 Move HitErrorDisplayOverlay back to the HUD 2019-08-20 08:45:51 +03:00
Andrei Zavatski
d337f9b482 DefaultHitErrorDisplay -> BarHitErrorDisplay 2019-08-20 08:03:17 +03:00
Andrei Zavatski
c4251d512e Simplify bar building 2019-08-20 08:00:09 +03:00
Dean Herbert
caf8354f50
Merge branch 'master' into music-playback-improvements 2019-08-20 11:49:39 +09:00
Andrei Zavatski
415f180261 Delete extra semicolon 2019-08-19 22:53:28 +03:00
Andrei Zavatski
50c47568e4 Don't present Meh hit windows if it has no value 2019-08-19 22:45:27 +03:00
Andrei Zavatski
f1c3a60660 Add ability to select side 2019-08-19 22:04:27 +03:00
Andrei Zavatski
1bff103d32 CI fixes 2019-08-19 21:25:14 +03:00
Andrei Zavatski
6d3aa0520b Make HitErrorDisplay an abstract class 2019-08-19 20:44:06 +03:00
Andrei Zavatski
70084b5553 Move HitErrorDisplay outside of the HUD 2019-08-19 20:28:03 +03:00
Andrei Zavatski
f70a7abea3 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-19 19:36:28 +03:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
9c069f6f22
Merge branch 'master' into unpause-on-selection-change 2019-08-19 13:15:46 +09:00
Dean Herbert
1f00793891 Unpause music when changing selection at song select 2019-08-19 11:30:04 +09:00
Lucas A
3fcd786198 Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control. 2019-08-18 19:32:56 +02:00
Andrei Zavatski
4c817b18b7 Use direct cast 2019-08-18 17:03:11 +03:00
Andrei Zavatski
dd6351b8ca Apply suggested changes 2019-08-18 16:51:16 +03:00
Andrei Zavatski
6c60db550f Fix crash if ruleset has no Meh hit windows 2019-08-18 16:24:13 +03:00
Andrei Zavatski
55cd1cecdf Add missing blank line 2019-08-18 15:53:42 +03:00
Andrei Zavatski
8740ebd13f Simplify layout 2019-08-18 15:45:18 +03:00
Andrei Zavatski
a59a14c9e6 Add setting to enable/disable hit error visibility 2019-08-18 15:01:04 +03:00
Andrei Zavatski
ee5568e596 Use Queue instead of List for stored Judgements 2019-08-18 14:43:34 +03:00
Andrei Zavatski
50133ba863 naming adjustments 2019-08-18 02:57:12 +03:00
Andrei Zavatski
906984ad95 Fix the math 2019-08-18 02:49:07 +03:00
Andrei Zavatski
f7024b513e Visual improvements 2019-08-18 01:43:43 +03:00
Andrei Zavatski
94dbd6386f Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-18 01:14:27 +03:00
Dean Herbert
3dc81bdad5 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:19:46 +09:00
Dean Herbert
4fa9abeece Replace DifficultyColouredContainer with a more scalable solution 2019-08-17 15:16:24 +09:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip 2019-08-17 13:45:20 +09:00
Dean Herbert
b57298406f Fix right click blocking not resetting correctly 2019-08-15 19:25:33 +09:00
Dean Herbert
0f4bada21e Fix right click absolute scrolling interfering with context menus 2019-08-15 18:27:45 +09:00
Dean Herbert
e73a9c2748 Fix song select context menus displaying off-screen 2019-08-15 14:06:29 +09:00
Dean Herbert
f355cff8bc Apply reviews 2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784 Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip 2019-08-15 11:54:59 +09:00
smoogipoo
e356cc8d9e Refactor MatchBeatmapPanel for thread safety 2019-08-13 17:57:16 +09:00
smoogipoo
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
smoogipoo
92c2dafa12 Tighten accessibility 2019-08-13 17:34:16 +09:00
smoogipoo
6b57c9801d Cull some unnecessary whitespace 2019-08-13 17:32:43 +09:00
smoogipoo
2b155e5407 Merge remote-tracking branch 'origin/master' into multi-room-update 2019-08-13 17:03:44 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
Andrei Zavatski
982066dfdf Convert to method group 2019-08-12 10:38:34 +03:00
Dean Herbert
75cb0d093b Use description correctly
Required for localisation
2019-08-12 16:10:48 +09:00
Andrei Zavatski
cb910a6518 Replace if/else statement 2019-08-12 10:02:45 +03:00
Andrei Zavatski
5b68a2f34a Rename trackManager to previewTrackManager 2019-08-12 09:50:49 +03:00
Andrei Zavatski
520924b440 Don't create a new request if onlineId is null 2019-08-12 09:45:21 +03:00
Andrei Zavatski
6095480a54 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-12 09:36:15 +03:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim 2019-08-12 05:46:15 +09:00
Dean Herbert
9ac4870a21
Merge branch 'master' into triangles 2019-08-12 02:24:45 +09:00
Dean Herbert
359261d4a4 Fix game not starting if intro music is disabled 2019-08-12 02:04:06 +09:00
Andrei Zavatski
e7964c165f Make judgement lines alive for a bit longer 2019-08-11 19:09:50 +03:00
Andrei Zavatski
3136d46c7f Do not generate new judgement line on miss 2019-08-11 19:04:56 +03:00
Andrei Zavatski
5e0ac28ca8 Add basic colours 2019-08-11 18:30:03 +03:00
Andrei Zavatski
177a317a48 rename AccuracyBar to HitErrorDisplay 2019-08-11 18:11:49 +03:00