Dan Balasescu
9be3d7a161
Merge pull request #7591 from peppy/improve-song-select-uiscale
...
Improve song select display on ultrawide displays (or when UI scale is set low)
2020-01-24 19:14:46 +09:00
Dan Balasescu
d4306fed85
Merge pull request #7589 from peppy/timeline-maybe
...
Expand editor timeline functionality
2020-01-24 18:24:41 +09:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe
2020-01-24 18:08:29 +09:00
smoogipoo
027778acc1
Fix slider circles not being selected by default
2020-01-24 17:51:24 +09:00
smoogipoo
811ddb02a4
General refactoring
2020-01-24 17:50:36 +09:00
smoogipoo
6fc6a376ee
Fix incorrect slider selection point
2020-01-24 17:50:09 +09:00
Dean Herbert
56f74e6123
Merge pull request #7596 from peppy/fix-main-menu-input-regression
...
Fix regressed input handling order
2020-01-24 17:32:55 +09:00
smoogipoo
28727bbafd
Fix crash when deselecting via ctrl+click
2020-01-24 17:30:37 +09:00
Dean Herbert
f9e93e2a6a
Fix regressed input handling order
2020-01-24 17:15:05 +09:00
Dean Herbert
159c8087fb
Merge pull request #7492 from EVAST9919/main-menu-song-ticker
...
Implement SongTicker component in main menu
2020-01-24 16:55:35 +09:00
Dean Herbert
827f48c29b
Adjust fade
2020-01-24 16:32:39 +09:00
Dean Herbert
7495cfa0a9
Add a test scene
...
You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene
2020-01-24 16:32:31 +09:00
Dean Herbert
6f44f8a1ad
Ensure only run once when not current screen
2020-01-24 16:27:49 +09:00
Dean Herbert
f9a54dfb1d
Tidy up implementation and show on returning with new song
2020-01-24 16:27:37 +09:00
Dean Herbert
3f6fa93365
Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker
2020-01-24 16:08:34 +09:00
Dean Herbert
f5a3de3187
Merge remote-tracking branch 'upstream/master' into improve-song-select-uiscale
2020-01-24 15:44:40 +09:00
Dean Herbert
fdde4a6858
Tidy up song select hierarchy to be more readable
2020-01-24 15:44:31 +09:00
Dean Herbert
c0a233e8bb
Align background wedge with carousel
2020-01-24 15:00:10 +09: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
Dean Herbert
ea2271c905
Merge branch 'master' into timeline-maybe
2020-01-24 13:39:51 +09:00
Dean Herbert
0e9ab8c76b
Rename test scene to match
2020-01-24 13:39:47 +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
f8cb898516
Improve song select display on ultrawide displays (or when UI scale is set low)
2020-01-23 20:03:52 +09: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
5646f7777e
Add comment about custom SelectionHandler
2020-01-23 16:23:42 +09:00
Dean Herbert
5cadbb1ffb
Move timeline blueprint to own class
2020-01-23 16:22:43 +09:00
Dean Herbert
0647b4bfad
Merge remote-tracking branch 'upstream/master' into timeline-maybe
2020-01-23 16:20:45 +09:00
Dean Herbert
9d90799447
Remove useless container
2020-01-23 16:20:42 +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
a696bab82f
Merge branch 'decouple-blueprint-container' into timeline-maybe
2020-01-23 16:02:08 +09:00