1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 20:47:26 +08:00
Commit Graph

8574 Commits

Author SHA1 Message Date
EVAST9919
4ee3a89c12 Remove using 2017-11-18 08:35:00 +03:00
EVAST9919
34d8f94f99 Add track timer 2017-11-18 08:24:09 +03:00
Dean Herbert
68d4e420dd Update framework 2017-11-18 12:18:55 +09:00
Dean Herbert
c2d1de34fc Fix logo not always returning to the correct state when rapidly changing menus
Fixes #1005 for real
2017-11-18 11:19:15 +09:00
EVAST9919
a741d6cea7 Fix incorrect score indexes in leaderboard 2017-11-18 04:46:02 +03:00
Dean Herbert
322dd1bd05 Rename variables to make more sense 2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590 Remove duplicated code 2017-11-18 10:34:17 +09:00
Dean Herbert
c2b6e958f7 Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo 2017-11-18 10:28:00 +09:00
EVAST9919
58e7263108 CI fixes 2017-11-18 03:09:09 +03:00
EVAST9919
0b8fed4e5a Remove useless Dimention params 2017-11-18 01:51:23 +03:00
EVAST9919
7492ab6495 Use GridContainer to place the bottom bar objects 2017-11-18 01:48:50 +03:00
EVAST9919
0cad5a5ca3 Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-18 01:15:50 +03:00
Dan Balasescu
9c86390814
Merge pull request #1519 from peppy/lazy-working-beatmap
Use lazy for WorkingBeatmap component loading
2017-11-17 22:26:03 +09:00
smoogipoo
ddf402d948 Add nullchecks in Disposal where population methods return nulls 2017-11-17 22:14:28 +09:00
smoogipoo
4ced1b6490 Use more of the properties 2017-11-17 22:10:24 +09:00
smoogipoo
1a6b0f5b3f Update framework 2017-11-17 21:46:43 +09:00
smoogipoo
dacabd4a90 Merge branch 'master' into lazy-working-beatmap 2017-11-17 21:46:19 +09:00
Dan Balasescu
8dcece437b
Merge pull request #1514 from peppy/optimise-leaderboards
Optimise leaderboard display
2017-11-17 21:40:48 +09:00
EVAST9919
07e0aba01c Remove using 2017-11-17 14:10:13 +03:00
EVAST9919
1680c0905f Fix track tempo could be less than 1 on exiting the editor 2017-11-17 14:02:07 +03:00
EVAST9919
cc04d5bc61 Add all the objects to the PlaybackContainer 2017-11-17 13:35:41 +03:00
Dean Herbert
6b591ac77f Add missing initialisation 2017-11-17 19:17:00 +09:00
Dean Herbert
b3aae2340b Avoid accessing beatmaps from BeatSyncedContainer until they are loaded 2017-11-17 18:38:11 +09:00
Dean Herbert
d75e3d8e81 Use lazy for WorkingBeatmap component loading 2017-11-17 18:37:46 +09:00
EVAST9919
d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
Dean Herbert
8bd59ff0b3 Fix osu! logo occasionally being in the wrong state on entering the main menu 2017-11-17 17:40:10 +09:00
Dean Herbert
ea487861f8 Merge remote-tracking branch 'upstream/master' into optimise-leaderboards 2017-11-17 17:28:01 +09:00
Dean Herbert
c1fd2a3950
Merge pull request #1516 from smoogipoo/mod-improvements
Various improvements to make DifficultyCalculator support mods
2017-11-17 15:35:05 +09:00
smoogipoo
95fd323c6b Fix ManiaDifficultyCalculator possibly failing due to nullref 2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa CI fixes 2017-11-17 14:26:33 +09:00
smoogipoo
7892eefd68 Fix up mod application + beatmap/hitobject references 2017-11-17 14:23:52 +09:00
smoogipoo
cc1720241e Fix DifficultyCalculator using incorrect mods 2017-11-17 12:36:51 +09:00
smoogipoo
5781b45b39 Set TimeRate after mod application 2017-11-17 12:36:17 +09:00
smoogipoo
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5 Make DifficultyCalculator support mod applications
Fixes https://github.com/ppy/osu/issues/476.
2017-11-17 12:36:07 +09:00
EVAST9919
d301ad1435 Add supporter icon to the user panel 2017-11-16 20:06:49 +03:00
Dean Herbert
6c40cf08cc Optimise leaderboard display
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
f6bdfa9876
Merge pull request #1485 from EVAST9919/beatmap_scores
Add top scores section into beatmap overlay display
2017-11-16 01:01:15 +09:00
Dean Herbert
62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dean Herbert
a3dc39cf4f
Merge pull request #1511 from peppy/fix-select-no-beatmap
Fix hard crash when clicking play button with no map selected
2017-11-16 00:38:41 +09:00
Dan Balasescu
d5bbf0fdd2
Merge branch 'master' into fix-select-no-beatmap 2017-11-16 00:26:15 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dan Balasescu
fb37dc7d77
Merge pull request #1508 from peppy/overlay-improvements
Ensure only one information overlay is open at once
2017-11-16 00:02:56 +09:00
Dean Herbert
8011048540 Fix hard crash when clicking play button with no map selected
Resolves #1507.
2017-11-15 20:03:18 +09:00
Dean Herbert
4b3e7c3613
Merge branch 'master' into overlay-improvements 2017-11-15 19:43:34 +09:00
Dean Herbert
4b973dc827
Merge pull request #1510 from peppy/remove-sub-scroll
Remove scrollability from sub-areas in beatmap overaly
2017-11-15 19:43:11 +09:00
Dan Balasescu
70d960ba73
Merge branch 'master' into remove-sub-scroll 2017-11-15 19:26:42 +09:00
Dan Balasescu
9549b85a00
Merge pull request #1509 from peppy/overlay-scroll-to-top
Ensure overlay containers scroll to top when new information is presented
2017-11-15 19:26:26 +09:00
Dean Herbert
fda810eb8f Remove scrollability from sub-areas in beatmap overaly
The areas that are scrollable inside the beatmap overlay make for a very frustrating experience. Let's disable them for now.
2017-11-15 19:02:56 +09:00
Dean Herbert
af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00