Commit Graph

27383 Commits

Author SHA1 Message Date
8d41d1460a Update resources. 2017-03-03 13:23:59 +09:00
3174b56e28 Add license headers. 2017-03-03 13:17:24 +09:00
959a3d49be Post-merge fixes. 2017-03-03 13:17:16 +09:00
09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
efb13b29d1 General cleanups. 2017-03-03 13:01:57 +09:00
d0894bbc9b Use storage instead of raw file access. 2017-03-03 12:59:58 +09:00
b7b36b6306 Unused. 2017-03-03 12:59:31 +09:00
d6c1f82105 Make visualiser lines have no separation. 2017-03-03 12:59:19 +09:00
d222c523a1 Exit drawings if no drawings.txt file. 2017-03-03 12:43:48 +09:00
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
062d8ddc7c Don't handle menu buttons when Shift or Ctrl or Alt is pressed. 2017-03-03 12:41:45 +09:00
417c7e341a Password textbox now performs login on enter 2017-03-02 22:41:14 -05:00
febdfd5de4 Make groups fill up in round robin way, rather than sequentially. 2017-03-03 12:06:35 +09:00
78a0bce3bb Merge pull request #423 from peppy/general-fixes
Move PauseOverlay to correct namespace.
2017-03-03 11:32:42 +09:00
70f046092c Merge pull request #424 from DrabWeb/namespace-fix
Fix BeatmapDeleteDialog namespace
2017-03-03 11:32:35 +09:00
1b297d73c2 Merge pull request #425 from huoyaoyuan/password
"Security" update for OsuPasswordTextBox.
2017-03-03 11:24:25 +09:00
5b5fbbfdff Update framework. 2017-03-03 10:17:46 +08:00
ef13cdbff7 Disallow copying from OsuPasswordTextBox. 2017-03-03 10:00:39 +08:00
f872330902 Fix BeatmapDeleteDialog namespace 2017-03-02 21:28:05 -04:00
b4091eff30 Fixed visual test 2017-03-02 21:24:34 -04:00
7a4b9c5571 osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options 2017-03-02 21:20:30 -04:00
3a8246f56d Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09:00
ae1d51bc9b Merge pull request #422 from Tom94/no-negative-margin
Remove usages of negative Margin / Padding
2017-03-03 10:05:55 +09:00
e189c36ffd Framework update. 2017-03-03 09:58:48 +09:00
f81836f635 Merge remote-tracking branch 'upstream/master' into no-negative-margin 2017-03-03 09:58:40 +09:00
ed26d87170 Merge pull request #419 from peppy/song-selection-improvements
Fix selection on entry to song select.
2017-03-03 09:55:11 +09:00
c732890664 Remove usages of negative Margin / Padding
Replaces such usage with more sensible settings, like changing the
position or size.
2017-03-02 19:16:31 +01:00
c88c6c4c62 More summaries 2017-03-02 15:37:45 +01:00
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