Commit Graph

154 Commits

Author SHA1 Message Date
c00a558cb7 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-30 09:35:14 -05:00
9f90b57543 Move BPM calculations to Beatmap. 2017-01-30 16:03:45 +09:00
0272c4b559 Add StarDifficulty property and correct colouring of difficulty icons. 2017-01-30 15:26:28 +09:00
1f2f2fa144 Fix visualtests. 2017-01-30 15:15:56 +09:00
0c2152f3d0 Use beatmap's play mode. 2017-01-30 13:14:02 +09:00
e93f60396f Add the ability for individual game modes to report statistics for display at song select. 2017-01-30 13:12:30 +09:00
3286713d11 avg -> mostly 2017-01-29 15:16:38 +09:00
6027cc7afa Formatting fixes. 2017-01-29 15:15:04 +09:00
2e76874384 Simplify the lookup conditions for hitcircles/sliders (uses duration to discern). 2017-01-29 15:09:42 +09:00
3125fa89ee Fix method which should be class. 2017-01-29 15:06:44 +09:00
77558abf58 Merge branch 'master' into more-beatmap-info
# Conflicts:
#	osu.Game/Screens/Select/BeatmapInfoWedge.cs
2017-01-29 14:47:42 +09:00
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
f3e9da609e Merge pull request #295 from peppy/songselect-footer
Initial implementation of song select footer area.
2017-01-27 16:13:43 +09:00
f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
417933b7ec Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-26 13:57:55 -05:00
f07b9591cd Add null check when popping backgrounds from the mode stack. 2017-01-27 00:41:34 +09:00
139cac5e57 Add fail dialog and flow. 2017-01-27 00:41:34 +09:00
8c7bb4990c Add support for failing. 2017-01-27 00:38:21 +09:00
70271fee35 Move PlayerInputManager to own file. 2017-01-27 00:38:21 +09:00
4a7b3cf391 Initial implementation of song select footer area. 2017-01-27 00:36:12 +09:00
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
3a27178bb1 Merge pull request #289 from UselessToucan/JudgementsCapacity
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
ae464fcace Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00
75de03bd88 Use OsuColour for green text 2017-01-17 18:26:43 -05:00
46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00
7559fc593a Use default background on empty song select screen 2017-01-17 16:43:53 -05:00
5eb1cda77b Rename FilterSongSelect, use OsuColour 2017-01-17 16:43:40 -05:00
63031fbc3d Move filter container z depth and add hover fx 2017-01-17 15:41:50 -05:00
73e46ee8c0 Initial layout of song select filtering UI 2017-01-17 15:41:50 -05:00
259c0964fd Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations 2017-01-16 23:14:35 +03:00
ee0b6be84b Merge pull request #266 from kizayoi/master
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
4030413291 Merge branch 'refs/heads/SirCmpwn/colors' 2017-01-14 06:52:30 +08:00
e81073695f Implement disable mouse buttons 2017-01-13 17:17:04 -05:00
f5f545df62 Refactor OsuColour into injected instance class
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
ef11c3f389 Add default Beatmap ID 2016-12-21 14:47:56 +08:00
02f6e46105 Add support for v9 beatmaps 2016-12-20 23:56:49 +08:00
aebe87fefc better implementation 2016-12-19 16:09:29 +01:00
09f9f86b06 check if dimLevel is null on exit 2016-12-19 14:03:10 +01:00
c614d61b1a getbpm takes Beatmap instead of WorkingBeatmap 2016-12-18 19:34:20 +01:00
ded6588d3b minor style fixed 2016-12-18 17:21:05 +01:00
5f893d46c7 style fixes 2016-12-18 16:53:52 +01:00
db21fe062e Merge pull request #252 from n4b3l/background-dim
basic background dim
2016-12-18 16:04:10 +01:00
66435a515c Don't async/await song selection since audio operations are now on a separate thread. 2016-12-18 15:19:41 +01:00
df305989d0 use config bindable directly 2016-12-18 10:48:59 +01:00
6e10a9bb29 Allow starting maps by clicking an active panel a second time. 2016-12-18 16:59:13 +09:00
2cbc528971 Remove janky beatmap info wedge animation, restore pixel snapping. 2016-12-18 16:50:39 +09:00