1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 15:12:54 +08:00
Commit Graph

5717 Commits

Author SHA1 Message Date
DrabWeb
52d524a65e Update with framework changes 2017-05-31 22:39:03 -03:00
DrabWeb
e7bf1e02cb Merge https://github.com/ppy/osu into channel-selection 2017-05-31 22:32:05 -03:00
DrabWeb
6176f1d275 Make the transition when chat is too tall and opening the channel selector smoother 2017-05-31 22:29:52 -03:00
Dan Balasescu
b8d070b29b Merge pull request #887 from peppy/increase-ipc-timeout
Increase timeout in TestImportOverIPC
2017-06-01 10:22:40 +09:00
Dan Balasescu
f29322e374 Merge branch 'master' into increase-ipc-timeout 2017-06-01 10:11:10 +09:00
DrabWeb
d970430174 Fix the channel selector not appearing if the chat is scaled up too tall then back down 2017-05-31 22:08:25 -03:00
DrabWeb
c9403c5200 Incorrect test data spelling 2017-05-31 21:32:50 -03:00
DrabWeb
0439b15728 Generic type argument formatting 2017-05-31 21:29:50 -03:00
Patrick Andersson
a3945bb11d Added suggestions by code inspector 2017-05-31 22:04:29 +02:00
Patrick Andersson
9592e9778b Trim whitespace 2017-05-31 20:31:05 +02:00
Patrick Andersson
1dd85b5986 Add alternative for random beatmap selection
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
DrabWeb
ec8a88c96a Update with framework changes 2017-05-31 05:28:50 -03:00
DrabWeb
9942733b63 Trim whitespace 2017-05-31 05:22:54 -03:00
Seth
394745bca5 Merge branch 'master' into social-browser 2017-05-31 05:18:52 -03:00
Dean Herbert
f59edd697c Merge pull request #866 from ColdVolcano/storyboards
Allow for variables in storyboards
2017-05-31 16:03:25 +09:00
Dean Herbert
a5695aca1c Merge branch 'master' into storyboards 2017-05-31 15:59:01 +09:00
Dean Herbert
0f59645e17 Increase timeout in TestImportOverIPC
Has been failing CI randomly, so let's increase the timeout a bit.
2017-05-31 15:51:52 +09:00
Dean Herbert
013e9d5c69 Merge pull request #886 from DrabWeb/user-dropdown-arrow
Fix user dropdown menu item chevron alignment
2017-05-31 15:44:17 +09:00
Dean Herbert
bab3f1b89a Merge branch 'master' into user-dropdown-arrow 2017-05-31 15:39:52 +09:00
EVAST9919
8cde50a88a Merge branch 'master' of https://github.com/ppy/osu into ingame_options 2017-05-31 08:23:06 +03: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
2c438e6a8e Merge pull request #882 from peppy/update-framework
Update in line with framework
2017-05-31 13:16:29 +09:00
Dan Balasescu
d90006b229 Merge branch 'master' into update-framework 2017-05-31 13:01:17 +09:00
Dean Herbert
9a40470298 Merge pull request #838 from MrTheMake/playsongselect-exit-fix
Unregister OnBeatmapChanged() when exiting song selection
2017-05-31 11:31:12 +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
DrabWeb
e708cdf41a Level Range -> Range Range, don't use empty object initializers 2017-05-30 22:34:02 -03:00
DrabWeb
ecece2bc29 "Use" object initializers in visual test 2017-05-30 22:28:15 -03:00
DrabWeb
a483422b44 CI fixes 2017-05-30 22:23:00 -03:00
DrabWeb
7ba32f2021 Cleanup 2017-05-30 22:11:45 -03:00
DrabWeb
185a4c4d2e Unused usings 2017-05-30 22:00:27 -03:00
DrabWeb
9e01074852 Add GameType and DrawableGameType 2017-05-30 21:41:20 -03:00
DrabWeb
d331aa3b30 Fix random layout animations when loaded 2017-05-30 20:02:05 -03:00
DrabWeb
b97691100f Add ruleset_height to remove magic numbers 2017-05-30 19:53:06 -03:00
DrabWeb
5d6534031e Proper cover loading 2017-05-30 19:35:37 -03:00
DrabWeb
774d37a058 Add transition_duration, remove testing DifficultyIcon 2017-05-30 19:13:05 -03:00
Shawdooow
cb5fcf2572 change mania multiplier 2017-05-30 13:27:10 -04:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04: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
Dean Herbert
6a6f0913cd Merge branch 'master' into social-browser 2017-05-30 20:51:50 +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
EVAST9919
4b624ced36 CI fixes 2017-05-30 12:31:56 +03:00
EVAST9919
e737ded382 Applied suggested changes 2017-05-30 12:23:53 +03:00