1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:47:25 +08:00
Commit Graph

16084 Commits

Author SHA1 Message Date
Andrei Zavatski
2b941a0d52 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-24 10:18:45 +03:00
Dean Herbert
997b49f6dc Change display to always show progress bar, only hiding seeking handle instead 2020-01-24 14:21:22 +09:00
Dean Herbert
da65fff48e Merge remote-tracking branch 'upstream/master' into collapse-graph-option 2020-01-24 13:55:42 +09:00
Dean Herbert
e4702ffe9e Fix editor rate adjustment polluting global beatmap rate 2020-01-24 13:10:02 +09:00
Dean Herbert
eb5abcab8c Rename and simplify circle logic 2020-01-24 12:01:40 +09:00
Dean Herbert
851b891285 Fix incorrect insert logic 2020-01-24 12:01:14 +09:00
Dean Herbert
c390348eab Merge remote-tracking branch 'upstream/master' into colour-score-meter 2020-01-24 11:45:33 +09:00
Dean Herbert
5863576ce4 Add comment as to why counter is zeroes only in Show method 2020-01-24 11:42:33 +09:00
Andrei Zavatski
6493f24547 Add TotalCommentsCounter to CommentsContainer 2020-01-23 15:56:01 +03:00
Andrei Zavatski
0c3120d965 Fix possible crash due to not loaded api 2020-01-23 12:59:53 +03:00
Andrei Zavatski
667fdb907c Call the method directly rather that trigger a bindable 2020-01-23 12:21:16 +03:00
Dean Herbert
ca94850ce4
Merge branch 'master' into view-comments-via-propery 2020-01-23 17:47:40 +09:00
Dean Herbert
a6d97f8ee6
Merge pull request #7577 from ProTheory8/mod-autoopen
Make Difficulty Adjust mod customisation menu open automatically
2020-01-23 17:03:04 +09:00
Dean Herbert
143d47ec93
Merge pull request #7538 from peppy/decouple-blueprint-container
Decouple blueprint container to allow usage in timeline
2020-01-23 16:13:51 +09:00
Dan Balasescu
0df9703c46
Merge branch 'master' into mod-autoopen 2020-01-23 16:04:43 +09:00
Dean Herbert
02ae92418f Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-23 15:54:46 +09:00
Dan Balasescu
e988976012
Merge branch 'master' into mod-autoopen 2020-01-23 15:34:19 +09:00
Dean Herbert
ccf911884b Remove passed in BaetDivisor 2020-01-23 15:31:56 +09:00
Dean Herbert
098d643955 Move beat snapping to its own interface 2020-01-23 14:39:56 +09:00
Dean Herbert
8ea354571c Update naming 2020-01-22 23:04:37 +09:00
Dean Herbert
8c29093d1c Merge remote-tracking branch 'smoogipoo/void-joystick-release-returns' into update-framework 2020-01-22 22:58:00 +09:00
Dean Herbert
8a7f7c5e46 Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework 2020-01-22 22:57:56 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
Dean Herbert
5f8ffd9346 Merge remote-tracking branch 'smoogipoo/void-release-returns' into update-framework 2020-01-22 22:57:40 +09:00
Dean Herbert
e2c4cffc9a Update framework 2020-01-22 22:57:09 +09:00
Dean Herbert
cbba708931
Merge branch 'master' into online-mod-settings 2020-01-22 22:15:41 +09:00
smoogipoo
03b61e4a5a Throw exception rather than returning nulls 2020-01-22 20:00:36 +09:00
ProTheory8
df92b0d3dc Merge branch 'master' into mod-autoopen 2020-01-22 15:01:53 +05:00
Dean Herbert
a28934f9f2
Enforce using get-only auto property where possible (#7566)
Enforce using get-only auto property where possible
2020-01-22 16:38:36 +09:00
Andrei Zavatski
bf2b71f7dd Cleanup OsuTabControl.AccentColour 2020-01-22 09:36:16 +03:00
Andrei Zavatski
87af482823 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-22 09:34:24 +03:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
Andrei Zavatski
14a961c95b Remove invariance in the OverlayTabItem 2020-01-22 04:41:10 +03:00
raouls555
03b6a3ddc3
Allow parsing hex colour codes with alpha 2020-01-21 23:22:08 +01:00
Dean Herbert
2aa8e7dbc9
Merge branch 'master' into get-only-auto-property 2020-01-21 18:56:44 +09:00
ProTheory8
61d7b63914
Readability Improvement 2020-01-21 09:30:11 +05:00
ProTheory8
02f26e4a4d
Update comment
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-01-21 08:44:22 +05:00
Andrei Zavatski
327d8c213b Rename Bar to TabControlBar 2020-01-21 06:25:13 +03:00
Andrei Zavatski
8bf19913c0 Add NotNull attribute 2020-01-21 06:03:48 +03:00
Andrei Zavatski
30edd80c8c Refactor OverlayHeader hierarchy 2020-01-21 06:00:12 +03:00
Andrei Zavatski
178a72f9b8 Make OverlayTabControl inherited from OsuTabControl 2020-01-21 05:24:49 +03:00
ProTheory8
41295bc27c Difficulty Adjust mod customisation menu opens automatically now 2020-01-20 21:06:36 +05:00
Dean Herbert
740bdee125 Apply remaining uncaught changes 2020-01-20 23:59:21 +09:00
smoogipoo
b62e3addf3 Apply input method signature refactorings 2020-01-20 20:30:25 +09:00
smoogipoo
40f502c6d1 Apply input method signature refactorings 2020-01-20 19:35:37 +09:00
smoogipoo
1b1003bd73 Refactor 2020-01-20 18:31:25 +09:00
Andrei Zavatski
843feb4e08 Add more xmldoc to ControllableOverlayHeader 2020-01-20 12:26:14 +03:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-20 17:08:59 +09:00
Andrei Zavatski
17a7a75707 Merge master with conflicts resolved 2020-01-20 08:52:03 +03:00