h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 05:22:57 +08:00
Code Issues Releases Wiki Activity
5,573 Commits 3 Branches 657 Tags 364 MiB
b4437329cc
Commit Graph

1235 Commits

Author SHA1 Message Date
Dean Herbert
4a3ae6937d
Improve the look of ScreenWhiteBox. 2017-04-21 15:41:22 +09:00
Dean Herbert
c7411c47d6
Update User API stuff. 2017-04-20 19:51:28 +09:00
Dean Herbert
1707c2458e
Update exception name. 2017-04-20 12:11:03 +09:00
Dean Herbert
873599b359
Fix conversion regression. 2017-04-20 11:36:50 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary). 2017-04-20 11:03:11 +09:00
Dean Herbert
015eacb3b8
Merge branch 'results-screen' into score-statistics 2017-04-19 20:51:23 +09:00
Dean Herbert
7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen 
# Conflicts:
#	osu.Game/Users/User.cs
 2017-04-19 20:51:05 +09:00
Dean Herbert
3e48a57e9a Merge branch 'master' into score-statistics 2017-04-19 20:36:14 +09:00
Dean Herbert
1f7ed72dc6
Update font/size. 2017-04-19 17:32:30 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
Dean Herbert
afcd7d7fa0
Format accuracy better in LeaderboardScores. 2017-04-19 16:05:17 +09:00
Dean Herbert
2783f49267
Fix incorrect EndTimes when processing has not been run on HitObjects before the SongProgressGraph is displayed. 2017-04-19 16:05:14 +09:00
Dean Herbert
2f53f2e248
Add license headers. 2017-04-18 22:35:21 +09:00
Dean Herbert
49f4981f1c
Fix CI issues. 2017-04-18 22:28:16 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play. 2017-04-18 22:22:14 +09:00
Dean Herbert
2bf560a371
Disable page three for now. 2017-04-18 22:22:14 +09:00
Dean Herbert
e8d55b5bb5
Add back button. 2017-04-18 22:22:14 +09:00
Dean Herbert
4a3fc710c4
Add temporary combo/accuracy display. 2017-04-18 22:22:14 +09:00
Dean Herbert
f1bd64a74d
Adjust colour metrics. 2017-04-18 22:22:14 +09:00
Dean Herbert
32df625d82
Adjust text size and padding. 2017-04-18 22:22:14 +09:00
Dean Herbert
28835bd5bd
Add back comma separator to score display. 2017-04-18 22:22:14 +09:00
Dean Herbert
782019e0c7
Make line gradient correct. 2017-04-18 22:22:14 +09:00
Dean Herbert
886ac1fb40
Add progress graph background and update ruleset references. 2017-04-18 22:22:14 +09:00
Dean Herbert
968d46a10f
whitespace. 2017-04-18 22:22:14 +09:00
Dean Herbert
49fc91cf37
Add an exit transition. 2017-04-18 22:22:14 +09:00
Dean Herbert
72fcc09a98
Add beatmap info and score date. 
Also adjusts design metrics.
 2017-04-18 22:22:14 +09:00
Dean Herbert
7d32cc85c8
Make leaderboard scores clickable. 2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
Dean Herbert
b0f1851e88
Adjust visuals slightly. 2017-04-18 20:52:57 +09:00
Dean Herbert
1071645dca
Flexible cube count (and thus graph height). 
This also scaled the graph to the height of the maximum value. And much tidying.
 2017-04-18 19:25:52 +09:00
Dean Herbert
3b21340e1b
Split SquareGraph out and make SongProgressGraph also able to take a list of Objects. 2017-04-18 18:40:02 +09:00
Dean Herbert
417a5ca713
A bit of renaming. 2017-04-18 18:29:24 +09:00
Dean Herbert
66865c50ad
Remove explicit RelativeSize setting. 2017-04-18 18:10:13 +09:00
Dean Herbert
784ca2300b
Add safety check for when no objects have been assigned. 2017-04-18 18:09:37 +09:00
Dean Herbert
5ba85818db
Combine push logic and adjust transitions a bit more. 2017-04-18 17:07:02 +09:00
Dean Herbert
ddff26d167
Show metadata when loading between retries. 
Also speeds up the display a bit.
 2017-04-18 17:00:58 +09:00
