1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-11 22:23:14 +08:00
Commit Graph

3338 Commits

Author SHA1 Message Date
smoogipooo
e348f86ce1 Update to match framework. 2017-06-01 14:24:31 +09:00
Dean Herbert
a5695aca1c Merge branch 'master' into storyboards 2017-05-31 15:59:01 +09:00
Dean Herbert
bab3f1b89a Merge branch 'master' into user-dropdown-arrow 2017-05-31 15:39:52 +09:00
DrabWeb
cd57343191 Text -> Label 2017-05-31 02:03:13 -03:00
DrabWeb
4fd7405fb8 Fix user dropdown menu item chevron alignment 2017-05-31 01:57:32 -03:00
Dan Balasescu
d90006b229 Merge branch 'master' into update-framework 2017-05-31 13:01:17 +09:00
Dean Herbert
40312080f7 Merge branch 'master' into playsongselect-exit-fix 2017-05-31 11:14:41 +09:00
Dean Herbert
61fb5d6ac8 Add issue URL to comment 2017-05-31 11:04:18 +09:00
Dean Herbert
b61452024a Add comment 2017-05-31 11:02:26 +09:00
Dean Herbert
8544b45443 Update in line with framework 2017-05-30 22:23:51 +09:00
smoogipooo
223c75327f Remove key/val in favor of local variables + method call. 2017-05-30 20:59:53 +09:00
smoogipooo
5b5c2e4717 Back to using val... 2017-05-30 20:37:30 +09:00
smoogipooo
0728aea6a4 Fixes + cleanup. 2017-05-30 20:26:39 +09:00
Dan Balasescu
fe68e1b1af Merge branch 'master' into storyboards 2017-05-30 19:53:44 +09:00
smoogipooo
93a33be596 val -> value, val -> line (in cases where a key is not used). 2017-05-30 19:52:43 +09:00
smoogipooo
0175b91927 Cleanups. 2017-05-30 19:52:21 +09:00
Dean Herbert
e91a3f06f1 Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item 2017-05-30 09:54:35 +09:00
Dean Herbert
fde579262f User a simpler method to hide the background icon 2017-05-30 09:54:29 +09:00
Dean Herbert
b8461cd02d Merge branch 'master' into fix-triangle-smoothness 2017-05-30 08:58:05 +09:00
Thomas Müller
298c0f5757 Structure velocity code more clearly and avoid redundant parenthesis 2017-05-29 19:08:06 +02:00
Thomas Müller
db444a61cb Reduce per-triangle per-frame computation significantly 2017-05-29 18:30:49 +02:00
Thomas Müller
d3f2d480a8 Fix incorrect triangle state within the first frame 2017-05-29 18:24:17 +02:00
Thomas Müller
2f063ee41d Make triangle edges smooth again 2017-05-29 18:20:51 +02:00
Dan Balasescu
e4b876ff5b Update ModButton.cs 2017-05-29 18:10:02 +09:00
Dean Herbert
7960b5cf26 More refactoring
Also allows rotation when reaching the end of the available mods.
2017-05-29 18:03:40 +09:00
Dan Balasescu
94ae730a20 Merge branch 'master' into storyboards 2017-05-29 17:49:51 +09:00
Dean Herbert
5e473c6c96 Merge remote-tracking branch 'upstream/master' into better-multimod-animation 2017-05-29 17:21:49 +09:00
Dean Herbert
31cc6917bc Tidy up code, improve transition, add directionality 2017-05-29 17:20:55 +09:00
Dean Herbert
718eeb6df8 Use linq to tidy up casting 2017-05-29 16:18:07 +09:00
Dean Herbert
4a0c8fb5dd Merge branch 'master' into breadcrumbs 2017-05-29 15:59:37 +09:00
Dean Herbert
f3422800b1 Merge remote-tracking branch 'upstream/master' into backbutton_beat 2017-05-29 13:04:43 +09:00
smoogipooo
c137ee822c Give velocity a sane default value. 2017-05-29 12:19:51 +09:00
smoogipooo
231b1ae610 We don't need a curve. 2017-05-29 12:19:38 +09:00
smoogipooo
6101fe98e1 Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state. 2017-05-29 12:10:29 +09:00
smoogipooo
cd1da469c7 Cleanup + actually fix possible nullrefs. 2017-05-29 11:14:37 +09:00
smoogipooo
27d6cb6275 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-29 10:57:49 +09:00
smoogipooo
9e5a53aae7 Fix possible nullrefs. 2017-05-29 10:53:55 +09:00
Dean Herbert
7b52c4621d Merge branch 'master' into musiccontroller-init-fix 2017-05-29 10:28:56 +09:00
Thomas Müller
a4903e62ba Merge branch 'master' into fix-nullrefs 2017-05-28 16:07:10 +02:00
Dean Herbert
bfede3647f Merge branch 'master' into fix-direct-hotkey 2017-05-28 22:47:14 +09:00
jorolf
9a4abcc199 Merge branch 'master' into better-multimod-animation 2017-05-28 14:39:04 +02:00
Thomas Müller
bb14708165 Merge branch 'master' into fix-chat-overlay-drift 2017-05-28 14:38:39 +02:00
Dean Herbert
bc47dedf27 Add non-null assertion 2017-05-28 21:34:15 +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
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
DrabWeb
d4a9813af9 Cleanup BreadcrumbTabItem visibility code 2017-05-27 18:19:09 -03:00
smoogipooo
330bd4e11d Fix osu!direct hotkey overriding drawings hotkey (for now). 2017-05-27 20:24:23 +09:00
Jorolf
e86ccf61b3 use recursion 2017-05-27 10:11:59 +02:00