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

3254 Commits

Author SHA1 Message Date
DrabWeb
25b457e994 Proper Bindable usage 2017-05-22 13:05:18 -03:00
DrabWeb
65df2d2b70 MultiplayerRoomStatus -> RoomStatus 2017-05-22 12:46:41 -03:00
DrabWeb
2c16d9c3a7 CurrentBeatmap -> Beatmap 2017-05-22 12:45:40 -03:00
DrabWeb
03f6cded84 MultiplayerRoom -> Room 2017-05-22 12:44:58 -03:00
DrabWeb
261ea4c176 CoverBackgroundSprite for actually async cover loading 2017-05-22 12:41:59 -03:00
DrabWeb
35814e47e4 Colour -> GetAppropriateColour, adjust status change transition 2017-05-22 12:37:19 -03:00
smoogipooo
adf8bb853e Move load() to be directly below ctor. 2017-05-22 20:06:37 +09:00
smoogipooo
de575b3867 Early return if beatLength = 0. 2017-05-22 20:02:02 +09:00
smoogipooo
95c4704a9e Delay backwards instead of using a millisecond tolerance. 2017-05-22 20:01:28 +09:00
ColdVolcano
9235cbff8d Apply suggestions 2017-05-22 05:59:16 -05:00
ColdVolcano
63196df541 Typo fix
Forgot the pharenteses
2017-05-22 05:05:54 -05:00
ColdVolcano
601b840713 Apply suggestions 2017-05-22 04:55:33 -05:00
ColdVolcano
f2b5be27c8 CI Fixes 2017-05-22 04:53:32 -05:00
ColdVolcano
a1547f12d4 Applied suggestions + Update Framework 2017-05-22 04:38:21 -05:00
ColdVolcano
1ea60fd393 Merge pull request #828 into menu-flashes 2017-05-22 04:15:46 -05:00
Dan Balasescu
fc90cfa604 Update BeatSyncedContainer.cs 2017-05-22 17:50:05 +09:00
smoogipooo
3235e280a9 Add to csproj. 2017-05-22 17:32:18 +09:00
Dan Balasescu
a438a8b8d3 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-22 17:27:22 +09:00
smoogipooo
70d7f61f7c More inversion for logic simplification. 2017-05-22 17:19:39 +09:00
smoogipooo
f81ffa636d Use BindTo instead of taking the game's beatmap bindable. 2017-05-22 17:18:11 +09:00
smoogipooo
609aac6453 Better kiai mode detection. 2017-05-22 17:18:05 +09:00
smoogipooo
b241140496 Proper kiai mode detection. 2017-05-22 17:18:00 +09:00
smoogipooo
abe9c464a8 Invert if statements. 2017-05-22 17:17:54 +09:00
Huo Yaoyuan
63259a3457 Fix depth of header background.
Thanks to the order of adding to parent container, the depth value is actually not needed.
2017-05-22 16:00:03 +08:00
Huo Yaoyuan
85684e5fee Do not scroll headers to when scrolling position is negative. 2017-05-22 15:54:58 +08:00
DrabWeb
8a364c6068 CI fixes 2017-05-22 03:37:36 -03:00
DrabWeb
aa40f88258 Add UserStatusOffline 2017-05-22 03:32:02 -03:00
DrabWeb
a73cf92994 Add second UserPanel to visual test, center cover sprite 2017-05-22 03:27:08 -03:00
DrabWeb
bdab545ca4 Use BeatmapBackgroundSprite 2017-05-22 03:15:22 -03:00
DrabWeb
77affc1eb7 Split onto multiple lines 2017-05-22 03:13:55 -03:00
DrabWeb
7ce3b73ecd Added UserPanel and UserStatus 2017-05-22 03:11:42 -03:00
DrabWeb
3c35badf06 Unused using 2017-05-22 02:03:53 -03:00
DrabWeb
6bf0ca59fe Make FilterControl not scroll with the panels 2017-05-22 02:03:26 -03:00
Huo Yaoyuan
d0ff9e6576 Merge branch 'master' into sections 2017-05-22 12:52:27 +08:00
ColdVolcano
059af0850b Changes in-line with framework 2017-05-21 23:47:08 -05:00
DrabWeb
d1df895844 Unused using 2017-05-22 01:16:59 -03:00
DrabWeb
26bf9dd64b Remove unused Background 2017-05-22 01:13:51 -03:00
DrabWeb
800a319470 Remove newline 2017-05-22 01:08:35 -03:00
DrabWeb
0c30b2c698 Remove folder from osu.Game.csproj 2017-05-22 01:07:26 -03:00
DrabWeb
0795089d86 Merge https://github.com/ppy/osu into drawable-multiplayer-room 2017-05-22 01:06:05 -03:00
DrabWeb
82fdf1a918 Bindables, avatars, more cleanup 2017-05-22 01:01:55 -03:00
Dean Herbert
d3495545c5 Merge branch 'master' into songselect-fixes 2017-05-22 12:29:18 +09:00
DrabWeb
e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03:00
Dean Herbert
7f08d60008 Merge branch 'master' into generic-interface 2017-05-22 11:35:50 +09:00
Dean Herbert
04f0dcc255 Merge branch 'master' into replay-no-pausing 2017-05-22 11:09:31 +09:00
DrabWeb
c4e6870c12 Merge https://github.com/ppy/osu into roompanel 2017-05-21 22:37:00 -03:00
DrabWeb
bc980b60ac Add files to project, update with framework changes 2017-05-21 22:36:46 -03:00
Dean Herbert
4b17bb8e69 Merge branch 'master' into mania-pattern-changes 2017-05-22 10:25:17 +09:00
smoogipooo
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00
Dean Herbert
93182e5da3 Merge branch 'master' into generic-interface 2017-05-22 09:52:40 +09:00
Dean Herbert
82cf94bbff Move spinner colours to local definition for now
We don't want to start polluting the OsuColours namespace with non-UI colours.
2017-05-22 09:50:45 +09:00
MrTheMake
e9c2b51012 Random the difficulty too 2017-05-22 01:59:10 +02:00
MrTheMake
5ef7451dba Improved LEFTand RIGHT key behaviour 2017-05-22 01:53:36 +02:00
DrabWeb
4e2126dca8 Fix nullref when changing display mode without any BeatmapSets added 2017-05-21 18:54:35 -03:00
DrabWeb
8c77f85667 Fix DirectOverlay expanding under the Toolbar 2017-05-21 18:52:30 -03:00
MrTheMake
4056338203 Remove unnecessary track starting 2017-05-21 21:35:49 +02:00
MrTheMake
0539584578 CI fix 2017-05-21 21:33:54 +02:00
MrTheMake
b543b1f9fc Remove unnecessary restart 2017-05-21 21:20:59 +02:00
DrabWeb
eb77c94150 Fix search field losing focus 2017-05-21 15:30:10 -03:00
Jorolf
5b244367ee allow for solutions were the osu repository isn't at the solution level 2017-05-21 20:29:05 +02:00
MrTheMake
6219b8e6dd Fixed an error with looping 2017-05-21 20:27:41 +02:00
MrTheMake
974e8d1f82 Fix pressing up always goes to the first beatmap group difficulty, not the last 2017-05-21 19:27:34 +02:00
MrTheMake
9b87f5d8db Reformating 2017-05-21 18:16:54 +02:00
MrTheMake
6d7f70d0ea Fix CI warnings 2017-05-21 18:00:31 +02:00
MrTheMake
34653eb8c0 Fixed null references 2017-05-21 17:20:20 +02:00
MrTheMake
7db45cb58f Moved the whole looping assignments inside PlaySongSelect 2017-05-21 17:09:56 +02:00
MrTheMake
ec213efc49 Trimmed whitespaces 2017-05-21 16:13:20 +02:00
MrTheMake
cc35cc281c Fixed null reference in case there are no beatmaps 2017-05-21 16:10:10 +02:00
MrTheMake
48f4879157 Use the track's implemented looping algorithm to loop tracks in the song select screen 2017-05-21 15:57:41 +02:00
MrTheMake
043d1ed20a Updated preload condition to handle special case 2017-05-21 14:08:04 +02:00
MrTheMake
662ea0ec2d Repeat a beatmap's track if it has ended 2017-05-21 14:00:40 +02:00
MrTheMake
1546bbc66b Updated preload condition. 2017-05-21 13:04:04 +02:00
MrTheMake
44cad4e0ac Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen. 2017-05-21 03:04:12 +02:00
Huo Yaoyuan
7357076c4d CI fixes. 2017-05-21 04:48:43 +08:00
Huo Yaoyuan
4a55666e03 Merge branch 'master' into sections 2017-05-21 04:43:39 +08:00
Huo Yaoyuan
f06f8b4dcd Make sidebar buttons working. 2017-05-21 04:33:05 +08:00
MrTheMake
33ebc8fd49 Trimmed more whitespaces 2017-05-20 22:23:49 +02:00
MrTheMake
97aadad113 Trimmed spaces. 2017-05-20 22:16:05 +02:00
MrTheMake
f76abe2329 Disallow clicking through the song select footer. 2017-05-20 22:13:23 +02:00
Huo Yaoyuan
aa409ac1a9 Move SearchTextBox out of SettingsHeader. 2017-05-21 04:12:16 +08:00
Huo Yaoyuan
a98f109d73 Use LayoutSize for header and footer layout. 2017-05-21 04:01:07 +08:00
Huo Yaoyuan
35712514a4 Update settings UI using SectionsContainer basically. 2017-05-21 03:50:04 +08:00
Huo Yaoyuan
93668e53a0 Add footer support. 2017-05-21 03:44:03 +08:00
Huo Yaoyuan
201b44dbf1 Do not make the name confusing. 2017-05-21 03:02:51 +08:00
Huo Yaoyuan
72621c81dc Handle null and invalidation of headers. 2017-05-21 02:37:34 +08:00
Huo Yaoyuan
e040f297c6 Set Masking = false and expose ScrollContainer. 2017-05-21 02:21:23 +08:00
MrTheMake
306feb177a Fix null pointer reference 2017-05-20 20:18:29 +02:00
Huo Yaoyuan
da47b0a260 Fix margin and offset calculating. 2017-05-21 02:11:55 +08:00
MrTheMake
031fddc995 Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set. 2017-05-20 19:53:18 +02:00
Dean Herbert
3ff5c271ea Merge branch 'master' into replay-no-pausing 2017-05-21 02:00:00 +09:00
MrTheMake
57b9ed0f54 Do not pause a running replay if the window is not focused. 2017-05-20 18:56:50 +02:00
DrabWeb
87ace2d7ec @"" -> string.Empty 2017-05-20 13:52:51 -03:00
ColdVolcano
07d148f708 Merge branch 'master' of ppy/osu into beat-syncing 2017-05-20 11:46:51 -05:00
ColdVolcano
38a566890f Add licence header 2017-05-20 11:44:19 -05:00
ColdVolcano
d5904499f7 Post merge fixes 2017-05-20 11:41:16 -05:00
ColdVolcano
2014d35301 Merge branch 'master' of ppy/osu into menu-flashes 2017-05-20 11:39:39 -05:00
DrabWeb
49eb096b03 Fix visual test mode toggle buttons activation state 2017-05-20 13:19:50 -03:00
ColdVolcano
4e83f12f34 Initial implementation
Note this won't work with the osu!bgm because it is not a beatmap
2017-05-20 11:02:42 -05:00
Dean Herbert
0b987be600 Merge branch 'master' into osu-direct 2017-05-20 16:17:59 +09:00
Dean Herbert
fb72693c96 Merge branch 'master' into playlist-item-paragraph 2017-05-20 15:47:54 +09:00
DrabWeb
995a573b9c @"" -> string.Empty 2017-05-20 03:22:37 -03:00
DrabWeb
7485a78128 Update framework 2017-05-20 03:14:22 -03:00
DrabWeb
1eb96e07bd Remove unused using directive 2017-05-20 03:01:09 -03:00
DrabWeb
0c5fec975d Change ModDisplay to use ReverseDepthFillFlowContainer 2017-05-20 02:56:00 -03:00
DrabWeb
139b03a1ce Only recreate text once per unicode option change 2017-05-20 02:05:13 -03:00
DrabWeb
43bd0f686b Fix artist being the opposite value 2017-05-20 01:25:42 -03:00
DrabWeb
48417beb81 Unused using directive 2017-05-20 01:22:33 -03:00
DrabWeb
615082d757 Remove whitespace 2017-05-20 01:17:04 -03:00
DrabWeb
dcc3dbf5e2 Make PlaylistItem use Paragraphs 2017-05-20 01:11:20 -03:00
DrabWeb
bfedd42ca4 Add mod tooltips 2017-05-19 23:56:48 -03:00
DrabWeb
e030573436 Add ReverseDepthFillFlowContainer to remove code duplication 2017-05-19 23:44:36 -03:00
DrabWeb
68cb23786a Fade in background when loaded 2017-05-19 20:53:51 -03:00
DrabWeb
6e7a09fedb Line endings, use ToString for statistic value 2017-05-19 20:37:13 -03:00
DrabWeb
ffb3450dc2 Remove <U+FEFF> character 2017-05-19 20:34:51 -03:00
DrabWeb
503ee97a15 Fix license header 2017-05-19 20:28:37 -03:00
DrabWeb
cdd2b54dc7 Move SlimEnumDropdown into it's own file 2017-05-19 20:25:08 -03:00
Huo Yaoyuan
ecc222c043 Allow custom SectionsContainer. 2017-05-20 07:20:46 +08:00
DrabWeb
e7a64126a3 Formatting and remove magic number 2017-05-19 20:13:59 -03:00
Huo Yaoyuan
473441dfd4 Fix fields being null. 2017-05-20 07:07:27 +08:00
DrabWeb
83c81c0626 Cleanup (again) 2017-05-19 20:03:07 -03:00
DrabWeb
c981a4a511 Formatting 2017-05-19 19:50:45 -03:00
Huo Yaoyuan
e06c917c95 Selection support of SectionsContainer. 2017-05-20 06:39:01 +08:00
DrabWeb
0a96aaf575 Whitespace 2017-05-19 19:27:51 -03:00
DrabWeb
0a90965a5b CI formatting 2017-05-19 19:22:42 -03:00
DrabWeb
c2ea2bb5b0 Proper search tab changing logic 2017-05-19 19:13:07 -03:00
DrabWeb
7a60aa614d Reword comment 2017-05-19 19:05:54 -03:00
DrabWeb
57115f453e Remove todo comment 2017-05-19 19:03:45 -03:00
DrabWeb
6cc7602db1 Added download button animations 2017-05-19 19:02:53 -03:00
DrabWeb
649fc8362b Fix ranked status dropdown expanding below the panels 2017-05-19 18:54:47 -03:00
Huo Yaoyuan
058c5e18a4 Scrolling support for SectionsContainer. 2017-05-20 05:48:40 +08:00
DrabWeb
2f10b72cb2 Proper dropdown expansion, DisplayModeToggleButton -> DisplayStyleToggleButton 2017-05-19 18:32:04 -03:00
Huo Yaoyuan
24a813e907 Basic children management of SectionsContainer. 2017-05-20 05:15:57 +08:00
DrabWeb
05b8fc5126 Added switching between grid/list and little transitions for the panels 2017-05-19 17:52:34 -03:00
DrabWeb
1d61fc84c7 Remove duplicate code in SettingsEnumDropdown 2017-05-19 17:04:59 -03:00
DrabWeb
5b2c74be50 Remove Direct folder from csproj 2017-05-19 16:24:27 -03:00
DrabWeb
1bd13a8361 Indentation 2017-05-19 16:22:54 -03:00
DrabWeb
74ed4cf0e3 More cleanup 2017-05-19 16:19:23 -03:00
DrabWeb
6eac19e76b Move constructor above methods in DirectPanel 2017-05-19 16:12:47 -03:00
DrabWeb
c3d753a585 DifficultyIcons -> GetDifficultyIcons() 2017-05-19 16:11:45 -03:00
DrabWeb
a86d07cac7 Remove enclosing background container 2017-05-19 16:07:05 -03:00
DrabWeb
c6320c0f11 BeatmapBackgroundSprite public -> internal 2017-05-19 16:02:42 -03:00
DrabWeb
e1c4c36122 +BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds 2017-05-19 15:43:18 -03:00
Dean Herbert
c2572eea27 Merge branch 'master' into debug-config-rename 2017-05-20 01:15:55 +09:00
Dean Herbert
a34d9d8b09 Oops 2017-05-20 01:14:51 +09:00
DrabWeb
3b8cadd4df Clean up DirectPanel and it's subclasses 2017-05-19 12:52:23 -03:00
Dean Herbert
9c9c0a64fd Merge branch 'master' into debug-config-rename 2017-05-20 00:45:16 +09:00
Dean Herbert
561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
Dan Balasescu
7e8ffe8f34 Merge branch 'master' into osd-fixes 2017-05-20 00:12:10 +09:00
Dean Herbert
528d79be51 FrameworkDebugConfig -> DebugSetting 2017-05-19 22:53:26 +09:00
Dean Herbert
0332348b24 Correctly display default audio device on OSD 2017-05-19 22:51:09 +09:00