Dean Herbert
edd71c0560
Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
Dean Herbert
2ccb8b154f
Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
Dean Herbert
24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
Dean Herbert
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
ocboogie
1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00
ocboogie
2bd89e922f Removed unneeded newPlayer 2017-04-17 23:48:21 -07:00
ocboogie
c0f4cbcba6 Added back PlayerLoader overlays 2017-04-17 23:36:11 -07:00
Dean Herbert
727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
ocboogie
be8d32688b Fixed HotkeyRetryOverlay just going to a black screen 2017-04-17 22:36:03 -07:00
ocboogie
5c48fa6cb1 Removed testing line 2017-04-17 21:35:48 -07:00
ocboogie
aa466d0e84 PlayerLoader creates a new instance of the Player class on Restart 2017-04-17 21:32:38 -07:00
smoogipooo
4a60e9299e Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:59:43 +09:00
Dean Herbert
8ef675d9b3
Add fallback to allow FilterCriteria to run without a ruleset being set. 2017-04-18 10:55:45 +09:00
smoogipooo
d5c5b7eb6b Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:09:36 +09:00
Dean Herbert
6b6690caf7
Fix filtering by ruleset. 2017-04-18 10:04:41 +09:00
Dean Herbert
f2174054ea
Fix song select. 2017-04-18 10:04:32 +09:00
smoogipooo
786446354e Fix post-rebase errors. 2017-04-18 09:00:53 +09:00
smoogipooo
2767fbd81a Implement Beatmap conversion testing. 2017-04-18 08:57:09 +09:00
Dean Herbert
928550b1a8 Merge branch 'master' into remove-playmode 2017-04-17 21:01:10 +09:00
Huo Yaoyuan
c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
ocboogie
78273d76e3 Added basic loading screen and test case 2017-04-16 20:18:41 -07:00
ColdVolcano
ca1f89f2cf Fix crash when there's no beatmaps 2017-04-14 17:48:27 -05:00
ColdVolcano
2c6327fca9 Build for real this time 2017-04-14 17:17:51 -05:00
Javier Flores
984c7092a6 Pls AppVeyor don't die 2017-04-14 16:33:58 -05:00
smoogipooo
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
smoogipooo
4a149c4ab8 Better default values + don't set Mode from outside. 2017-04-15 06:14:31 +09:00
smoogipooo
3845ab2a72 Add comment. 2017-04-15 05:55:38 +09:00
smoogipooo
0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be Make BeatmapInfo expose Ruleset instead of PlayMode. 2017-04-15 05:01:36 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
ColdVolcano
0a89e7deb8 Merge remote-tracking branch 'refs/remotes/upstream/master' 2017-04-14 13:32:55 -05:00
ColdVolcano
b7d61add45 Cleanup + AppVeyor fixes 2017-04-14 13:10:59 -05:00
ColdVolcano
b5fc84087f Show song in MusicController and SongSelect 2017-04-14 12:59:15 -05:00
ColdVolcano
2eb73a7c70 More smoothness when MenuMusic is false 2017-04-14 12:58:47 -05:00
ColdVolcano
2a9f4e6950 Get MenuMusic and MenuVoice woking 2017-04-14 12:42:42 -05:00
Dean Herbert
9d753a7798 Merge branch 'master' into song-progress-graph 2017-04-14 19:24:13 +09:00
Dean Herbert
ea0631ede8
Encapsulate progress update logic better. 2017-04-14 18:23:34 +09:00
Dean Herbert
acd7a5b254
Hook up beatmap object density to progress display. 2017-04-14 17:58:37 +09:00
Dean Herbert
6421f040dd
Fix SongProgress handling escape. 2017-04-14 15:27:24 +09:00
Dean Herbert
8c41707ac7
Fix incorrect default state. Handle input better. 2017-04-14 14:40:52 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-04-14 11:25:00 +09:00
Dean Herbert
9bf861d0a4 Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up 
# Conflicts:
#	osu.Game/Screens/Play/FailOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
 2017-04-14 01:07:34 +09:00
