Commit Graph

46805 Commits

Author SHA1 Message Date
866dbf0b1d Added new test
When file is in use, we expect it to presist removal, in other words, fail to delete.
2017-03-02 15:24:12 +01:00
223962121e Refactor not just rename 2017-03-02 09:26:29 -04:00
1eeb4aa875 Missed some 2017-03-02 09:21:16 -04:00
ecd3453774 Fix potential nullref. 2017-03-02 22:17:14 +09:00
536925c77a Comply to naming conventions 2017-03-02 09:15:53 -04:00
dfa21444b4 Ensure correct exception logged 2017-03-02 14:10:32 +01:00
fcda2f0e4e Fixed shadow 2017-03-02 09:05:10 -04: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
ef8a35f5cc Fix Toolbar's mode changer not working correctly. 2017-03-02 22:01:24 +09:00
b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00
2498305174 Merged branch master into remove-source-on-import 2017-03-02 13:39:22 +01:00
47162a3e91 Update summary and commentary 2017-03-02 13:39:02 +01:00
6661195e92 Only add set if ID is 0 2017-03-02 13:36:01 +01:00
e399d6c6d1 Use bindable for PlayMode. 2017-03-02 21:16:58 +09:00
ab91333b21 Replace missing perfect icon with cross. 2017-03-02 20:29:48 +09:00
8bb4bea1a4 Fix incorrect ordering. 2017-03-02 20:27:13 +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
435e845067 Merge branch 'master' into DrabWeb/song-progress-graph
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Overlays/Pause/PauseProgressBar.cs
#	osu.Game/Overlays/Pause/PauseProgressGraph.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:20:27 +09:00
d74a601180 Update version number generation slightly. 2017-03-02 20:08:01 +09:00
35c920d04b Merge pull request #368 from tacchinotacchi/master
Added basic sorting functionality
2017-03-02 18:46:34 +09:00
4163569e57 Fix some license headers. 2017-03-02 18:45:20 +09:00
68a359698d Fix potential nullref caused by test data. 2017-03-02 18:35:24 +09:00
51950eef43 Merge branch 'master' into master 2017-03-02 18:06:31 +09:00
ffd65606be Merge pull request #409 from DrabWeb/popup-dialog
Popup dialog
2017-03-02 18:01:41 +09:00
963117f07d Fix incorrect event order. 2017-03-02 17:41:33 +09:00
68857b573d More code tidying. 2017-03-02 17:14:05 +09:00
c4871bbbf3 Tidy up code.
The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.
2017-03-02 17:08:00 +09:00
d1cd077e0d Post-merge fixes. 2017-03-02 16:54:55 +09:00
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
66cea49ba6 Merge pull request #404 from default0/flowcontainer-refactor
Flowcontainer refactor
2017-03-02 16:42:03 +09:00
c4ca18eeba Remove references to PassThrough. 2017-03-02 16:28:51 +09:00
0bd3138887 Update framework. 2017-03-02 16:27:49 +09:00
4bd85fe5cb Fix audio disposal issues and share more code between visualtests. 2017-03-02 16:08:37 +09:00
8040d6a03f Fix CursorTrail corruption by resetting on load. 2017-03-02 16:08:10 +09:00
482be9f451 Remove AvailableMods 2017-03-02 02:04:26 -04:00
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
37ed1b3d09 Moved key press select mods to ModSection 2017-03-02 01:24:32 -04:00
1eee587c18 CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
b0d5d88fe9 Fix slight threading scheduling issue. 2017-03-02 12:26:42 +09:00
1a4f0a92a5 Add saving + reloading (to/from drawings_results.txt) functionality. 2017-03-02 12:20:31 +09:00
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -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
418ae24fea Document private method getBeatmapSet(path) 2017-03-01 17:57:57 +01:00
1e901a1604 Only set StoryBoardFile once 2017-03-01 17:08:12 +01:00
08e96c2460 Merge remote-tracking branch 'refs/remotes/ppy/master' into moarOptions 2017-03-01 16:06:12 +01:00