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

212 Commits

Author SHA1 Message Date
DrabWeb 9d75ab85e9 Put mod select over beatmap options 2017-03-03 04:19:03 -04:00
Seth fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
Dean Herbert bdb130fabc
Avoid using right-to-left fill direction for now. 2017-03-03 16:54:59 +09:00
Dean Herbert 47845a7fbd
Fix button input handling. 2017-03-03 16:54:43 +09:00
Dean Herbert 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
Seth 1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
Dean Herbert fb6c25edf8
Fix more silly hacks. 2017-03-03 13:58:46 +09:00
Dean Herbert 2e01857782
Better constants. 2017-03-03 13:58:46 +09:00
Dean Herbert 00b139b3df
Remove hack (fixed at framework level). 2017-03-03 13:58:46 +09:00
Seth 2e74b4be60 Merge branch 'master' into beatmap-options 2017-03-03 00:52:45 -04:00
DrabWeb f872330902 Fix BeatmapDeleteDialog namespace 2017-03-02 21:28:05 -04:00
DrabWeb 7a4b9c5571 osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options 2017-03-02 21:20:30 -04:00
Dean Herbert ecd3453774
Fix potential nullref. 2017-03-02 22:17:14 +09:00
Dean Herbert 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
Dean Herbert 9ea83230aa
Formatting fixes. 2017-03-02 22:01:53 +09:00
DrabWeb b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00
Dean Herbert e399d6c6d1
Use bindable for PlayMode. 2017-03-02 21:16:58 +09:00
Dean Herbert 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
Dean Herbert 51950eef43 Merge branch 'master' into master 2017-03-02 18:06:31 +09:00
Dean Herbert ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
DrabWeb 6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
DrabWeb 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
Thomas Müller 4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller 9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller 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
DrabWeb d5d8352b62 Testing build 2017-02-28 17:09:31 -04:00
DrabWeb 570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
DrabWeb ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
DrabWeb 50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
DrabWeb fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
default0 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
Dean Herbert e8b027130f
Remove unused variable. 2017-02-27 23:17:21 +09:00
Alex Amadori 8b336156f0 Merge remote-tracking branch 'upstream/master' 2017-02-27 14:55:44 +01:00
Dean Herbert afdb95f4d5
Fix even more test regressions. 2017-02-27 20:39:04 +09:00
Dean Herbert 7c602a2af3
Update framework. 2017-02-27 15:55:57 +09:00
default0 8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Thomas Müller 1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller f7d985fe18 Fix and refactor star difficulty calculation boilerplate 
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
 2017-02-24 19:36:17 +01:00
Alex Amadori ace023f0c7 Refactor local vars named in a c-like fashion 2017-02-24 17:08:18 +01:00
Alex Amadori 90b0f035ad Compute average of star ratings 2017-02-24 17:01:14 +01:00
Alex Amadori 51b6075210 Merge remote-tracking branch 'upstream/master' 2017-02-24 16:54:37 +01:00
Alex Amadori e2ae03e798 Merge with upstream/master 2017-02-24 16:54:27 +01:00
Dean Herbert ea4639932c
Simplify event names. 2017-02-24 17:21:14 +09:00
Dean Herbert d24403e58e
Remove unused using statement. 2017-02-24 17:20:00 +09:00
Dean Herbert 958bf54c31
Add safe deletion support. 2017-02-24 17:08:13 +09:00
Dean Herbert 6c3bda18b6
Add beatmap deletion support. 
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
 2017-02-24 14:37:54 +09:00
Dean Herbert 3a89348413
Centralise access to WorkingBeatmaps. 
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
 2017-02-24 13:43:21 +09:00
Dean Herbert 355bbb6324
SearchTextBox should not handle shift-delete. 2017-02-24 11:44:40 +09:00
Dean Herbert c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller 2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00