Dean Herbert
262a2c9f0e
Add exception for failing. 2017-04-13 19:13:09 +09:00
Dean Herbert
5f8baf874d
Use interpolatedSourceClock's IsRunning value for consistency. 2017-04-13 18:31:23 +09:00
Dean Herbert
1f4e0b0251
Fix MosueUp and HighResolution events not being handled by MenuOverlays. 2017-04-13 13:03:07 +09:00
Dean Herbert
359fea7e25
Improve "escape" pressing logic in pause/fail menus. 2017-04-13 12:40:00 +09:00
Dean Herbert
94bf1d65b6
Fix thread race conditions on pausing close to a fail. 2017-04-13 11:41:08 +09:00
ocboogie
7b240d84da Merge branch 'master' into master 2017-04-12 15:04:27 -07:00
Dean Herbert
2c3fa30386
Metric -> Metrics. 2017-04-12 21:09:39 +09:00
ocboogie
32b87d12b5 Removed unneeded using 2017-04-12 04:54:24 -07:00
Dean Herbert
157ad17606 Merge branch 'master' into details 2017-04-12 20:25:51 +09:00
ocboogie
6c6ef946bd Some more clean up 2017-04-12 04:01:52 -07:00
ocboogie
d250dde537 Fixed repeat keys working for retrying 2017-04-12 02:50:03 -07:00
ocboogie
348dd71406 Fixed repeat keys working for resuming 2017-04-12 02:43:42 -07:00
Jorolf
98ce9e0724 remove ?? 2017-04-12 11:25:32 +02:00
Jorolf
e285d33f8c fails, retries and size not enforced 2017-04-12 11:05:10 +02:00
Jorolf
d2affe6867 requested changes 2017-04-12 10:52:24 +02:00
ocboogie
8cad09370d Fixed pause and fail screen overlap 2017-04-12 00:20:41 -07:00
ColdVolcano
50cb9e0fe7 Match stable search parameters 2017-04-11 18:07:54 -05:00
Jorolf
ed2f5d210e condensed some commits because they were small or already reversed 2017-04-11 22:48:53 +02:00
Jorolf
50b6bcd574 Merge branch 'master' into details 2017-04-11 19:06:58 +02:00
Jorolf
d4e5f55091 the power of linq 2017-04-11 18:43:48 +02:00
Dan Balasescu
3b60ca3c1c Merge branch 'master' into leaderboard-api 2017-04-12 00:14:24 +09:00
Dan Balasescu
bc98e53aff I helped. 2017-04-12 00:09:45 +09:00
Jorolf
9026880495 fix 2017-04-11 14:40:12 +02:00
Jorolf
9dd8920c2c 🤔 I hope this works 2017-04-11 14:22:13 +02:00
Jorolf
bfebba3a20 null reference fixes 2017-04-11 14:12:23 +02:00
Jorolf
fb5952186c changes and fixes 2017-04-11 14:02:56 +02:00
Dean Herbert
1a1607aaaa
Improve the look of the transition on hotkey retry (and retry in general). 2017-04-11 19:58:57 +09:00
Dean Herbert
9732110bd9
Update TransformTo methods in line with framework changes. 2017-04-11 17:25:56 +09:00
Dean Herbert
dc3a2d45fe
Move API lookup from BeatmapDetailArea to Leaderboard. 2017-04-11 16:36:50 +09:00
Dean Herbert
ecfe68d6fb
Hide deprecated API storage variables and populate Score.User automatically. 2017-04-11 16:36:47 +09:00
Jorolf
ad41fd5c1a more unnecessary stuff 2017-04-10 16:49:48 +02:00
Jorolf
a597149b7f Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-10 16:42:42 +02:00
Jorolf
24b4b3ad7d update to everything 2017-04-10 16:42:23 +02:00
Dean Herbert
c6a24bb549
Merge branch 'master' into details 2017-04-10 20:07:13 +09:00
Dean Herbert
43a4657540
Remove unnecessary AlwaysPresent. 2017-04-10 17:26:05 +09:00
Dean Herbert
3a01cfccee
Adjust fade length and easing. 2017-04-10 17:25:56 +09:00
Dean Herbert
15c1013f5b
Don't schedule event, it's unreliable and doesn't match the fade. 2017-04-10 17:25:46 +09:00
Andrey Zavadskiy
7366640b95 Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry 2017-04-10 09:10:20 +03:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
Andrey Zavadskiy
1879a05c7b Removed using 2017-04-10 06:10:12 +03:00
Andrey Zavadskiy
e73f543c4f Applied suggestions 2017-04-10 06:06:10 +03:00
Andrey Zavadskiy
a7264aa84c Warning fix 2017-04-09 17:53:16 +03:00
Andrey Zavadskiy
425e96c45c Moved logic to it's own class 2017-04-09 17:44:19 +03:00
Andrey Zavadskiy
4ab4f65c83 Retry on Tilde key 2017-04-09 16:26:31 +03:00
Jorolf
bcef1ce2b6 replace space in text with Spacing in FillFlowContainer 2017-04-08 13:59:22 +02:00
Jorolf
f7a9a11ae5 Bar uses AccentColour aswell 2017-04-08 13:53:11 +02:00
Dean Herbert
adc16b0727 Merge pull request #608 from Tom94/music-controller-button-animation 
Music controller button animation
 2017-04-08 20:48:39 +09:00
Jorolf
5e56e84c4a change SRGBColour to Color4 and use IHasAccentColour in some places 2017-04-08 13:31:55 +02:00
Dean Herbert
b5431c496b Fix osu! logo handling drags for no reason. 2017-04-08 19:34:04 +09:00
Jorolf
c60a55285c updated TestCase and some null checks 2017-04-07 20:32:09 +02:00
Jorolf
6a87fd6112 retries and fails hide if they're not present 2017-04-07 20:19:03 +02:00
Jorolf
899e559b5c ratings hide now + remove unnessary stuff 2017-04-07 19:58:49 +02:00
Jorolf
65d9f4fc45 hide MetadataSegments without content and remove fail/retry initialisations 2017-04-07 19:27:14 +02:00
Jorolf
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
Jorolf
eb4b3772e9 put Bar into its own file and let it only add a background if BackgroundColour is changed 2017-04-07 18:13:55 +02:00
Dean Herbert
0d4f457265
Improve transitions when exiting play mode. 2017-04-07 20:46:35 +09:00
Dean Herbert
54d1afb655
Fade in HitRenderer post entering animation. 2017-04-07 20:38:57 +09:00
Dean Herbert
39175905e4
Fix crashes on completing a taiko map (where a strong his is the last hit in the map). 2017-04-07 16:56:09 +09:00
Dean Herbert
7e99fc47e2
wip 2017-04-07 16:54:54 +09:00
Dean Herbert
1842d80e28
Update test case. 2017-04-07 09:43:08 +09:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Modes/UI/HudOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
 2017-04-07 09:22:18 +09:00
