1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

5203 Commits

Author SHA1 Message Date
Thomas Müller
3daae480d2 Remove TestCaseTooltip 2017-06-03 17:28:34 +02:00
Thomas Müller
9c6ce230bc Fix compile error 2017-06-03 17:17:56 +02:00
Thomas Müller
b2bbf65e39 Update framework 2017-06-03 17:01:21 +02:00
Thomas Müller
50158a1cd2 Fix incorrect proportions of menu cursor 2017-06-03 16:34:00 +02:00
Jorolf
a43890ffb4 update osu to use the framework's TooltipContainer 2017-06-03 14:50:35 +02:00
Dean Herbert
900e3ce3e2 Merge pull request #888 from Drenata/random-selection-alternatives
Add alternative for random beatmap selection
2017-06-01 18:04:31 +09:00
Dean Herbert
2025eee8eb Merge branch 'master' into random-selection-alternatives 2017-06-01 17:58:15 +09:00
Patrick Andersson
94294e4b45 Changed default selection type and added suggestions from PR feedback 2017-06-01 08:54:48 +02: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
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
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
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
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
03ac700838 Merge pull request #786 from Jorolf/channel-selector-tab-item
Add an "Add new channel" tab
2017-05-30 10:05:26 +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
751e954735 Merge pull request #879 from Tom94/fix-triangle-smoothness
Fix triangle smoothness and optimize further
2017-05-30 09:15:09 +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
Dean Herbert
cf540a60a2 Merge pull request #873 from smoogipooo/mania-judgements
Mania judgements
2017-05-29 22:06:59 +09:00
Dean Herbert
476526714d Merge branch 'master' into mania-judgements 2017-05-29 21:31:48 +09:00
Dean Herbert
efab2296e1 Merge pull request #876 from smoogipooo/mania-barlines
Mania barlines
2017-05-29 21:31:00 +09:00
Dean Herbert
a0c542f461 Merge branch 'master' into mania-barlines 2017-05-29 20:36:50 +09:00
Dean Herbert
d1f32cfbf0 Merge pull request #877 from smoogipooo/mania-holdnote-input
Fix hold note samples not being set correctly for mania-specific beatmaps.
2017-05-29 18:34:23 +09:00
Dean Herbert
fe3e8b146f Merge branch 'master' into mania-holdnote-input 2017-05-29 18:20:31 +09:00
Dean Herbert
1f247bf213 Merge pull request #864 from Jorolf/better-multimod-animation
Improve animation when rotating between available mods
2017-05-29 18:20:22 +09:00
Dean Herbert
0f2508072b Merge branch 'master' into mania-holdnote-input 2017-05-29 18:14:30 +09:00