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

5039 Commits

Author SHA1 Message Date
Thomas Müller
a4903e62ba Merge branch 'master' into fix-nullrefs 2017-05-28 16:07:10 +02:00
Dean Herbert
fb24e69d44 Merge pull request #867 from smoogipooo/fix-direct-hotkey
Fix osu!direct hotkey overriding drawings hotkey (for now).
2017-05-28 22:56:04 +09:00
Dean Herbert
bfede3647f Merge branch 'master' into fix-direct-hotkey 2017-05-28 22:47:14 +09:00
Dean Herbert
edc650d2eb Merge pull request #870 from peppy/fix-chat-overlay-drift
Fix drift when dragging chat beyond bounds
2017-05-28 22:46:17 +09:00
Thomas Müller
bb14708165 Merge branch 'master' into fix-chat-overlay-drift 2017-05-28 14:38:39 +02:00
Thomas Müller
005154276a Merge pull request #869 from peppy/better-focus
Rework focus (osu! portion)
2017-05-28 14:38:29 +02:00
Dean Herbert
bc47dedf27 Add non-null assertion 2017-05-28 21:34:15 +09:00
Dean Herbert
18bcec723a Update framework 2017-05-28 21:29:41 +09:00
Dean Herbert
3644198c6e Fix CI issues 2017-05-28 21:20:11 +09:00
Dean Herbert
ed8b34d5ed Fix drift when dragging chat beyond bounds 2017-05-28 21:11:46 +09:00
Dean Herbert
013b4f9b89 Update framework 2017-05-28 21:09:44 +09:00
Dean Herbert
d749fc516d Update focus handling in line with framework changes 2017-05-28 20:08:46 +09:00
Dean Herbert
bdeaf2dbb4 Update method names in line with framework changes 2017-05-28 18:34:12 +09:00
smoogipooo
330bd4e11d Fix osu!direct hotkey overriding drawings hotkey (for now). 2017-05-27 20:24:23 +09:00
Dean Herbert
5eab611255 Fix some possible nullrefs on beatmap load failure 2017-05-26 17:36:38 +09: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
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
Dean Herbert
5cb6963940 Make spinners easier for now
The underlying spin counting doesn't match stabnle, so they have been near impossible to complete until now.
2017-05-24 22:08:46 +09:00
Dean Herbert
0dbb2220e0 Add missing early activation to menu flashes 2017-05-24 21:07:12 +09:00
Dean Herbert
16212fce19 Merge pull request #836 from smoogipooo/taiko-visual-update
Taiko visual update
2017-05-24 17:34:32 +09:00
Dean Herbert
1c776511df Merge branch 'master' into taiko-visual-update 2017-05-24 17:18:08 +09:00
Dean Herbert
391134b1d3 Adjust glow a bit 2017-05-24 17:16:02 +09:00