Jorolf
e59c0a770f Merge branch 'master' into details 2017-04-06 15:42:00 +02:00
Jorolf
28193cbaaa hide BeatmapDetails on entering the Select screen 2017-04-06 15:39:23 +02:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Huo Yaoyuan
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
Dean Herbert
942699218a Merge branch 'master' into details 2017-04-06 15:44:43 +09:00
Dean Herbert
7c63c8394b
Remove unnecessary depth setting. 2017-04-06 15:36:03 +09:00
Dean Herbert
a18367454d
InGameOverlay -> MenuOverlay. 2017-04-06 15:34:52 +09:00
Dean Herbert
856696b17e
Fix incorrect verbatim strings. 2017-04-06 15:31:21 +09:00
Dean Herbert
6285f3eea8 Merge branch 'master' into pause_buttons_refactor 2017-04-06 15:00:48 +09:00
Andrey Zavadskiy
0946e42363 removed useless stuff 2017-04-05 22:51:43 +03:00
Andrey Zavadskiy
6a510097df InGameOverlay fixes 2017-04-05 22:36:03 +03:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
Dean Herbert
4b1588a21d
Fix correct mode filter not being applied when first entering song select. 2017-04-05 17:33:19 +09:00
Dean Herbert
8173d01d78
Fix crash on changing play mode too early. 2017-04-05 17:26:45 +09:00
Andrey Zavadskiy
f2a9ec0f24 Converted constructor to protected 2017-04-04 19:02:36 +03:00
Andrey Zavadskiy
7b95f2d46a InGameOverlay now is abstract 2017-04-04 18:53:13 +03:00
Andrey Zavadskiy
62655b70c9 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-04-04 18:41:37 +03:00
Jorolf
b2731bb0a1 some formatting 2017-04-04 17:27:08 +02:00
Jorolf
58f8dc8254 add direction to graphs 2017-04-04 17:17:22 +02:00
Dean Herbert
7c74951454
Update bindables. 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
 2017-04-04 11:34:13 +09:00
Dean Herbert
f6303d55ec
Upodate some tab usages. 2017-04-04 11:13:09 +09:00
Dean Herbert
d0ebbad0fa
Fix avatar display. 2017-04-04 10:33:41 +09:00
Jorolf
8e689a06d8 change font 2017-04-03 23:03:49 +02:00
Jorolf
5a694e0c9d changed location of BarGraph to be more generic 2017-04-03 19:29:13 +02:00
Jorolf
f3946bebb4 Merge branch 'master' of git://github.com/ppy/osu into details 2017-04-03 18:33:47 +02:00
smoogipooo
27132958c8 Merge remote-tracking branch 'origin/master' into taiko-drawable-generation 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-04-03 14:19:31 +09:00
Dean Herbert
263374a357 Remove unnecessary using. 2017-04-02 17:11:31 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Andrey Zavadskiy
1ecff1b32c Fix naming and testcase 2017-04-01 21:50:25 +03:00
Andrey Zavadskiy
f70de7439b Moved title and description to each class 2017-04-01 21:42:12 +03:00
Andrey Zavadskiy
bd123fa906 Better inheritance 2017-04-01 21:29:17 +03:00
Andrey Zavadskiy
e3a8a14281 Removed unnecessary using 2017-04-01 21:19:49 +03:00
Andrey Zavadskiy
ebc814f06a Typos fix 2017-04-01 21:17:24 +03:00
Andrey Zavadskiy
3574dac780 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-04-01 21:03:19 +03:00
Jorolf
017281246d changed SpriteText to OsuSpriteText 2017-04-01 18:12:44 +02:00
Jorolf
d0b4f86725 fix errors from merge 2017-04-01 14:16:18 +02:00
Jorolf
072a77b4d9 Merge branch 'master' of git://github.com/ppy/osu into details 2017-04-01 14:12:20 +02:00
Jorolf
e380254386 remove unnecessary code 2017-03-31 22:32:09 +02:00
Jorolf
1f19d72474 removed wrong using >.> 2017-03-31 21:24:05 +02:00
Jorolf
d8bb72dd78 remove unused using-directive 2017-03-31 21:19:23 +02:00
Jorolf
50b8580141 add license header 2017-03-31 21:13:20 +02:00
Jorolf
47698be1f5 Merge branch 'master' into details 2017-03-31 21:10:45 +02:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox. 2017-03-31 17:38:33 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
Jorolf
0d4f2c59a5 there's probably something in here I overlooked 2017-03-30 17:32:18 +02:00
Jorolf
15326204d5 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-30 16:38:25 +02:00
smoogipooo
76d0beb64f
Fix custom transform. 2017-03-30 22:28:51 +09:00
Jorolf
a3430dd072 add culture info 2017-03-29 16:10:07 +02:00
Jorolf
cdb3150c56 add readonlies and remove unused using directives 2017-03-29 16:00:29 +02:00
Jorolf
6982529481 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-29 15:47:00 +02:00
Jorolf
ab4d1c7725 better maxValue calculation for the retry and fail graph 2017-03-29 15:33:36 +02:00
Jorolf
7bd13d76a8 fixes + updates to DetailsBar and a button for the TestCaseDetails 2017-03-29 14:48:43 +02:00
Dean Herbert
6afa6f30cc
Keep selected beatmap in centre of screen post-filter. 2017-03-29 20:01:46 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
Dean Herbert
b96a153e0e
Resize ranks better. 2017-03-29 12:24:04 +09:00
smoogipooo
eed50784ba Make player work with TaikoHitRenderer. 2017-03-29 11:35:57 +09:00
Dan Balasescu
d7674e2367 Merge branch 'master' into dynamic-recompile 2017-03-29 10:12:48 +09:00
Dean Herbert
ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
Dan Balasescu
bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
Dan Balasescu
e53a5a3521 Merge branch 'master' into avatars-and-login 2017-03-29 07:52:43 +09:00
Jorolf
199c70ff95 Added fails and retries 2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c Added ratings and different bar rotations 2017-03-28 17:12:54 +02:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Andrey Zavadskiy
91e18cc63e Fix usings 2017-03-28 12:12:35 +03:00
Andrey Zavadskiy
cf3db49631 Inherit Pause/Fail overlay from InGameOverlay 2017-03-28 12:09:26 +03:00
Andrey Zavadskiy
687f71e410 Fixes 2017-03-28 11:45:48 +03:00
Andrey Zavadskiy
60be69d3b0 Fixes 2017-03-28 11:41:08 +03:00
Andrey Zavadskiy
85c2184170 Fixes 2017-03-28 11:33:56 +03:00
Andrey Zavadskiy
62693a6a59 Again separate classes 2017-03-28 10:49:58 +03:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
Dean Herbert
f690e1d0c4
Move async logic to framework. 2017-03-28 14:24:34 +09:00
Andrey Zavadskiy
9774f826ab Pause and fail overlays -> StopOverlay 2017-03-28 06:08:31 +03:00
Andrey Zavadskiy
c4500fa270 fixes 2017-03-28 05:19:32 +03:00
Andrey Zavadskiy
110d43bc25 fixes 2017-03-28 05:12:04 +03:00
Andrey Zavadskiy
457f5c6a89 Removed unised using statement 2017-03-28 04:58:30 +03:00
Andrey Zavadskiy
2348b619a3 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-03-28 04:55:46 +03:00
Andrey Zavadskiy
5461c6516a Refactor PauseOverlay, FailDialog -> FailOverlay 2017-03-28 04:53:57 +03:00
Andrey Zavadskiy
2f9a15092b Refactor pause buttons 2017-03-28 04:52:11 +03:00
Dean Herbert
13272e6995
Make Avatar accept a user. 
Add UpdateableAvatar to handle the toolbar use-case.
 2017-03-28 00:08:26 +09:00
