|
|
7eebee36ab
|
Merge branch 'master' into moarOptions
|
2017-03-04 16:11:27 +01:00 |
|
|
|
5c5066e1ae
|
renamed local groups
|
2017-03-04 15:30:14 +01:00 |
|
|
|
e12d89529c
|
Merge remote-tracking branch 'upstream/master' into update-flow
|
2017-03-04 23:28:39 +09:00 |
|
|
|
00fdffe9c8
|
Update framework (and fix non-conforming anchors in FillFlowContainers).
|
2017-03-04 23:24:13 +09:00 |
|
|
|
389635c7ed
|
Avoid panel state changes when performing a sort.
|
2017-03-04 22:05:16 +09:00 |
|
|
|
8f3621ca24
|
Make selectGroup a private method.
|
2017-03-04 22:05:02 +09:00 |
|
|
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
|
|
d1bad34434
|
Enter animation, remove testing mod icons
|
2017-03-04 05:01:55 -04:00 |
|
|
|
a2b79de672
|
Add comments to CarouselContainer
|
2017-03-04 09:34:39 +01:00 |
|
|
|
aaa1f766af
|
Fix beatmap removal
|
2017-03-04 09:34:28 +01:00 |
|
|
|
9bddd1ed4b
|
Fix broken CarouselContainer animations
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
|
2017-03-04 09:33:24 +01:00 |
|
|
|
d6f53c8b77
|
Moved test data to visual test
|
2017-03-04 04:05:31 -04:00 |
|
|
|
a97a7f1024
|
No more custom lifetimelist in CarouselContainer
|
2017-03-04 08:54:14 +01:00 |
|
|
|
a112b354f0
|
Basic implementation of score UI
|
2017-03-04 03:37:34 -04:00 |
|
|
|
b9e4c920c5
|
SelectRandom doesnt select hidden groups now
|
2017-03-03 21:11:38 +01:00 |
|
|
|
9d75ab85e9
|
Put mod select over beatmap options
|
2017-03-03 04:19:03 -04:00 |
|
|
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
|
|
bdb130fabc
|
Avoid using right-to-left fill direction for now.
|
2017-03-03 16:54:59 +09:00 |
|
|
|
47845a7fbd
|
Fix button input handling.
|
2017-03-03 16:54:43 +09:00 |
|
|
|
b0ee728528
|
Remove full-screen background layer and add half-height holder.
Doesn't interact well with dialog popups. May add back later with complementing logic.
|
2017-03-03 16:11:23 +09:00 |
|
|
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
|
|
fb6c25edf8
|
Fix more silly hacks.
|
2017-03-03 13:58:46 +09:00 |
|
|
|
2e01857782
|
Better constants.
|
2017-03-03 13:58:46 +09:00 |
|
|
|
00b139b3df
|
Remove hack (fixed at framework level).
|
2017-03-03 13:58:46 +09:00 |
|
|
|
2e74b4be60
|
Merge branch 'master' into beatmap-options
|
2017-03-03 00:52:45 -04:00 |
|
|
|
f872330902
|
Fix BeatmapDeleteDialog namespace
|
2017-03-02 21:28:05 -04:00 |
|
|
|
7a4b9c5571
|
osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options
|
2017-03-02 21:20:30 -04:00 |
|
|
|
ecd3453774
|
Fix potential nullref.
|
2017-03-02 22:17:14 +09:00 |
|
|
|
f9b87ad08c
|
Fix selection on entry to song select.
Also only shows sets with beatmaps for current play mode.
|
2017-03-02 22:02:32 +09:00 |
|
|
|
9ea83230aa
|
Formatting fixes.
|
2017-03-02 22:01:53 +09:00 |
|
|
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04:00 |
|
|
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +09:00 |
|
|
|
471b9daa93
|
Merge branch 'master' into mod-overlay
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
|
2017-03-02 20:27:04 +09:00 |
|
|
|
51950eef43
|
Merge branch 'master' into master
|
2017-03-02 18:06:31 +09:00 |
|
|
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
|
|
6c680825ed
|
ModSections in Ruleset, fixed toolbar play mode changed not firing
|
2017-03-01 22:05:52 -04:00 |
|
|
|
befdf68abe
|
Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
|
2017-03-01 18:41:00 -04:00 |
|
|
|
4d28696479
|
FlowDirection -> FillDirection
|
2017-03-01 20:15:38 +01:00 |
|
|
|
9c853b0465
|
Update framewörk
|
2017-03-01 19:33:01 +01:00 |
|
|
|
d46e68b36b
|
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
|
2017-03-01 18:05:58 +01:00 |
|
|
|
d5d8352b62
|
Testing build
|
2017-02-28 17:09:31 -04:00 |
|
|
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04:00 |
|
|
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
|
|
50d172be39
|
Added DialogManager(not wired up for desktop project yet)
|
2017-02-28 00:59:36 -04:00 |
|
|
|
fbd9523596
|
Added beatmap delete dialog
|
2017-02-27 23:19:28 -04:00 |
|
|
|
03889e6ca6
|
Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
|
2017-02-27 16:55:55 +01:00 |
|
|
|
e8b027130f
|
Remove unused variable.
|
2017-02-27 23:17:21 +09:00 |
|
|
|
8b336156f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-27 14:55:44 +01:00 |
|
|
|
afdb95f4d5
|
Fix even more test regressions.
|
2017-02-27 20:39:04 +09:00 |
|
|
|
7c602a2af3
|
Update framework.
|
2017-02-27 15:55:57 +09:00 |
|
