1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:47:24 +08:00
Commit Graph

5172 Commits

Author SHA1 Message Date
Dan Balasescu
57fb298690 Merge branch 'master' into mania-judgements 2017-05-29 11:43:01 +09:00
smoogipooo
e5e73b31b6 Cleanup + slight xmldoc improvements. 2017-05-29 11:42:43 +09:00
Dean Herbert
0fd053707d Merge pull request #850 from smoogipooo/mania-holdnote-input
Mania holdnote input
2017-05-29 11:33:32 +09:00
smoogipooo
79cdba58c1 Merge branch 'mania-holdnote-input' into mania-judgements 2017-05-29 11:23:32 +09:00
smoogipooo
af137f40e5 Merge remote-tracking branch 'origin/master' into mania-judgements 2017-05-29 11:22:06 +09:00
smoogipooo
cd1da469c7 Cleanup + actually fix possible nullrefs. 2017-05-29 11:14:37 +09:00
smoogipooo
cdf4fcea02 Fix input being reversed. 2017-05-29 11:07:17 +09:00
smoogipooo
27d6cb6275 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-29 10:57:49 +09:00
smoogipooo
cf3743f698 Update framework. 2017-05-29 10:56:42 +09:00
smoogipooo
9e5a53aae7 Fix possible nullrefs. 2017-05-29 10:53:55 +09:00
Dean Herbert
06349c580d Merge pull request #856 from MrTheMake/musiccontroller-init-fix
Fix initialize beatmap change animation of the music controller
2017-05-29 10:32:56 +09:00
Dean Herbert
7b52c4621d Merge branch 'master' into musiccontroller-init-fix 2017-05-29 10:28:56 +09:00
Dean Herbert
d1517257dd Merge pull request #868 from DrabWeb/user-panel-test-data
Change UserPanel test case data to use always available covers
2017-05-28 23:29:59 +09:00
Dean Herbert
20c7a5e931 Merge branch 'master' into user-panel-test-data 2017-05-28 23:19:16 +09:00
Dean Herbert
b12bc9dac8 Merge pull request #862 from peppy/fix-nullrefs
Fix some possible nullrefs on beatmap load failure
2017-05-28 23:18:06 +09:00
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
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
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
DrabWeb
d4a9813af9 Cleanup BreadcrumbTabItem visibility code 2017-05-27 18:19:09 -03:00
DrabWeb
e7087f22ea Change UserPanel test case data to use always available covers 2017-05-27 17:27:11 -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
Dean Herbert
731c15f91a Update framework 2017-05-27 13:24:02 +09:00
DrabWeb
3699c39967 PADDING -> padding, make private 2017-05-26 16:46:09 -03:00
DrabWeb
33d6b718be padding -> PADDING 2017-05-26 16:37:52 -03:00
DrabWeb
c9971bb490 Don't store hideChevron 2017-05-26 16:32:46 -03:00
DrabWeb
4c127a6130 CI fixes 2017-05-26 16:29:20 -03:00
DrabWeb
352d3d247b Fix incorrect sizes 2017-05-26 16:21:37 -03:00
DrabWeb
fb6ed159ca Use padding for chevron margin 2017-05-26 16:03:51 -03:00
Jorolf
db1dde72de change constant names 2017-05-26 16:29:15 +02:00
Jorolf
64612ef34b add multimod animation 2017-05-26 16:10:28 +02:00
smoogipooo
b28b7af887 Scale HP with drain rate a bit. 2017-05-26 20:42:03 +09:00
smoogipooo
3715171948 Ticks can't be missed. 2017-05-26 20:32:21 +09:00
EVAST9919
d052f093d5 Scaling on hover 2017-05-26 14:29:45 +03:00
smoogipooo
ca08011734 Add basic (new) hp calculations. 2017-05-26 20:26:26 +09:00
smoogipooo
95908af677 Fix resetting scoreprocessor. 2017-05-26 20:26:06 +09:00
smoogipooo
10f62eb8da Fix incorrect combo score. 2017-05-26 20:25:24 +09:00
jorolf
f6f1ea42ee Merge branch 'master' into channel-selector-tab-item 2017-05-26 13:18:50 +02:00
smoogipooo
ab5e1bfc89 Add basic score calculations. 2017-05-26 19:56:50 +09:00