Dean Herbert
0ad070c2d8
Update grade textures. 2017-03-27 22:24:47 +09:00
Jorolf
775fd63d0f Added difficulty container 2017-03-25 23:33:03 +01:00
Jorolf
d8724e5e3e Add metadata details 2017-03-24 23:02:24 +01:00
DrabWeb
f0035659db Unused using 2017-03-24 00:45:19 -03:00
DrabWeb
a6dfed9668 Formatting 2017-03-24 00:41:56 -03:00
DrabWeb
0edee04200 Use OsuColour instead of static colours 2017-03-24 00:41:14 -03:00
Dean Herbert
cb0c7dca71 Merge branch 'master' into taiko_scoreprocessing 2017-03-24 12:25:19 +09:00
DrabWeb
f1f6f2041f Null track handling in player 2017-03-23 23:57:33 -03:00
DrabWeb
befbc63c35 Merge https://github.com/ppy/osu into song-progress-graph 2017-03-23 23:42:06 -03:00
DrabWeb
b56fb310bf More cleanup 2017-03-23 23:38:23 -03:00
smoogipooo
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
DrabWeb
0a11d035fe Formatting 2017-03-23 09:07:13 -03:00
DrabWeb
b429d8f1b3 More proper fix 2017-03-23 09:05:53 -03:00
DrabWeb
3364801221 Fix for the fix 2017-03-23 08:32:24 -03:00
DrabWeb
bbca6cf602 Fix bottom square being clipped 2017-03-23 08:13:03 -03:00
DrabWeb
938f5eaf58 Dragging 2017-03-23 07:38:08 -03:00
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting. 2017-03-23 19:35:46 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie. 2017-03-23 19:32:58 +09:00
DrabWeb
ca2816f9c8 Formatting 2017-03-23 07:24:43 -03:00
DrabWeb
3923892863 Delete SongProgressGraphColumn.cs 2017-03-23 07:20:16 -03:00
DrabWeb
546a3d0914 Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph 2017-03-23 07:15:53 -03:00
DrabWeb
0337f18fb9 Cleaning 2017-03-23 06:37:12 -03:00
Dean Herbert
b5d661b53a
some fixing and restyling. 2017-03-23 18:20:00 +09:00
Dean Herbert
4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00
Dean Herbert
644e9ae9d5
Increase padding to make flyte happy. 2017-03-23 16:36:52 +09:00
Dean Herbert
6bcbd116c8
Only get APIAccess from DI (it's all we need). 2017-03-23 16:32:35 +09:00
Dean Herbert
3ae7d0cb98
Better handle the passing of Beatmap and updating of scores. 
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
 2017-03-23 16:31:08 +09:00
Dean Herbert
a561611125
Set default tab to global scores. 
This will need to be saved to the config file eventually.
 2017-03-23 16:29:10 +09:00
Dean Herbert
022fd625df
Remove transitions for now 
If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.
 2017-03-23 16:28:45 +09:00
DrabWeb
88d878e1d5 Formatting 2017-03-23 02:47:27 -03:00
DrabWeb
b8129526a4 Typo 2017-03-23 02:29:23 -03:00
Dean Herbert
e77229b34b Merge branch 'master' into beatmap-detail-tabs 2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5 Formatting 2017-03-23 01:35:55 -03:00
DrabWeb
67421cdf1c Even though it was 5 minutes ago what was I thinking 2017-03-23 01:34:06 -03:00
DrabWeb
677b8afc1f Integration 2017-03-23 01:19:29 -03:00
DrabWeb
87b8015e8f Cleanup 2017-03-23 00:29:28 -03:00
DrabWeb
c173c4b7ee Tab control 2017-03-23 00:22:31 -03:00
DrabWeb
5ebbc2c0ba Formatting 2017-03-22 09:33:01 -03:00
DrabWeb
818bdd8e88 SongProgress in HudOverlay 2017-03-22 09:27:04 -03:00
DrabWeb
333008e26d Formatting 2017-03-22 08:59:44 -03:00
DrabWeb
340ddb59cd License headers 2017-03-22 08:54:21 -03:00
DrabWeb
29c54d4d8b Merge https://github.com/ppy/osu into song-progress-graph 2017-03-22 08:50:17 -03:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes. 2017-03-22 19:35:03 +09:00
Dean Herbert
f3486b7288
Add correct lifetime expiry for leaderboard content 2017-03-22 09:07:02 +09:00
Dean Herbert
7387dbd9fc
Tidy up LeaderboardScore 2017-03-22 09:04:33 +09:00
Dean Herbert
1699daaf7f
Make DrawableRank safer. 2017-03-22 08:32:28 +09:00
Dean Herbert
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
Dean Herbert
0b2bb2ea0e Fix typo in font name declaration. 2017-03-21 22:51:49 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert
09bf014ded Simplify fade out gradient code. 2017-03-19 21:49:29 +09:00
Dean Herbert
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
Dean Herbert
256a3268ac Inline single usage of EdgeEffect. 2017-03-19 18:51:40 +09:00
Thomas Müller
44f71b3975 Merge branch 'master' into fix-beatmap-options 2017-03-19 09:34:53 +01:00
Dean Herbert
8cb334a118 Adjust sizing a touch. 2017-03-19 16:34:29 +09:00
DrabWeb
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
Dean Herbert
3d8ec4fa05 FIx transition not always being correct. 2017-03-19 02:33:25 +09:00
Dean Herbert
3c7b4a8ffa Fix cursor being displayed during disclaimer. 2017-03-19 01:59:13 +09:00
DrabWeb
0bc8ed9c9e Use Colour for non-faded scores 2017-03-18 01:56:19 -03:00
DrabWeb
e78069af12 Parenthesis 2017-03-18 01:48:29 -03:00
DrabWeb
b9d5ab5d8c Only calculate fade for fading leaderboard scores 2017-03-18 01:44:05 -03:00
DrabWeb
fbb8e79f1a Move ctor above methods 2017-03-17 19:45:51 -03:00
DrabWeb
137611ecf3 Use LeaderboardScore height for fade 2017-03-17 19:07:45 -03:00
DrabWeb
82c02fa1fc Formatting 2017-03-17 18:29:55 -03:00
Seth
4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00
DrabWeb
27ab8e2e86 Merge 2017-03-17 18:21:35 -03:00
DrabWeb
0834b5b794 Made requested changes 2017-03-17 18:16:59 -03:00
Dan Balasescu
e529f5e439 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 02:12:56 +09:00
smoogipooo
bcaf12e3d9 Rename Criteria -> CreateCriteria and make into method. 2017-03-18 02:11:14 +09:00
Dan Balasescu
cd30958086 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 01:25:22 +09:00
Dean Herbert
3e3cde01ef
Fix missing permitNulls. 2017-03-17 21:21:16 +09:00
Dean Herbert
f9f31ca092
Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
Dean Herbert
7110ab8e17
Stop cursor moving when paused. 2017-03-17 20:45:27 +09:00
Dean Herbert
0a03bdc428
Add missing license header. 2017-03-17 20:44:02 +09:00
Dean Herbert
6be80c95ae
Preload song select from main menu. 2017-03-17 20:11:59 +09:00
Dean Herbert
c7fa79b027
Fix nullref. 2017-03-17 20:09:23 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
Dean Herbert
4b97304603
CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
Dean Herbert
dc28f8c79e
Remove all external access to BeatmapGroup. 2017-03-17 19:12:15 +09:00
Dean Herbert
9c664e5b05
Reorganise song select methods to allow for more flexibility. 2017-03-17 11:52:54 +09:00
smoogipooo
9a4af8f194 GetScore -> CreateScore. 2017-03-17 02:03:12 +09:00
smoogipooo
2394e7ff78 Make CheckFailed not actually trigger internal things, and make private. 2017-03-17 01:36:30 +09:00
Dean Herbert
ea642e5ef4 Merge branch 'master' into scoreprocessor_failing_improvements 2017-03-17 00:52:30 +09:00
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
smoogipooo
b13340c3c8 Move CheckFailed outside of Schedule(). 2017-03-17 00:30:23 +09:00
Dean Herbert
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
Dean Herbert
271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
Dean Herbert
e17f728282
Fix CI. 2017-03-16 17:04:03 +09:00
Dean Herbert
1a7c2eda5e
Size FilterControl relatively now that we can. 2017-03-16 17:01:02 +09:00
Dean Herbert
bd5493fb25
Add back correct defaults. 2017-03-16 16:44:14 +09:00
Dean Herbert
334e389518
Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
Dean Herbert
4bedd4d2d7
Block input behind FilterControl. 2017-03-16 14:33:31 +09:00
Dean Herbert
da6b98db10
fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
Dean Herbert
269c1a5e5c
Reword some comments. 2017-03-16 14:08:37 +09:00
Dean Herbert
352de22590
Filter doesn't need to be public, nor have a property. 2017-03-16 14:08:29 +09:00
Dean Herbert
4d84bf7350
Change difficulty sort to be based on MaxStarDifficulty. 2017-03-16 13:59:23 +09:00
smoogipooo
2a2caeba32 Add better failing support to ScoreProcessor. 2017-03-16 13:39:57 +09:00
Dean Herbert
ff37d2da03
Index -> Rank + some formatting. 2017-03-16 13:15:06 +09:00
Dean Herbert
8e5d83b857
Isolate leaderboard retrieval code into its own method. 2017-03-16 12:56:59 +09:00
smoogipooo
c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +09:00
Dean Herbert
a22b34817c Merge branch 'master' into leaderboards 2017-03-16 11:12:53 +09:00
Drew DeVault
01cca1a4d2 Refactor color handling 
colour*
 2017-03-15 20:52:31 -04:00
Drew DeVault
db5a1e241a Don't crash on unimplemented sorts 2017-03-15 20:18:20 -04:00
Drew DeVault
3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
Drew DeVault
cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04:00
DrabWeb
cf81467e13 Move fade start out of loop 2017-03-15 14:00:31 -03:00
DrabWeb
cd37ebdff2 Fading 2017-03-15 13:57:41 -03:00
DrabWeb
efd617dd34 Formatting 2017-03-15 08:53:36 -03:00
DrabWeb
20685d51cd Adjust delays to start at 0 2017-03-15 08:51:07 -03:00
DrabWeb
847d485d5f Remove schedules 2017-03-15 08:49:17 -03:00
DrabWeb
aea9a7b795 LeaderboardScore state, initial delay handled by leaderboard 2017-03-15 08:44:29 -03:00
DrabWeb
7572947214 Badge -> Team 2017-03-15 08:09:44 -03:00
Dan Balasescu
a3906820ec Merge branch 'master' into beatmap_parsing 2017-03-15 19:29:45 +09:00
Dean Herbert
56868e3c06
Make a few more strings literals. 2017-03-15 19:21:55 +09:00
Dean Herbert
f2cfcdb2ca
Force an OnBeatmapChanged event to invoke when entering a screen. 2017-03-15 19:09:30 +09:00
Dean Herbert
1855f48997
Add cancellation support for API requests. 2017-03-15 18:07:26 +09:00
Dean Herbert
295f821025
Add leaderboard to song select. 2017-03-15 17:11:08 +09:00
Dean Herbert
4f95378f27
Add fade out of previously displayed scores. 2017-03-15 17:10:54 +09:00
Dean Herbert
78efecb89d
Remove Alpha 0.001 hack. 2017-03-15 17:07:56 +09:00
Dean Herbert
775a86e798
Add null-checks and fallbacks to make display work with current API version. 2017-03-15 15:22:46 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages). 2017-03-15 15:22:28 +09:00
Dean Herbert
7bc0a1fdfe
Use fixed-width for score display. 2017-03-15 15:21:07 +09:00
Dean Herbert
dfc4bccbe0
Add some padding to leaderboard. 2017-03-15 14:42:56 +09:00
Dean Herbert
c1f56c7c0e
Scores should be enumerable. 2017-03-15 14:38:38 +09:00
Dean Herbert
15e713899d
Add a left content area to song select. 2017-03-15 14:34:19 +09:00
Dean Herbert
d96a78459d
Rename ScoreRanks to be in line with current API. 2017-03-15 13:55:29 +09:00
Kelvin
4353c9dc3d Fixed Warnings 2017-03-14 20:42:02 -07:00
Kelvin
18afd8eabe Fixed license headers 2017-03-14 20:30:42 -07:00
Dean Herbert
253bcebf51
Merge remote-tracking branch 'upstream/master' into leaderboards 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2017-03-15 12:23:34 +09:00
Kelvin
20e2e7a8c8 Sort on SortTabs ValueChanged 2017-03-14 20:19:41 -07:00
Kelvin
755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
Kelvin
ee3d3b682f Updated usage for DropDownHeader of FilterTabControl 2017-03-14 19:49:40 -07:00
Kelvin
40bcc63a90 Added and styled FilterTabControls 2017-03-14 19:49:40 -07:00
Kelvin
2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
Huo Yaoyuan
37ff1f3971 Control footer by virtual property. 2017-03-15 10:10:59 +08:00
DrabWeb
09cb0d6bbc Proper icons 2017-03-14 12:58:22 -03:00
DrabWeb
94c2734b09 More warnings 2017-03-14 12:15:19 -03:00
DrabWeb
55187a8380 Warnings, accuracy formatting 2017-03-14 11:55:19 -03:00
Huo Yaoyuan
8c991eae01 Fix CI issues. 2017-03-14 22:27:24 +08:00
DrabWeb
4c03b62a75 More usings 2017-03-14 11:23:48 -03:00
Huo Yaoyuan
a8d15e616b Remove parameter of OnSelected. 2017-03-14 22:22:23 +08:00
Huo Yaoyuan
b2dd9afcf3 Update editor workflow and make edit button works. 2017-03-14 22:18:40 +08:00
DrabWeb
ebe48b7c24 Removed D rank 2017-03-14 11:14:27 -03:00
DrabWeb
322446effe -Unused usings 2017-03-14 11:11:23 -03:00
DrabWeb
650fc7563d ScoreRank, Avatar to own files, +DrawableRank 2017-03-14 10:58:28 -03:00
Huo Yaoyuan
f068f7c4bd No footer in EditSongSelect. 2017-03-14 21:51:26 +08:00
Huo Yaoyuan
259d39c6ad Stop playing the track in editor 
to avoid unused member warning
 2017-03-14 21:28:33 +08:00
