Commit Graph

59109 Commits

Author SHA1 Message Date
166a78a15a Fix up comment in audio device options 2017-04-08 11:01:41 +02:00
841d101be7 renaming 2017-04-07 20:41:03 +02:00
c60a55285c updated TestCase and some null checks 2017-04-07 20:32:09 +02:00
6a87fd6112 retries and fails hide if they're not present 2017-04-07 20:19:03 +02:00
899e559b5c ratings hide now + remove unnessary stuff 2017-04-07 19:58:49 +02:00
65d9f4fc45 hide MetadataSegments without content and remove fail/retry initialisations 2017-04-07 19:27:14 +02:00
b6ece111a4 Merge pull request #606 from Tom94/fix-audio-crash
Fix crash caused by multiple identical audio device names
2017-04-08 01:31:54 +09:00
e2756b7f8b Merge pull request #607 from peppy/general-fixes
General improvements
2017-04-07 18:31:02 +02:00
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
187a0e3613 Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-07 18:14:14 +02:00
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
ac073e22c9 Fix crash caused by multiple identical audio device names
The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
2017-04-07 17:00:34 +02:00
06a655af5d Move initial position of KeyCounter upwards. 2017-04-07 20:51:37 +09:00
0d4f457265 Improve transitions when exiting play mode. 2017-04-07 20:46:35 +09:00
54d1afb655 Fade in HitRenderer post entering animation. 2017-04-07 20:38:57 +09:00
53c491d4ef Merge pull request #604 from peppy/taiko-fixes
Minor taiko improvements
2017-04-07 17:28:06 +09:00
aa45515a7c Add flash effect when hitting taiko hits. 2017-04-07 16:56:12 +09:00
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
7e99fc47e2 wip 2017-04-07 16:54:54 +09:00
f5f65fa230 Merge pull request #603 from peppy/music-controller-improvements
Improve clickability and visuals of MusicController buttons.
2017-04-07 16:07:19 +09:00
a9d938e7ed Fix brace style. 2017-04-07 15:57:00 +09:00
06776443eb Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:49:14 +09:00
2c2a4169c6 Better structure for button layout. 2017-04-07 15:28:18 +09:00
7d2af9310b Expose DragBar's seeking property. 2017-04-07 15:23:03 +09:00
3dbf4879c7 Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:18:58 +09:00
361e187949 Temporarily disable button scaling. 2017-04-07 14:33:58 +09:00
fa28e7bdc3 Improve clickability and visuals of MusicController buttons. 2017-04-07 14:09:26 +09:00
7c9f30c288 MusicController regression fixes. 2017-04-07 13:15:57 +09:00
bc4e0bfa8b Make DragBar animate seeks. 2017-04-07 13:14:41 +09:00
579c351cfd Merge branch 'master' into details 2017-04-07 12:54:01 +09:00
a56643aa61 Merge pull request #602 from peppy/general-fixes
Don't recommend property code style changes for now.
2017-04-07 12:07:20 +09:00
c67f23a81d Fix unneeded key. 2017-04-07 12:02:30 +09:00
1842d80e28 Update test case. 2017-04-07 09:43:08 +09:00
6d001d8517 Don't recommend property code style changes for now. 2017-04-07 09:41:10 +09:00
9c6d08405a Merge pull request #601 from peppy/general-fixes
General fixes
2017-04-07 09:38:55 +09:00
fba72b9a9e Snaking out on by default. 2017-04-07 09:28:13 +09:00
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
e59c0a770f Merge branch 'master' into details 2017-04-06 15:42:00 +02:00
28193cbaaa hide BeatmapDetails on entering the Select screen 2017-04-06 15:39:23 +02:00
4a29263cd6 Merge pull request #599 from EVAST9919/testcase_fix
Fix Pause/Fail testcase
2017-04-06 18:43:21 +09:00
b380cbfd7a Merge remote-tracking branch 'refs/remotes/ppy/master' into testcase_fix 2017-04-06 12:28:44 +03:00
c6f4cff2e7 Fix Pause/Fail testcase 2017-04-06 12:27:45 +03:00
7b7c0733d1 Merge pull request #598 from huoyaoyuan/code-sanity-update
Update CodeFileSanity.
2017-04-06 18:22:47 +09:00
ff469ee5f6 Update resources for CodeFileSanity. 2017-04-06 16:56:27 +08:00
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
f8f75430e4 Merge branch 'master' into code-sanity-update 2017-04-06 15:55:14 +08:00
96f814db6c Merge pull request #595 from smoogipooo/taiko-fixes
Taiko fixes
2017-04-06 16:32:03 +09:00
0107772737 Fix using. 2017-04-06 16:25:46 +09:00
6fc1384927 Merge branch 'master' into taiko-fixes 2017-04-06 16:23:22 +09:00