1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:47:25 +08:00
Commit Graph

637 Commits

Author SHA1 Message Date
smoogipooo
72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
Huo Yaoyuan
c4e5eac35b Move footer stuff to derived. 2017-03-14 18:38:06 +08:00
Huo Yaoyuan
9a4247f67e Make Footer handles hotkey. 2017-03-14 18:16:04 +08:00
Huo Yaoyuan
c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
Dean Herbert
5c2bf02c9d Merge branch 'master' into beatmap_parsing 2017-03-14 17:50:00 +09:00
Huo Yaoyuan
fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
Huo Yaoyuan
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
Dean Herbert
14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes
# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
2017-03-14 16:15:26 +09:00
Dean Herbert
1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter). 2017-03-14 16:00:35 +09:00
smoogipooo
854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
Dan Balasescu
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Dean Herbert
0da950beac
Fix KeyCounter M1 M2 display. 2017-03-14 12:31:09 +09:00
Dean Herbert
1eacafc7b4
Merge branch 'master' into general-fixes 2017-03-14 12:02:24 +09:00
Dean Herbert
4fa037c0b2
Update framework. 2017-03-14 12:01:58 +09:00
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
DrabWeb
6bd9e3cac1 +Score ranks 2017-03-13 18:34:43 -03:00
Huo Yaoyuan
14a22f032f Fix beatmap panel removal. 2017-03-14 04:35:43 +08:00
DrabWeb
8e90e05f23 Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static 2017-03-13 12:31:46 -03:00
DrabWeb
442a2c97db Merge conflicts 2017-03-13 09:44:22 -03:00
DrabWeb
dbc8d513f9 Merge https://github.com/ppy/osu into leaderboards 2017-03-13 09:36:16 -03:00
DrabWeb
9912f5f9e1 Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore 2017-03-13 09:33:25 -03:00
smoogipooo
f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
smoogipooo
c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
smoogipooo
64aab090d5 Instantiate HitRenderer with WorkingBeatmap. 2017-03-12 18:03:13 +09:00
smoogipooo
529cabb001 Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00
smoogipooo
4015b87965 General fixes. 2017-03-10 13:09:50 +09:00
smoogipooo
31f6cbd8cf Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets. 2017-03-10 12:14:13 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
01c379da19
User invariant culture sorting. 2017-03-09 14:02:20 +09:00
Dean Herbert
9772f2a042
Update framework. 2017-03-09 13:50:33 +09:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Dean Herbert
02cab41d34
Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
Dean Herbert
5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Thomas Müller
9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
Dean Herbert
57cbecba83
Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554). 2017-03-06 22:08:02 +09:00
Dean Herbert
88f3dc0e02
Fix a few naming issues. 2017-03-06 18:49:23 +09:00
Dean Herbert
9908c1905d
Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
Dean Herbert
faf07ab51a
Use generics everywhere. 2017-03-06 13:59:11 +09:00
Dean Herbert
81cc27e104
Fix typo. 2017-03-06 10:06:25 +09:00
Dean Herbert
7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
Dean Herbert
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
DrabWeb
5719c6656a Update to work with latest framework 2017-03-04 22:38:01 -04:00
DrabWeb
9cde20ffc7 Merge https://github.com/ppy/osu into leaderboards 2017-03-04 22:33:05 -04:00
DrabWeb
b02e413e56 Removed LeaderboardFade fully 2017-03-04 22:30:48 -04:00
DrabWeb
269c139d2a Flags(redoing later), glowing text, proper Score and User usage 2017-03-04 22:29:52 -04:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Jorolf
7eebee36ab Merge branch 'master' into moarOptions 2017-03-04 16:11:27 +01:00
Thomas Müller
a3f1cb2232 Merge branch 'master' into update-flow 2017-03-04 15:35:53 +01:00
Jorolf
5c5066e1ae renamed local groups 2017-03-04 15:30:14 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
smoogipooo
112545f135 Fix unnecessarily throwing exception if there's no last drawings results file. 2017-03-04 23:24:32 +09:00
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
Dean Herbert
389635c7ed
Avoid panel state changes when performing a sort. 2017-03-04 22:05:16 +09:00
Dean Herbert
8f3621ca24
Make selectGroup a private method. 2017-03-04 22:05:02 +09:00
Dean Herbert
7a6a614358
Don't show pause menu when watching replays. 2017-03-04 21:35:26 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
DrabWeb
d1bad34434 Enter animation, remove testing mod icons 2017-03-04 05:01:55 -04:00
Thomas Müller
a2b79de672 Add comments to CarouselContainer 2017-03-04 09:34:39 +01:00
Thomas Müller
aaa1f766af Fix beatmap removal 2017-03-04 09:34:28 +01:00
Thomas Müller
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
DrabWeb
d6f53c8b77 Moved test data to visual test 2017-03-04 04:05:31 -04:00
Thomas Müller
a97a7f1024 No more custom lifetimelist in CarouselContainer 2017-03-04 08:54:14 +01:00
DrabWeb
a112b354f0 Basic implementation of score UI 2017-03-04 03:37:34 -04:00
Dean Herbert
adb6f01e39
Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
Jorolf
b9e4c920c5 SelectRandom doesnt select hidden groups now 2017-03-03 21:11:38 +01:00
Dean Herbert
6f3b59268a Merge pull request #385 from DrabWeb/mod-overlay
Mod select
2017-03-03 21:09:08 +09:00
Dean Herbert
dc6a728cce Merge branch 'master' into tournament_drawings 2017-03-03 20:48:07 +09:00
Dean Herbert
38a9e820e6
GroupsContainer -> GroupContainer. 2017-03-03 20:46:07 +09:00
Dean Herbert
bc01935a89
Move around some namespaces. 2017-03-03 20:42:22 +09:00
Dean Herbert
2ac248c7d0
Use OsuSpriteText. 2017-03-03 20:29:39 +09:00
Dean Herbert
1ea1118db6
Simplify file reading. 2017-03-03 20:24:34 +09:00
Dean Herbert
4a109fcc55
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided. 2017-03-03 20:21:11 +09:00
Dean Herbert
ca73b77a9a
Tidying code. 2017-03-03 20:08:32 +09:00
Dean Herbert
41cefd1cb3
xmldoc commenting. 2017-03-03 20:08:21 +09:00
Dean Herbert
c3cb225eef
Fix being able to stop rotation when it isn't started. 2017-03-03 20:07:57 +09:00
smoogipooo
5a4d07d770 Better way to initialize team lists. 2017-03-03 18:47:56 +09:00
smoogipooo
890066dae4 Use sprite visualiser lines instead of shader. 2017-03-03 18:47:22 +09:00
smoogipooo
54993b874f Fix idle and stopping -> stopped state. 2017-03-03 18:45:04 +09:00
smoogipooo
2a49200008 Nothing to see here. 2017-03-03 18:02:02 +09:00
smoogipooo
b2661be0b2 Fix setting same state multiple times. 2017-03-03 17:59:16 +09:00
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
smoogipooo
7cac2680b1 Make test case add test drawings file. 2017-03-03 16:33:40 +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
smoogipooo
1d1c08125b Further safety checking. 2017-03-03 16:01:24 +09:00
smoogipooo
777996d884 Rewrite VisualiserLine + add VisualiserContainer. 2017-03-03 15:43:16 +09:00
smoogipooo
a70b1ae108 Use a singular FlowContainer for teams. 2017-03-03 15:12:26 +09:00
smoogipooo
04dd24b04b OnTeamSelected + async changes. 2017-03-03 14:51:19 +09:00
smoogipooo
3ae55933c4 Remove game dependency. 2017-03-03 14:11:47 +09:00
smoogipooo
d96345e408 s/internalPeriod/_period 2017-03-03 14:11:37 +09:00
Seth
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
smoogipooo
e6d911e49b Move modified key conditional location. 2017-03-03 14:08:37 +09: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
smoogipooo
3174b56e28 Add license headers. 2017-03-03 13:17:24 +09:00
smoogipooo
959a3d49be Post-merge fixes. 2017-03-03 13:17:16 +09:00
Dan Balasescu
09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
smoogipooo
efb13b29d1 General cleanups. 2017-03-03 13:01:57 +09:00
smoogipooo
d0894bbc9b Use storage instead of raw file access. 2017-03-03 12:59:58 +09:00
smoogipooo
b7b36b6306 Unused. 2017-03-03 12:59:31 +09:00
smoogipooo
d6c1f82105 Make visualiser lines have no separation. 2017-03-03 12:59:19 +09:00
smoogipooo
d222c523a1 Exit drawings if no drawings.txt file. 2017-03-03 12:43:48 +09:00
smoogipooo
26b81a14cf Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it. 2017-03-03 12:42:19 +09:00
smoogipooo
062d8ddc7c Don't handle menu buttons when Shift or Ctrl or Alt is pressed. 2017-03-03 12:41:45 +09:00
smoogipooo
febdfd5de4 Make groups fill up in round robin way, rather than sequentially. 2017-03-03 12:06:35 +09:00
Dean Herbert
78a0bce3bb Merge pull request #423 from peppy/general-fixes
Move PauseOverlay to correct namespace.
2017-03-03 11:32:42 +09: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
3a8246f56d
Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09: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
Dean Herbert
c4ca18eeba
Remove references to PassThrough. 2017-03-02 16:28:51 +09:00
DrabWeb
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
smoogipooo
b0d5d88fe9 Fix slight threading scheduling issue. 2017-03-02 12:26:42 +09:00
smoogipooo
1a4f0a92a5 Add saving + reloading (to/from drawings_results.txt) functionality. 2017-03-02 12:20:31 +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
Dean Herbert
b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert
58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00
smoogipooo
35d246b59d Merge remote-tracking branch 'origin/master' into tournament_drawings 2017-03-01 19:32:33 +09:00
DrabWeb
d5d8352b62 Testing build 2017-02-28 17:09:31 -04:00
Jorolf
61cbcfd597 Merge branch 'master' into pluginManager 2017-02-28 20:34:56 +01:00
Jorolf
522034020e Moved Bindable init 2017-02-28 11:44:12 +01: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
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
DrabWeb
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
smoogipooo
1e15318da6 Add background. 2017-02-28 10:26:37 +09:00
Jorolf
8b3477820f Disable mousewheel while playing 2017-02-28 00:08:34 +01: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
smoogipooo
44f3dfa3fe Make it display by default. 2017-02-27 23:38:37 +09:00
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
smoogipooo
fc33bf4761 Add drawings config. 2017-02-27 23:29:18 +09:00
smoogipooo
9d731af01b Finish it up, slightly hackishly, but that's ok. 2017-02-27 23:29:17 +09:00
smoogipooo
5f3e484353 Add scrolling teams container. 2017-02-27 23:29:06 +09: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
4da09713a9
Fix test case regression. 2017-02-27 18:09:27 +09:00
Dean Herbert
68dd3c02aa
Fix failing testcase (nullref). 2017-02-27 17:05:12 +09:00
Dean Herbert
7c602a2af3
Update framework. 2017-02-27 15:55:57 +09:00
smoogipooo
25a1c7a8ad Initial groups implementation. 2017-02-27 14:19:07 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith. 2017-02-27 12:24:53 +09:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
bc231c6bd4
Remove dispose which is no longer necessary. 2017-02-26 22:08:29 +09:00
Dean Herbert
c227eb1be5
Welded bindables. 2017-02-26 22:08:21 +09:00
Dean Herbert
c5ad79e3e2
Remove unnecessary schedule. 2017-02-26 21:15:33 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Dean Herbert
17a28cd3b6 Don't push Player if we aren't still current. 2017-02-25 11:46:19 +09:00
Dean Herbert
7483b69477 Remove unnecessary Dispose logic. 2017-02-25 10:44:19 +09:00
Thomas Müller
4aecd59c74 Merge branch 'master' into fix-memory-leak 2017-02-24 19:54:14 +01: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
c4fbfb5a8f
Update comment with new knowledge. 2017-02-24 21:46:34 +09:00
Dean Herbert
5096f6b83d
Fix memory leak from Player's InputManager. 2017-02-24 21:01:05 +09: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
0264c44a20 Do not shadow Colour in TwoLayerButton
Renames Colour to BackgroundColour instead.
2017-02-23 22:33:37 +01:00
Thomas Müller
37bc75a7b6 Remove unused variables 2017-02-23 22:32:49 +01:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Seth
b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
Dean Herbert
6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert
f812641696 Merge pull request #383 from peppy/player-loading-screen
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
9746877903
Merge remote-tracking branch 'upstream/master' into mod-overlay 2017-02-23 11:11:52 +09:00
Dean Herbert
7e7bf07d03
Remove unused whitebox. 2017-02-23 11:11:46 +09:00
DrabWeb
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
Dean Herbert
aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09:00