RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,787 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

635 Commits

Author SHA1 Message Date
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
Dean Herbert 727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
Dean Herbert af13f97435
Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
Dean Herbert a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
smoogipooo 4a149c4ab8 Better default values + don't set Mode from outside. 2017-04-15 06:14:31 +09:00
smoogipooo 0333e1a050 Remove unused usings. 2017-04-15 05:57:18 +09:00
smoogipooo 0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
smoogipooo 59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert 98544a8077
Fix unsynchronised tweening. 2017-04-14 19:20:07 +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
Poliwrath dffdb100ab Small fix to the chat overlay to prevent crashing on the test 2017-04-11 21:35:49 -04:00
Dean Herbert 9732110bd9
Update TransformTo methods in line with framework changes. 2017-04-11 17:25:56 +09:00
Dean Herbert 5af4259ab4
Add back explicit binds. 2017-04-10 17:10:15 +09:00
Dean Herbert f12b5a8954
Unify disable logic. 2017-04-10 16:22:36 +09:00
Dean Herbert b7cfdff8d1
Update SliderBar to use IHasCurrentValue. 2017-04-10 15:30:17 +09:00
Dean Herbert bb4a909de5
Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
Dean Herbert e1e9772d46 Flash buttons on click. 2017-04-08 19:28:29 +09:00
Dean Herbert e40ad69a3b Adjust icon scale of play button. 2017-04-08 19:25:40 +09:00
Thomas Müller b99cbe6962 Add back nice scaling of music controller buttons 2017-04-08 19:17:20 +09:00
Thomas Müller 166a78a15a Fix up comment in audio device options 2017-04-08 11:01:41 +02:00
Thomas Müller 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
Dean Herbert 7e99fc47e2
wip 2017-04-07 16:54:54 +09:00
smoogipooo a9d938e7ed Fix brace style. 2017-04-07 15:57:00 +09:00
Dean Herbert 06776443eb
Merge branch 'music-controller-improvements' into song-progress-graph 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-04-07 15:49:14 +09:00
Dean Herbert 2c2a4169c6
Better structure for button layout. 2017-04-07 15:28:18 +09:00
Dean Herbert 7d2af9310b
Expose DragBar's seeking property. 2017-04-07 15:23:03 +09:00
Dean Herbert 3dbf4879c7
Merge branch 'music-controller-improvements' into song-progress-graph 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-04-07 15:18:58 +09:00
Dean Herbert 361e187949
Temporarily disable button scaling. 2017-04-07 14:33:58 +09:00
Dean Herbert fa28e7bdc3
Improve clickability and visuals of MusicController buttons. 2017-04-07 14:09:26 +09:00
Dean Herbert 7c9f30c288
MusicController regression fixes. 2017-04-07 13:15:57 +09:00
Dean Herbert bc4e0bfa8b
Make DragBar animate seeks. 2017-04-07 13:14:41 +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
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 efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
Dean Herbert 863dc44c4d
Some minor improvements. 2017-04-06 09:57:34 +09:00
Andrey Zavadskiy 009909dd4b Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 17:39:53 +03: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 83322dc5cb Merge branch 'master' into hud_visibility 2017-04-03 11:51:11 +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 d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
Dean Herbert fa7fd6efe3
Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
Dean Herbert f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert 4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
Dean Herbert 768b3c4b4b
Add better focus handling in the login form. 2017-03-28 00:08:27 +09: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 4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00