Huo Yaoyuan
f97e8ae97f Fix typo and warnings. 2017-03-14 21:20:38 +08:00
Huo Yaoyuan
c939897a8a Revert "Auto assign hotkeys for BeatmapOptionsButton." 
This reverts commit beb0a8ff03.
 2017-03-14 21:13:57 +08:00
Dean Herbert
8176b4ef77
Fix merge errors. 2017-03-14 22:11:38 +09:00
Dean Herbert
12326f610e
Adjust transition to flyte's liking. 2017-03-14 22:11:29 +09:00
Seth
21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
DrabWeb
d53f219051 Adjusted score rank size 2017-03-14 10:04:42 -03:00
Huo Yaoyuan
e1cc74bb40 Merge branch 'master' into more-songselect 2017-03-14 20:50:53 +08:00
Huo Yaoyuan
beb0a8ff03 Auto assign hotkeys for BeatmapOptionsButton. 2017-03-14 20:50:43 +08:00
Huo Yaoyuan
35a60a8f7d Use depth to arrange buttons. 2017-03-14 20:19:05 +08:00
Huo Yaoyuan
618e8e822b Implement EditSongSelect and MatchSongSelect. 2017-03-14 19:53:20 +08:00
Huo Yaoyuan
3871a350f8 Move BeatmapOptions buttons to derived class and simplify. 2017-03-14 19:38:21 +08:00
smoogipooo
72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
Huo Yaoyuan
c4e5eac35b Move footer stuff to derived. 2017-03-14 18:38:06 +08:00
Huo Yaoyuan
9a4247f67e Make Footer handles hotkey. 2017-03-14 18:16:04 +08:00
Huo Yaoyuan
c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
Dean Herbert
5c2bf02c9d Merge branch 'master' into beatmap_parsing 2017-03-14 17:50:00 +09:00
Huo Yaoyuan
fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
Huo Yaoyuan
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
Dean Herbert
14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes 
# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
 2017-03-14 16:15:26 +09:00
Dean Herbert
1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter). 2017-03-14 16:00:35 +09:00
smoogipooo
854212a7aa Merge branch 'master' into beatmap_parsing 
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
 2017-03-14 13:39:19 +09:00
Dan Balasescu
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Dean Herbert
0da950beac
Fix KeyCounter M1 M2 display. 2017-03-14 12:31:09 +09:00
Dean Herbert
1eacafc7b4
Merge branch 'master' into general-fixes 2017-03-14 12:02:24 +09:00
Dean Herbert
4fa037c0b2
Update framework. 2017-03-14 12:01:58 +09:00
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00