Dean Herbert
|
343e48c195
|
Merge branch 'master' into followpoints
|
2017-02-13 22:23:57 +09:00 |
|
Dean Herbert
|
1aeb48b920
|
Merge remote-tracking branch 'upstream/master' into osb_loading
|
2017-02-13 18:22:29 +09:00 |
|
Thomas Müller
|
aaaf7163e0
|
Update framework.
|
2017-02-13 17:46:50 +09:00 |
|
Thomas Müller
|
e3f35cd66e
|
Merge branch 'master' into osb_loading
|
2017-02-12 12:26:25 +01:00 |
|
Dean Herbert
|
37e75e9a54
|
Add null check when loading beatmap background.
|
2017-02-12 16:13:44 +09:00 |
|
Dean Herbert
|
7efa3415a4
|
Merge branch 'master' into followpoints
|
2017-02-10 20:59:45 +09:00 |
|
Damnae
|
2d155f6a5c
|
Bring back the delay to what it was before.
|
2017-02-10 10:48:25 +01:00 |
|
Damnae
|
6f37c02868
|
Fix followpoints needing a DelayReset.
|
2017-02-10 10:07:52 +01:00 |
|
Dean Herbert
|
e23202c449
|
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests
|
2017-02-10 17:22:38 +09:00 |
|
DrabWeb
|
c61052d62e
|
Added toggling the progress bar, added buttons to the visual test
|
2017-02-09 20:12:15 -04:00 |
|
DrabWeb
|
0327c46d36
|
Fixed columns not being able to have zero fill
|
2017-02-09 19:29:12 -04:00 |
|
DrabWeb
|
843b58c8f4
|
Moved random graph values to test case, added null handling for graph values
|
2017-02-09 19:08:23 -04:00 |
|
DrabWeb
|
ac6726ee2e
|
Fixed setting column filled values not updating visually, added gray background to visual test
|
2017-02-09 18:56:50 -04:00 |
|
DrabWeb
|
4d7766b92b
|
Added displaying given values to the graph
|
2017-02-09 18:51:05 -04:00 |
|
DrabWeb
|
7fea233181
|
Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar
|
2017-02-09 16:28:40 -04:00 |
|
Damnae
|
a504c73f33
|
Load beatmap data from an optional osb file.
|
2017-02-09 15:19:09 +01:00 |
|
Andrey Zavadskiy
|
e06aa44c4c
|
Warning Fixes
|
2017-02-09 16:18:08 +03:00 |
|
Dean Herbert
|
829fb2605b
|
Fix visualtest regression.
|
2017-02-09 17:47:11 +09:00 |
|
Dean Herbert
|
60e206e587
|
Merge pull request #336 from Damnae/hitobject_stacking
Add hit object stacking.
|
2017-02-09 17:01:52 +09:00 |
|
Damnae
|
38b25a7df3
|
Add hit object stacking.
|
2017-02-09 07:28:40 +01:00 |
|
Dean Herbert
|
faa805e437
|
Fix SearchTextBox's handling of keyboard input to allow for IME input.
|
2017-02-09 12:33:24 +09:00 |
|
DrabWeb
|
50f93bc215
|
Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class
|
2017-02-08 16:22:31 -04:00 |
|
Dean Herbert
|
d230c3f9ac
|
Correct masking layers on song select.
|
2017-02-08 20:39:17 +09:00 |
|
Dean Herbert
|
050fa7fbe8
|
Adjust FilterControl to match design and give an absolute height.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
a7dac15d05
|
Toolbar is now toggled by the main menu.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
2e119cd74f
|
Handle toolbar offsets better.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
417b0817a9
|
Improve arrow key redirection at song select.
|
2017-02-08 15:30:20 +09:00 |
|
Dean Herbert
|
937c065af7
|
Clear content of SearchTextBox on first escape keypress.
|
2017-02-08 15:14:15 +09:00 |
|
Dean Herbert
|
bbf8d1000b
|
Update focus requesting code in SearchTextBox.
|
2017-02-08 15:13:56 +09:00 |
|
Dean Herbert
|
a6f02106a4
|
Use new placeholder logic.
|
2017-02-08 14:08:01 +09:00 |
|
Dean Herbert
|
5a89ba1040
|
Make OsuTextBox use OsuSpriteText.
|
2017-02-08 11:22:46 +09:00 |
|
Dean Herbert
|
34a030e3be
|
Fix race conditions causing menu transitions to look wrong when executed in very fast succession.
|
2017-02-07 22:19:36 +09:00 |
|
Dean Herbert
|
d06f0cf870
|
Fix escape not always handling back action correctly at main menu (back button not yet visible).
|
2017-02-07 22:19:17 +09:00 |
|
Dean Herbert
|
dc5e9dde56
|
Fix escape key nonsense.
|
2017-02-07 21:46:13 +09:00 |
|
Dean Herbert
|
8a0887c3c3
|
Add sound effect to osu! logo clicking.
|
2017-02-07 21:45:59 +09:00 |
|
Dean Herbert
|
24ba21363e
|
Make intro->mainmenu work better by delaying interactiveness of osu! logo.
|
2017-02-07 21:37:34 +09:00 |
|
Dean Herbert
|
e2f680a65f
|
Change main menu buttons to be activate OnClick.
|
2017-02-07 20:30:40 +09:00 |
|
Dean Herbert
|
6b011a50d2
|
Naming standardisation and enforcing.
|
2017-02-07 16:20:36 +09:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
9b9ed32245
|
Remove all @2x references, updates resource and framework.
|
2017-02-06 22:19:47 +09:00 |
|
Dean Herbert
|
86205c35a4
|
Fix weird state changes of footer buttons.
|
2017-02-06 20:46:53 +09:00 |
|
Thomas Müller
|
8271b139e9
|
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
|
2017-02-05 09:40:58 +01:00 |
|
Thomas Müller
|
6db70f8850
|
Use MaskingSmoothness to make masked diagonal edges smoother.
|
2017-02-04 11:06:26 +01:00 |
|
Dean Herbert
|
ddea76927f
|
Better SearchTextBox focus handling.
|
2017-02-03 19:12:57 +09:00 |
|
Dean Herbert
|
16a01abc4d
|
Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
|
2017-02-03 13:16:07 +09:00 |
|
Dean Herbert
|
4f89cc0784
|
Merge pull request #298 from peppy/skip-button
Make skip button work.
|
2017-02-03 12:47:53 +09:00 |
|
Drew DeVault
|
52fb345e79
|
Merge branch 'master' into song-select-filtering
|
2017-02-02 09:25:27 -08:00 |
|
Drew DeVault
|
437cc834eb
|
@Tom94 pointed out this problem
|
2017-02-02 12:23:06 -05:00 |
|
Dean Herbert
|
966121a438
|
Fix keyboard controls not respecting search filter.
|
2017-02-02 19:37:35 +09:00 |
|
Dean Herbert
|
0c887d3a46
|
Fix deselected group remaining visible after search.
|
2017-02-02 19:24:43 +09:00 |
|