30e2e7bfe4
Merge branch 'master' into slider-stuff
2017-04-25 19:42:46 +09:00
a6ea6738e5
add some spaces after commas
2017-04-24 17:10:00 +02:00
7ef90e6597
Merge branch 'master' of git://github.com/ppy/osu into slider-stuff
2017-04-24 17:05:32 +02:00
3c98170330
Use method group for MusicController fault.
2017-04-24 20:22:21 +09:00
6a05440e6c
Only schedule when faulted
2017-04-23 00:53:21 -05:00
1d254f4a56
Take MusicController back to life
2017-04-23 00:13:58 -05:00
60bb45358c
remove more casts and usings
2017-04-22 18:36:37 +02:00
b151c71c0e
remove casts
2017-04-22 18:36:36 +02:00
e53c4be356
I guess this works...
2017-04-22 18:36:36 +02:00
02249dcd67
add a function to OsuSliderBar to manually set the tooltip text
2017-04-22 18:34:57 +02:00
1d2f19b5a2
change background dim from integer to double
2017-04-22 18:34:03 +02:00
2d91400239
Fix nullref due to framework change.
2017-04-22 16:56:17 +09:00
d94035e9da
Merge branch 'master' into general-fixes
2017-04-21 20:42:46 +09:00
5fdc9819cf
Add basic UO support (now called Audio Offset).
2017-04-21 16:20:05 +09:00
25a7d99a8e
Remove unused reference.
2017-04-21 16:11:24 +09:00
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
...
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
ef7bc0f92e
Update UI controls to understand DisabledChanged.
2017-04-21 14:02:04 +09:00
093abd6872
Add chat toggle button.
2017-04-19 19:54:03 +09:00
c7246fd2ac
Reorganise ChatOverlay to not suck.
2017-04-19 19:15:21 +09:00
dda3fb85ee
Add user colour support.
2017-04-19 19:07:38 +09:00
3129708ccb
Add chat sending support.
2017-04-19 18:46:52 +09:00
87f6dc9e5a
Change default channel to #lazer.
2017-04-19 18:46:50 +09:00
325af333b9
Update API responses for chat.
2017-04-19 18:46:48 +09:00
64a8992153
Merge branch 'master' into general-fixes
2017-04-18 16:19:52 +09:00
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
727086c0b2
Updates in-line with framework.
2017-04-18 15:34:53 +09:00
af13f97435
Fix regressions and test cases.
2017-04-17 19:44:03 +09:00
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
4a149c4ab8
Better default values + don't set Mode from outside.
2017-04-15 06:14:31 +09:00
0333e1a050
Remove unused usings.
2017-04-15 05:57:18 +09:00
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
98544a8077
Fix unsynchronised tweening.
2017-04-14 19:20:07 +09:00
8c41707ac7
Fix incorrect default state. Handle input better.
2017-04-14 14:40:52 +09:00
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
dffdb100ab
Small fix to the chat overlay to prevent crashing on the test
2017-04-11 21:35:49 -04:00
9732110bd9
Update TransformTo methods in line with framework changes.
2017-04-11 17:25:56 +09:00
5af4259ab4
Add back explicit binds.
2017-04-10 17:10:15 +09:00
f12b5a8954
Unify disable logic.
2017-04-10 16:22:36 +09:00
b7cfdff8d1
Update SliderBar to use IHasCurrentValue.
2017-04-10 15:30:17 +09:00
bb4a909de5
Update UI control access in line with framework changes.
2017-04-10 14:54:23 +09:00
e1e9772d46
Flash buttons on click.
2017-04-08 19:28:29 +09:00
e40ad69a3b
Adjust icon scale of play button.
2017-04-08 19:25:40 +09:00
b99cbe6962
Add back nice scaling of music controller buttons
2017-04-08 19:17:20 +09:00
166a78a15a
Fix up comment in audio device options
2017-04-08 11:01:41 +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
7e99fc47e2
wip
2017-04-07 16:54:54 +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
