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

7566 Commits

Author SHA1 Message Date
EVAST9919
5caca1d328 Don't use '#' in RankDisplay for now 2017-10-05 05:27:52 +03:00
EVAST9919
cb0dbc6d9e Fix shrinking bar lingering on the screen for too long 2017-10-05 05:23:18 +03:00
EVAST9919
cc99678a96 Remove useless usings 2017-10-05 05:09:23 +03:00
Dean Herbert
20bf0502ab Use scheduling rather than raw transform delays 2017-10-05 10:03:48 +08:00
EVAST9919
22a59d753b Make all the overlays IStateful 2017-10-05 04:38:13 +03:00
EVAST9919
80fb14e3dc Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-04 14:50:02 +03:00
Dean Herbert
4930dfe87e Merge pull request #1328 from EVAST9919/clickable_users
Show mapper's profile when clicking on avatar in BeatmapSetOverlay
2017-10-04 12:12:02 +08:00
EVAST9919
d61e72b5a3 Merge remote-tracking branch 'refs/remotes/ppy/master' into clickable_users 2017-10-03 01:51:10 +03:00
EVAST9919
aafead5057 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-03 01:34:42 +03:00
Dan Balasescu
da4af724db Merge pull request #1335 from peppy/catch-refactors
osu!catch refactoring
2017-10-02 23:30:44 +09:00
Dean Herbert
37393ab2c9 Move brace 2017-10-02 22:24:22 +08:00
Dean Herbert
3338024c17 Fix incorrect whitespace 2017-10-02 22:12:53 +08:00
Dean Herbert
7168629b2a Remove CatcherArea abstraction
Also fixes catcher size being relative to aspect ratio.
2017-10-02 21:55:37 +08:00
Dean Herbert
12a9cbad56 Allow Beatmap to populate some metadata defaults if they aren't provided via BetamapInfo 2017-10-02 21:54:26 +08:00
Dean Herbert
66afba6219 Allow TestCasePlayer to instantiate only one ruleset type 2017-10-02 20:48:24 +08:00
EVAST9919
b6ed977e1e Fix hard crash and fix breaks have been initialized twice 2017-10-02 09:04:03 +03:00
EVAST9919
7052462863 Update inline with framework 2017-10-02 08:51:00 +03:00
EVAST9919
c2f487aa3e Add Rank as a property to the Score Processor 2017-10-02 05:56:38 +03:00
EVAST9919
5ce2723719 Don't use linq query 2017-10-02 05:12:56 +03:00
EVAST9919
ac6c323f93 Clear all tasks and transforms when resetting Breaks 2017-10-02 00:44:57 +03:00
EVAST9919
b62f2437ac Don't allow counter became 0 2017-10-01 23:38:11 +03:00
EVAST9919
2f852d705e Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-01 23:10:49 +03:00
Dean Herbert
cecfd7b0f3 Merge pull request #1323 from smoogipoo/editor-screen-selection
Add screen selection tabcontrol to the editor
2017-10-01 20:10:38 +08:00
Dean Herbert
7bbfad4695 Merge branch 'master' into editor-screen-selection 2017-10-01 20:05:49 +08:00
Dan Balasescu
75156ada73 Merge pull request #1331 from Francesco149/master
Only convert chords into strong hits for mania -> taiko
2017-10-01 19:08:45 +09:00
Franc[e]sco
5e751ea0ec Only convert chords into strong hits for mania -> taiko 2017-10-01 00:15:23 +02:00
EVAST9919
92c3d722b4 Show mapper's profile when clicking on avatar in BeatmapSetOverlay 2017-09-30 05:41:32 +03:00
smoogipoo
21c6a63fa1 Use using for Description 2017-09-29 20:03:09 +09:00
smoogipoo
7b4348254c Don't use new 2017-09-29 20:02:55 +09:00
Dean Herbert
eed358a2c1 Merge branch 'master' into editor-screen-selection 2017-09-29 18:24:46 +08:00
smoogipoo
775e8bada5 Make the background bottom corners look nice with the new hover functionality 2017-09-29 15:13:38 +09:00
smoogipoo
b2eab1f435 Set the hover background colour as dictated by flyte 2017-09-29 15:09:56 +09:00
smoogipoo
6bb5210c7c Remove the parentSizedBox 2017-09-29 15:09:28 +09:00
Dan Balasescu
04f3802cc0 Merge pull request #1327 from EVAST9919/context_menu_test_fix
Fix TestCaseContextMenu not being updated inline with previous changes
2017-09-28 23:14:53 +09:00
Dan Balasescu
61bf19bbab Merge branch 'master' into context_menu_test_fix 2017-09-28 22:58:15 +09:00
Dan Balasescu
4258e7cdb5 Merge pull request #1326 from EVAST9919/wave_cleanup
Clean up Wave in WaveOverlayContainer
2017-09-28 22:56:09 +09:00
EVAST9919
e7632b6e6f Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-28 14:44:31 +03:00
EVAST9919
ca1f96208a Fix TestCaseContextMenu not being updated inline with previous changes 2017-09-28 14:31:02 +03:00
EVAST9919
75cd6eeb1c Clean up Wave in WaveOverlayContainer 2017-09-28 14:20:19 +03:00
Dan Balasescu
de840a5c9e Merge pull request #1325 from peppy/no-more-dynamic
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
2017-09-28 01:21:24 +09:00
Dean Herbert
4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08:00
smoogipoo
8688d63a9e Update framework 2017-09-28 00:48:21 +09:00
smoogipoo
95364d0173 No more box background 2017-09-27 22:15:11 +09:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
smoogipoo
545c375199 Update design of EditorMenuBar to match flyte's design more closely 2017-09-27 22:01:03 +09:00
Dan Balasescu
ec156fe9ca Merge pull request #1321 from peppy/import-test-resiliency
Make import tests more resilient to race condition failures
2017-09-27 16:07:41 +09:00
Dean Herbert
990ef3ca56 Make import tests more resilient to race condition failures
Also centralises wait-or-assert logic.
2017-09-27 14:51:01 +08:00
Dan Balasescu
415b0b299c Merge pull request #1314 from peppy/fix-invisible-marker
Editor timeline fixes
2017-09-27 15:09:33 +09:00
Dan Balasescu
5dceee2e36 Merge branch 'master' into fix-invisible-marker 2017-09-27 14:53:58 +09:00
Dan Balasescu
5a3abadfe1 Merge pull request #1320 from peppy/api-state-fixes
Make APIAccess's state only privately settable
2017-09-27 14:53:16 +09:00