2220 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	8d41d1460a	Update resources.	2017-03-03 13:23:59 +09: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
John Leuenhagen	417c7e341a	Password textbox now performs login on enter	2017-03-02 22:41:14 -05: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
Dean Herbert	70f046092c	Merge pull request #424 from DrabWeb/namespace-fix ... Fix BeatmapDeleteDialog namespace	2017-03-03 11:32:35 +09:00
Dean Herbert	1b297d73c2	Merge pull request #425 from huoyaoyuan/password ... "Security" update for OsuPasswordTextBox.	2017-03-03 11:24:25 +09:00
Huo Yaoyuan	5b5fbbfdff	Update framework.	2017-03-03 10:17:46 +08:00
Huo Yaoyuan	ef13cdbff7	Disallow copying from OsuPasswordTextBox.	2017-03-03 10:00:39 +08:00
DrabWeb	f872330902	Fix BeatmapDeleteDialog namespace	2017-03-02 21:28:05 -04:00
DrabWeb	b4091eff30	Fixed visual test	2017-03-02 21:24:34 -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	ae1d51bc9b	Merge pull request #422 from Tom94/no-negative-margin ... Remove usages of negative Margin / Padding	2017-03-03 10:05:55 +09:00
Dean Herbert	e189c36ffd	Framework update.	2017-03-03 09:58:48 +09:00
Dean Herbert	f81836f635	Merge remote-tracking branch 'upstream/master' into no-negative-margin	2017-03-03 09:58:40 +09:00
Dean Herbert	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
Thomas Müller	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
Mikal Stodal	c88c6c4c62	More summaries	2017-03-02 15:37:45 +01:00
Mikal Stodal	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
Dean Herbert	ecd3453774	Fix potential nullref.	2017-03-02 22:17:14 +09:00
Mikal Stodal	dfa21444b4	Ensure correct exception logged	2017-03-02 14:10:32 +01:00
DrabWeb	fcda2f0e4e	Fixed shadow	2017-03-02 09:05:10 -04: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
Dean Herbert	ef8a35f5cc	Fix Toolbar's mode changer not working correctly.	2017-03-02 22:01:24 +09:00
DrabWeb	b856fb5991	Implemented beatmap options overlay	2017-03-02 08:40:55 -04:00
Mikal Stodal	2498305174	Merged branch master into remove-source-on-import	2017-03-02 13:39:22 +01:00
Mikal Stodal	47162a3e91	Update summary and commentary	2017-03-02 13:39:02 +01:00
Mikal Stodal	6661195e92	Only add set if ID is 0	2017-03-02 13:36:01 +01:00
Dean Herbert	e399d6c6d1	Use bindable for PlayMode.	2017-03-02 21:16:58 +09:00
Dean Herbert	ab91333b21	Replace missing perfect icon with cross.	2017-03-02 20:29:48 +09:00
Dean Herbert	8bb4bea1a4	Fix incorrect ordering.	2017-03-02 20:27:13 +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