1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
Commit Graph

25382 Commits

Author SHA1 Message Date
Andrei Zavatski
34ffbcf2ae Adjust xmldoc 2020-01-24 10:24:44 +03:00
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
b06e4d89b8
Merge pull request #5247 from Aergwyn/collapse-graph-option
Add setting to show the song difficulty graph
2020-01-24 14:59:59 +09:00
Dean Herbert
2187dbd0c2 Rename steps in test for clarity 2020-01-24 14:37:37 +09: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
Dan Balasescu
9f8e3c21e0
Merge pull request #7594 from peppy/fix-editor-rate-pollution
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:36:47 +09:00
Dean Herbert
e4702ffe9e Fix editor rate adjustment polluting global beatmap rate 2020-01-24 13:10:02 +09:00
Dean Herbert
8122bdf2d8
Merge pull request #7317 from EVAST9919/colour-score-meter
Implement ColourHitErrorMeter
2020-01-24 12:28:03 +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
4bab8bcdcc
Merge pull request #7592 from EVAST9919/comments-counter-integration
Add TotalCommentsCounter to CommentsContainer
2020-01-24 11:43:28 +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
Dean Herbert
f5b280971f
Merge pull request #7460 from EVAST9919/view-comments-via-propery
Allow CommentsContainer refetch comments using a method
2020-01-23 19:17:48 +09: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
Andrei Zavatski
6c3c4f1ea6 Merge remote-tracking branch 'refs/remotes/ppy/master' into view-comments-via-propery 2020-01-23 12:14:50 +03:00
Dean Herbert
b8040ac99a
Merge pull request #7590 from peppy/update-country-names
Update country names
2020-01-23 18:03:35 +09: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
32fb87acec Update country names 2020-01-23 16:45:30 +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
Dan Balasescu
a9e4bdff33
Merge pull request #7588 from peppy/i-beat-snapping
Move beat snapping to its own interface
2020-01-23 16:04:34 +09:00
Dean Herbert
02ae92418f Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-23 15:54:46 +09:00
Dean Herbert
d3262a5667 Cache EditorBeatmap in test 2020-01-23 15:51:00 +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
2ef8714d67
Merge pull request #7587 from peppy/update-framework
Update framework
2020-01-23 11:06:37 +09:00
Dean Herbert
c0935b9b86 Update naming in tournament 2020-01-22 23:13:21 +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
3164585379
Add mod setting (de)serialization support (#7548)
Add mod setting (de)serialization support
2020-01-22 22:41:39 +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
Dean Herbert
fdd746a522
Merge pull request #7582 from raouls555/hex-alpha
Allow parsing hex colour codes with alpha
2020-01-22 13:01:35 +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