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

28699 Commits

Author SHA1 Message Date
Dean Herbert
b9f28c8373 Combine hit types and remove old drumroll hits using a more efficient method 2020-04-27 16:13:28 +09:00
Dean Herbert
ff736a22dd Fix typos in comment 2020-04-27 14:41:19 +09:00
Dean Herbert
1cd4fd2ac4
Merge branch 'master' into taiko-drumroll-party 2020-04-27 13:27:10 +09:00
smoogipoo
20ae973e4a Use max result instead of GOOD 2020-04-27 12:29:11 +09:00
smoogipoo
2630fc1405 Break instead of return for consistency 2020-04-27 12:27:43 +09:00
Dan Balasescu
104b4beebc
Merge pull request #8848 from peppy/taiko-barline-skinning
Add osu!taiko bar line skinning support
2020-04-27 12:24:06 +09:00
smoogipoo
7dc090cc24 Add support for hit explosions 2020-04-27 12:23:53 +09:00
smoogipoo
81df22d2a7 Improve test scene 2020-04-27 12:17:36 +09:00
smoogipoo
dd36b839b9 Refactor 2020-04-27 12:01:31 +09:00
smoogipoo
bc6b02664f Merge branch 'master' into taiko-drumroll-party 2020-04-27 11:52:13 +09:00
Dan Balasescu
cdde514853
Merge branch 'master' into taiko-barline-skinning 2020-04-27 11:45:02 +09:00
Dan Balasescu
c3311b81ed
Merge pull request #8873 from peppy/editor-tick-visibility
Adjust editor timeline current marker to promote tick visibility
2020-04-27 11:34:29 +09:00
smoogipoo
104c61d622 Remove unnecessary scale 2020-04-27 11:06:23 +09:00
Dean Herbert
48168dddce Adjust editor timeline current marker to promote tick visibility 2020-04-27 10:54:32 +09:00
Dean Herbert
59d6abacb5
Merge pull request #8859 from MiraiSubject/showcase-video
Add background video for the Showcase Scene to the tournament client
2020-04-27 09:40:38 +09:00
Dean Herbert
fcded20655 Don't specify IProvideVideo interface for now 2020-04-27 08:58:01 +09:00
Dean Herbert
07513eb171 Merge branch 'master' into showcase-video 2020-04-27 08:57:50 +09:00
Dean Herbert
2737726f93
Merge pull request #8864 from Game4all/keybinds-ruleset-icon
Fix custom rulesets not showing correct icons in key binding settings
2020-04-27 08:48:00 +09:00
Dean Herbert
75c588c59d Remove stray space 2020-04-27 08:36:48 +09:00
Dean Herbert
743b4f05b3 Rename out of place variable 2020-04-27 08:36:36 +09:00
Bartłomiej Dach
b9e0fed467 Use SongBar height instead of hard-coded dimensions 2020-04-27 00:02:58 +02:00
Bartłomiej Dach
3c1730d0ca Expose SongBar's height 2020-04-26 23:59:24 +02:00
Bartłomiej Dach
a436f8e6d4 Trim other leftover RelativeSizeAxes 2020-04-26 22:54:01 +02:00
Lucas A
801968ed51 Remove un-needed RelativeSizeAxes specifications. 2020-04-26 21:17:40 +02:00
Lucas A
a756486a4d Make settings section icons actual drawables. 2020-04-25 20:35:46 +02:00
Dean Herbert
4ca7ce7715
Merge branch 'master' into taiko-barline-skinning 2020-04-25 18:58:44 +09:00
Dean Herbert
34b99b8f28
Merge pull request #8863 from iiSaLMaN/fix-toolbar-ruleset-selector-not-receiving-input
Fix ruleset selector not receiving key input on toolbar absence
2020-04-25 18:58:28 +09:00
Dean Herbert
b50e8471d2 Reword comment 2020-04-25 18:23:09 +09:00
Dean Herbert
381e0b5bfe
Merge branch 'master' into fix-toolbar-ruleset-selector-not-receiving-input 2020-04-25 16:55:31 +09:00
Dean Herbert
febdb15d70
Merge pull request #8862 from iiSaLMaN/fix-potential-nullref
Fix null reference while hiding toolbar on tests
2020-04-25 16:55:17 +09:00
Salman Ahmed
f0ebbb1807
Rewrite toolbar test scene and add test cases 2020-04-25 09:54:37 +03:00
Salman Ahmed
1953c8fc10
Fix ruleset selector not receiving key input on toolbar absence 2020-04-25 09:53:09 +03:00
Salman Ahmed
37cc1ed5a2
Fix potential null reference while hiding toolbar 2020-04-25 09:51:39 +03:00
Tim Oliver
c1c930c472 Fixed linting warnings 2020-04-25 13:47:20 +08:00
Tim Oliver
2a197db481 Merge branch 'master' into taiko-drumroll-party
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-25 13:31:50 +08:00
Tim Oliver
3cc0b21eae Added more smart checking to removing rewound drumroll hits 2020-04-25 13:18:02 +08:00
Tim Oliver
477fe72fcf Changed note playback to happen on new result 2020-04-25 00:15:59 +08:00
Tim Oliver
2be3a8184d Removed modifications to drum roll object 2020-04-25 00:15:37 +08:00
Shivam
39a593120c Fixed CodeInspect errors 2020-04-24 17:00:35 +02:00
Shivam
85bd673413
Merge branch 'master' into showcase-video 2020-04-24 15:38:42 +02:00
Dan Balasescu
fc706c19d7
Merge pull request #8846 from peppy/taiko-playfield-background-skinning
Refactor osu!taiko playfield and add background skinning support
2020-04-24 19:55:25 +09:00
Dan Balasescu
b3175f9dfa
Merge branch 'master' into taiko-playfield-background-skinning 2020-04-24 19:27:38 +09:00
Dan Balasescu
b7a2c031a8
Merge pull request #8858 from peppy/fix-comments-container-crash
Fix crash on switching comments page at an inopportune time
2020-04-24 19:06:29 +09:00
Dean Herbert
cbcd915ec8 Fix crash on switching comments page at an inopportune time 2020-04-24 18:18:10 +09:00
Dean Herbert
59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders
Implement legacy beatmap encoding for all rulesets
2020-04-24 17:49:34 +09:00
Dean Herbert
f880bd2d89
Merge pull request #8843 from smoogipoo/fix-mania-placement
Fix mania editor placement not working correctly
2020-04-24 17:28:05 +09:00
Dean Herbert
fe0038ed14
Merge branch 'master' into fix-mania-placement 2020-04-24 17:00:12 +09:00
Dean Herbert
05b3db0147 Remove masking 2020-04-24 16:56:18 +09:00
Dean Herbert
789bf95548 Merge branch 'master' into taiko-playfield-background-skinning 2020-04-24 16:53:05 +09:00
Dean Herbert
196e74940c
Merge pull request #8842 from smoogipoo/improve-osu-placement
Make osu! ruleset placements happen on mouse down
2020-04-24 13:36:18 +09:00