1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 19:13:22 +08:00
Commit Graph

3255 Commits

Author SHA1 Message Date
smoogipooo
9517bfc2f1 Add file to csproj. 2017-05-26 19:33:23 +09:00
smoogipooo
24ff599901 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-26 19:01:10 +09:00
smoogipooo
3ec41a313b Add base DrawableHitObject + HitObjectStartTimeComparer. 2017-05-26 18:48:18 +09:00
smoogipooo
c2d3b6c05a Remove late initialization of head + tail, keep them updated with start time and end time. 2017-05-26 15:53:49 +09:00
Thomas Müller
061df80f23 Merge branch 'master' into triangles-particles 2017-05-25 16:02:47 +02:00
Dean Herbert
4ecb3220dd Merge remote-tracking branch 'ppy/master' into triangles-particles 2017-05-25 22:47:03 +09:00
Dean Herbert
9eec2edd30 Fix initial login state not being reflected in user panel 2017-05-25 22:43:33 +09:00
smoogipooo
c8cf387f5f A bit more cleanup. 2017-05-25 22:09:02 +09:00
smoogipooo
91dba765c2 Add back the concept of triangle ordering by size. 2017-05-25 22:03:36 +09:00
smoogipooo
86f6db2d31 Cleanup. 2017-05-25 21:33:49 +09:00
smoogipooo
97e57178a7 Make triangles use raw vertices instead of sprites. 2017-05-25 21:33:04 +09:00
Dean Herbert
1a255fdf48 Fix display order regression 2017-05-25 19:47:18 +09:00
Dean Herbert
d7fa6933be Fix potential nullref 2017-05-25 16:33:58 +09:00
Dean Herbert
be81346573 Attempt to fix inner scope warning 2017-05-25 14:47:25 +09:00
Dean Herbert
df8c13c12d Merge branch 'master' into user-dropdown 2017-05-25 14:32:49 +09:00
Dean Herbert
012f60d59b Merge branch 'master' into drawable-multiplayer-room 2017-05-25 13:58:05 +09:00
DrabWeb
e22eb1f205 CI fixes 2017-05-24 22:39:07 -03:00
DrabWeb
ec3c92fc3c Trim whitespace 2017-05-24 22:26:48 -03:00
DrabWeb
9cad344401 Revert back header for login form, fix incorrect spacing on header 2017-05-24 22:02:32 -03:00
DrabWeb
8e09b738b0 Remove magic numbers 2017-05-24 21:51:00 -03:00
DrabWeb
9b863f60ab Adjust dropdown layout 2017-05-24 21:32:46 -03:00
DrabWeb
efd4c57431 Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem 2017-05-24 21:09:18 -03:00
DrabWeb
b57a3f2056 Initial layout of user panel and user dropdown 2017-05-24 19:44:48 -03:00
DrabWeb
b803e40a7d Unbind from room values when disposing 2017-05-24 17:02:28 -03:00
Dean Herbert
0dbb2220e0 Add missing early activation to menu flashes 2017-05-24 21:07:12 +09:00
Seth
3094a8267f Merge branch 'master' into drawable-multiplayer-room 2017-05-24 04:39:57 -03:00
Dean Herbert
3134f92051 Merge branch 'master' into user-panel 2017-05-24 16:32:09 +09:00
DrabWeb
ca6a9b1b71 Inline cover 2017-05-24 04:21:34 -03:00
DrabWeb
a7914dc1e8 Convert transition_duration to const 2017-05-24 04:00:39 -03:00
DrabWeb
7c6540b008 Cleanup status transition code 2017-05-24 03:49:06 -03:00
Dean Herbert
45a964cebe Merge branch 'master' into osu-direct 2017-05-24 15:33:53 +09:00
DrabWeb
a25c504965 CI fixes 2017-05-24 03:08:48 -03:00
DrabWeb
72c9959215 resultCounts -> ResultAmounts 2017-05-24 02:40:34 -03:00
DrabWeb
ba2627d4e2 Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-24 02:40:00 -03:00
DrabWeb
e59c1879a2 Remove tabs 2017-05-24 02:38:55 -03:00
DrabWeb
4490596f5f Keep one object per file 2017-05-24 02:37:27 -03:00
DrabWeb
b08668b6d9 Remove @ from to-be-localized strings 2017-05-24 02:19:45 -03:00
Dean Herbert
5e01940770 Compare with private field 2017-05-24 13:43:10 +09:00
Dean Herbert
15ee2b802e Hide direct overlay when requested 2017-05-24 13:41:07 +09:00
Dean Herbert
03f9a86366 Add missing readonly 2017-05-24 13:29:12 +09:00
Dean Herbert
16d9a677d0 Add a low-end cutoff for scale adjust 2017-05-24 13:08:59 +09:00
Dean Herbert
a9d1e54c27 Adjust triangle movement based on amplitude 2017-05-24 13:08:54 +09:00
DrabWeb
2be1b00a76 Hide status bar when Status is null 2017-05-24 00:45:56 -03:00
DrabWeb
247d8e9b21 Replace "Connected as _" in login form with a UserPanel 2017-05-24 00:23:48 -03:00
Dean Herbert
4ee11764b8 Merge branch 'master' into osu-direct 2017-05-24 12:16:34 +09:00
Dean Herbert
c4916426f5 Merge branch 'master' into controlpoint-rework 2017-05-24 12:00:22 +09:00
Dean Herbert
53f489b447 Remove using 2017-05-24 11:50:12 +09:00
Dean Herbert
b1bd88ae71 Merge branch 'master' into logo-beat 2017-05-24 11:41:02 +09:00
Dan Balasescu
90d54a6cfe Merge branch 'master' into logo-beat 2017-05-24 10:36:30 +09:00
Dean Herbert
87a2cc2004 Merge branch 'master' into menu-flashes 2017-05-24 10:10:29 +09:00