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

5299 Commits

Author SHA1 Message Date
smoogipooo
bd5bd084fa Merge branch 'mania-holdnote-input' into mania-judgements 2017-05-26 19:15:58 +09:00
Jorolf
1e4bca90f0 remove duplicate code 2017-05-26 12:10:16 +02:00
smoogipooo
24ff599901 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-26 19:01:10 +09:00
smoogipooo
f294fef29b Remove holding property in favor of a nullable hold start time. 2017-05-26 18:56:21 +09:00
smoogipooo
e4b59314ea Use new HitObjectStartTimeComparer. 2017-05-26 18:52:43 +09:00
smoogipooo
3ec41a313b Add base DrawableHitObject + HitObjectStartTimeComparer. 2017-05-26 18:48:18 +09:00
Dean Herbert
5eab611255 Fix some possible nullrefs on beatmap load failure 2017-05-26 17:36:38 +09:00
smoogipooo
871d44d628 Renamings. 2017-05-26 16:39:43 +09:00
smoogipooo
3f4cbd02cd Fix warnings. 2017-05-26 16:29:20 +09:00
smoogipooo
47e1b7b389 Fix tick construction loop. 2017-05-26 16:28:39 +09:00
smoogipooo
d3206396e7 Rewrite comments. 2017-05-26 16:10:04 +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
Dean Herbert
8ae7e84563 Merge branch 'master' into musiccontroller-init-fix 2017-05-26 10:48:32 +09:00
Jorolf
a9658ec66f update colour, width, icon and text 2017-05-25 20:25:59 +02:00
MrTheMake
79e731ec2a Updated framework 2017-05-25 20:20:30 +02:00
MrTheMake
9de7e7bc40 Fixes 2017-05-25 17:49:47 +02:00
Thomas Müller
e67a00f1f6 Merge pull request #857 from smoogipooo/triangles-particles
Triangles particles
2017-05-25 16:30:03 +02:00
Thomas Müller
061df80f23 Merge branch 'master' into triangles-particles 2017-05-25 16:02:47 +02:00
Thomas Müller
fbeaf9610e Merge pull request #858 from peppy/fix-initial-online-state
Fix initial login state not being reflected in user panel
2017-05-25 16:02:18 +02:00
Dean Herbert
4ecb3220dd Merge remote-tracking branch 'ppy/master' into triangles-particles 2017-05-25 22:47:03 +09:00
Dean Herbert
ec8f49df0f Update framework 2017-05-25 22:46:50 +09:00
Dean Herbert
9eec2edd30 Fix initial login state not being reflected in user panel 2017-05-25 22:43:33 +09:00
Thomas Müller
47be8b42aa Merge pull request #855 from peppy/fix-nullref
Fix potential nullref
2017-05-25 15:24:35 +02: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
MrTheMake
c32d816f9c Removed new line 2017-05-25 14:19:04 +02:00
MrTheMake
9ea70b849b Fix initialize beatmap change animation of the music controller 2017-05-25 14:16:51 +02: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
Dan Balasescu
4d7d4b7389 Merge pull request #854 from peppy/fix-warning
Attempt to fix inner scope warning
2017-05-25 15:06:32 +09:00
Dean Herbert
be81346573 Attempt to fix inner scope warning 2017-05-25 14:47:25 +09:00
Dean Herbert
7a369547fd Merge pull request #852 from DrabWeb/user-dropdown
Update user dropdown
2017-05-25 14:38:13 +09:00
Dean Herbert
df8c13c12d Merge branch 'master' into user-dropdown 2017-05-25 14:32:49 +09:00
Dean Herbert
95c03b7086 Merge pull request #824 from DrabWeb/drawable-multiplayer-room
Drawable multiplayer room
2017-05-25 14:22:58 +09:00
Dean Herbert
012f60d59b Merge branch 'master' into drawable-multiplayer-room 2017-05-25 13:58:05 +09:00
Dean Herbert
d1d7b8e1b1 Merge pull request #847 from peppy/early-activate-flashes
Add missing early activation to menu flashes
2017-05-25 13:58:00 +09:00
Dan Balasescu
4c5b2cda16 Merge branch 'master' into early-activate-flashes 2017-05-25 13:51:08 +09:00
Dan Balasescu
2021e3cead Merge pull request #851 from peppy/make-spinners-easier
Make spinners easier for now
2017-05-25 13:47:26 +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
Huo Yaoyuan
9bc1eece0a Basic section management of userpage. 2017-05-25 02:11:07 +08:00
MrTheMake
dee9d0e3bd Merge branch 'master' into playsongselect-exit-fix 2017-05-24 16:26:43 +02:00