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

6957 Commits

Author SHA1 Message Date
Dean Herbert
70e3ac30db Merge pull request #1217 from peppy/fix-mania-input
Fix incorrect initialisation order causing mania key bindings to not work
2017-09-06 23:30:03 +09:00
Dean Herbert
13c3ef65a8 Merge branch 'master' into fix-mania-input 2017-09-06 23:18:23 +09:00
Dean Herbert
c9e41e4b6f Merge pull request #1120 from naoey/quit-chat-channels
Add close button to chat channel tabs
2017-09-06 23:18:06 +09:00
Dean Herbert
e5308b6247 Method rename 2017-09-06 23:12:32 +09:00
Dean Herbert
da294c9605 Don't use base call when we don't have to 2017-09-06 23:10:08 +09:00
Dean Herbert
4f49a0c183 Simplify action 2017-09-06 22:58:21 +09:00
Dean Herbert
2c4de83298 Merge branch 'master' into fix-mania-input 2017-09-06 22:49:23 +09:00
Dean Herbert
a7fa66b9f9 Fix CI issue 2017-09-06 22:41:03 +09:00
Dean Herbert
858c41f86e Merge branch 'master' into quit-chat-channels 2017-09-06 22:36:36 +09:00
Dean Herbert
632fe7d2e2 Merge pull request #1218 from smoogipooo/fix-testcases
Remove a few unnecessary attributes in OsuTestCase.
2017-09-06 21:44:40 +09:00
Dean Herbert
940c45b6d1 Fix visual styling and code styling 2017-09-06 21:43:20 +09:00
Dean Herbert
c6fa899b15 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-09-06 21:43:03 +09:00
smoogipooo
f70b4839bd Remove a few unnecessary attributes in OsuTestCase. 2017-09-06 21:22:23 +09:00
Dean Herbert
e834e0e958 Fix incorrect initialisation order causing mania key bindings to not work 2017-09-06 21:07:57 +09:00
Dan Balasescu
cfd25693ce Merge pull request #1216 from peppy/unlock-chat
Allow posting to chat in all channels
2017-09-06 21:01:17 +09:00
Dean Herbert
4f4b0a1f35 Allow posting to chat in all channels 2017-09-06 20:26:01 +09:00
Dean Herbert
5988b5924d Merge pull request #1210 from smoogipooo/new-menus
Update framework in line with the new Menu changes
2017-09-05 23:48:42 +09:00
Dean Herbert
968c61902a Merge branch 'master' into new-menus 2017-09-05 23:42:33 +09:00
Dean Herbert
cd488a6336 Merge pull request #1213 from tom-arrow/difficulty-colors
New difficulty colors
2017-09-05 23:09:42 +09:00
Dean Herbert
048d1541c3 Merge branch 'master' into difficulty-colors 2017-09-05 23:01:49 +09:00
Dean Herbert
643228d32f Merge pull request #1214 from tom-arrow/taiko-accuracy
Fix taiko accuracy starting at 0% instead of 100%
2017-09-05 22:58:58 +09:00
Dean Herbert
796f9d8782 Merge branch 'master' into taiko-accuracy 2017-09-05 22:45:56 +09:00
Tom
1e10d977f9 Accuracy starts at 100% instead of 0% 2017-09-05 15:39:27 +02:00
Dan Balasescu
f47c3bb152 Merge pull request #1212 from peppy/osu-scoring
Add basic combo score factor to osu! ruleset
2017-09-05 22:20:33 +09:00
Dean Herbert
081b98ef39 "Use" the hitobject
Obviously temporary.
2017-09-05 21:41:20 +09:00
Tom
05f5dfba81 Change difficulty colors and add ExpertPlus
ExpertPlus is for beatmaps above 6.75*
2017-09-05 13:57:30 +02:00
Dean Herbert
0fc2e49ce6 Remove second calculateScore call 2017-09-05 19:33:20 +09:00
smoogipooo
b871323ed8 Fix BeatmapGroup initialization not correctly setting panels to Hidden. 2017-09-05 19:26:28 +09:00
smoogipooo
5508fa0fd9 Merge remote-tracking branch 'origin/master' into new-menus 2017-09-05 19:14:42 +09:00
smoogipooo
24f7fbe1e5 Update framework. 2017-09-05 19:14:37 +09:00
Dean Herbert
d69b8d7784 Add basic combo score factor to osu! ruleset 2017-09-05 17:09:58 +09:00
Dean Herbert
770d04956f Merge pull request #1202 from 2yangk23/rearrange-playlist
Rearranging support in playlist
2017-09-05 11:09:24 +09:00
smoogipooo
1904b5edfe Only store native position instead of input state. 2017-09-05 10:38:19 +09:00
Dan Balasescu
f76cecc704 Merge branch 'master' into rearrange-playlist 2017-09-05 10:31:53 +09:00
smoogipooo
e9f0762440 Don't query GetContainingInputManager every Update. 2017-09-05 10:29:51 +09:00
Dean Herbert
f05c6a653d Merge pull request #1206 from Artikash/master
Adjust HP penalties/bonuses based on beatmap specification
2017-09-04 18:59:59 +09:00
Dean Herbert
ed0f2a654b Rename variable 2017-09-04 18:51:50 +09:00
Dean Herbert
12706a894e Merge branch 'master' into master 2017-09-04 18:44:12 +09:00
smoogipooo
ad966f41f5 Fix CI error. 2017-09-04 15:26:09 +09:00
smoogipooo
722b7419d6 Clamp at the end points. 2017-09-04 15:06:21 +09:00
smoogipooo
04c3801fcc Add scrolling points so items can be dragged beyond the list. 2017-09-04 14:58:28 +09:00
smoogipooo
2ed20f5a6f Add better fix for items swapping erratically. 2017-09-04 14:20:40 +09:00
smoogipooo
3b575444be Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references
Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.
2017-09-04 13:12:12 +09:00
smoogipooo
9b0309e683 Use TakeWhile instead of reversing the list. 2017-09-04 11:28:15 +09:00
smoogipooo
9078444a62 Fix items jumping between two indices in the edge case, use a linear search for now. 2017-09-04 11:03:53 +09:00
smoogipooo
c72a9b1301 Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23 2017-09-04 09:42:24 +09:00
smoogipooo
2a64bcda85 Fix resizing bug(?). 2017-09-04 09:32:44 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
8a96c8cd87 Merge pull request #1209 from peppy/song-select-context-menus
Fix ObjectDisposal exceptions due to lingering event binds
2017-09-04 08:30:36 +09:00
Dean Herbert
543a71efcc Fix ObjectDisposal exceptions due to lingering event binds 2017-09-04 08:21:07 +09:00