824 Commits

Author	SHA1	Message	Date
DrabWeb	cbe36259c3	Add BreadcrumbControl	2017-05-26 07:49:45 -03:00
smoogipooo	24ff599901	Merge remote-tracking branch 'origin/master' into mania-holdnote-input	2017-05-26 19:01:10 +09:00
DrabWeb	fc67582c3f	Cleanup	2017-05-26 02:16:56 -03:00
DrabWeb	e19a4f5e6f	Add displaying users	2017-05-26 02:00:38 -03:00
DrabWeb	8fca0fddb3	Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser	2017-05-26 00:54:03 -03:00
Dan Balasescu	40e63a0870	Merge branch 'master' into mania-holdnote-input	2017-05-24 22:17:13 +09:00
smoogipooo	946cd4bfa3	General cleanup + more xmldocs.	2017-05-24 21:57:38 +09:00
smoogipooo	4ef18ff135	Test case improvements.	2017-05-24 20:54:01 +09:00
smoogipooo	dcf879687d	Implement basic hold note + tick input.	2017-05-24 20:45:01 +09:00
Seth	3094a8267f	Merge branch 'master' into drawable-multiplayer-room	2017-05-24 04:39:57 -03:00
Dean Herbert	3134f92051	Merge branch 'master' into user-panel	2017-05-24 16:32:09 +09:00
DrabWeb	a25c504965	CI fixes	2017-05-24 03:08:48 -03:00
DrabWeb	ba2627d4e2	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-24 02:40:00 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
DrabWeb	2be1b00a76	Hide status bar when Status is null	2017-05-24 00:45:56 -03:00
DrabWeb	247d8e9b21	Replace "Connected as _" in login form with a UserPanel	2017-05-24 00:23:48 -03:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
DrabWeb	4f17a4fe91	Make result counts scroll with the panels	2017-05-23 14:34:34 -03:00
smoogipooo	76fe4af9a6	Fix visual test failing.	2017-05-23 18:06:31 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +09:00
smoogipooo	002a0e99a2	Use SortedList + BinarySearch to find control points at time values.	2017-05-23 15:20:32 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
DrabWeb	9798117d53	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
DrabWeb	25b457e994	Proper Bindable usage	2017-05-22 13:05:18 -03:00
DrabWeb	65df2d2b70	MultiplayerRoomStatus -> RoomStatus	2017-05-22 12:46:41 -03:00
DrabWeb	2c16d9c3a7	CurrentBeatmap -> Beatmap	2017-05-22 12:45:40 -03:00
DrabWeb	03f6cded84	MultiplayerRoom -> Room	2017-05-22 12:44:58 -03:00
DrabWeb	62ca76bc41	Unused using	2017-05-22 03:42:32 -03:00
DrabWeb	8a364c6068	CI fixes	2017-05-22 03:37:36 -03:00
DrabWeb	aa40f88258	Add UserStatusOffline	2017-05-22 03:32:02 -03:00
DrabWeb	a73cf92994	Add second UserPanel to visual test, center cover sprite	2017-05-22 03:27:08 -03:00
DrabWeb	7ce3b73ecd	Added UserPanel and UserStatus	2017-05-22 03:11:42 -03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
DrabWeb	87cdf5aac6	CI fixes	2017-05-22 01:29:39 -03:00
DrabWeb	82fdf1a918	Bindables, avatars, more cleanup	2017-05-22 01:01:55 -03:00
DrabWeb	e5ee7096f8	Initial cleanup	2017-05-22 00:07:15 -03:00
DrabWeb	c4e6870c12	Merge https://github.com/ppy/osu into roompanel	2017-05-21 22:37:00 -03:00
DrabWeb	bc980b60ac	Add files to project, update with framework changes	2017-05-21 22:36:46 -03:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	c981a4a511	Formatting	2017-05-19 19:50:45 -03:00
DrabWeb	e1c4c36122	+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds	2017-05-19 15:43:18 -03:00
EVAST9919	9f803de9d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 19:49:48 +03:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +09:00
EVAST9919	f96fe1c97d	Extended testcase	2017-05-19 17:28:01 +03:00
EVAST9919	6f0e1fccdb	moved autosize to ctor and whitespace fix	2017-05-19 16:08:33 +03:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03:00
Dean Herbert	da31d129ee	Merge branch 'master' into mania-beatmap-conversion	2017-05-19 18:18:59 +09:00
Dean Herbert	a7d16ac213	Move skip logic to inside SkipButton	2017-05-19 18:18:21 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
EVAST9919	bbe0abbe04	removed forgotten file	2017-05-19 06:48:31 +03:00
DrabWeb	a5fa7e1a7d	Result counts displaying	2017-05-18 17:43:39 -03:00
DrabWeb	c2880676db	Added displaying sets	2017-05-18 16:15:49 -03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	a1b90ee70e	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 18:26:38 +03:00
Dean Herbert	f112546085	Don't load a mode when opening TestCaseHitObjects	2017-05-18 19:42:20 +09:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
EVAST9919	a21343da23	CI fixes	2017-05-17 17:14:09 +03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03:00
smoogipooo	9565bb9572	Fix hold notes - remove glow for now. ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs	2017-05-17 13:09:49 +09:00
Huo Yaoyuan	d213706d07	Use DateTimeOffset.	2017-05-16 21:14:50 +08:00
Dean Herbert	85daddcf6f	Merge branch 'master' into mania-timing-sections	2017-05-16 20:12:26 +09:00
smoogipooo	6231a19b8c	Merge remote-tracking branch 'origin/master' into mania-timing-sections	2017-05-16 18:35:32 +09:00
smoogipooo	235a5b1dff	Add notes to test case.	2017-05-16 18:27:33 +09:00
smoogipooo	8ed97a8335	Let's invert the playfield by default for now.	2017-05-16 18:02:54 +09:00
smoogipooo	ac02d1ab10	TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation).	2017-05-16 17:50:09 +09:00
Dean Herbert	0feaa407f2	Merge branch 'margin-padding-namespace' into on-screen-display	2017-05-16 16:40:06 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
smoogipooo	0739a76497	Make the playfield work in TestCaseGamefield.	2017-05-11 20:04:45 +09:00
smoogipooo	f6677125af	Merge branch 'mania-notes' into mania-timing-sections	2017-05-11 14:11:58 +09:00
smoogipooo	a6b71f8ccb	Resharper fixes.	2017-05-11 14:11:52 +09:00
smoogipooo	cdf827df8e	CI fixes.	2017-05-11 13:55:52 +09:00
smoogipooo	b10df74079	Full rewrite of timing section code, partially working for now.	2017-05-11 12:33:19 +09:00
EVAST9919	c0acc1799b	Now progress testcase has it's own clock	2017-05-11 01:49:57 +03:00
Dan Balasescu	cdd71b496d	Fix unnecessary newline.	2017-05-09 21:08:53 +09:00
smoogipooo	5b323ad483	Cleanups.	2017-05-09 20:55:20 +09:00
smoogipooo	d852567d1d	Rewrite notes to have time-relative position and length.	2017-05-09 20:33:59 +09:00
smoogipooo	e3b01e7b8c	Merge branch 'master' into mania-notes ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2017-05-08 12:12:40 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
EVAST9919	95f6c999bd	Adjust scale and CI fixes	2017-05-04 17:59:01 +03:00
EVAST9919	66c858030a	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-04 17:35:41 +03:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
smoogipooo	4ad3e3d64e	Basic implementation of hold notes (not finalized yet).	2017-05-04 18:02:43 +09:00
EVAST9919	57c4232416	Added testcase	2017-05-04 11:58:37 +03:00
smoogipooo	f945c636c2	Make note accent colour work again.	2017-05-04 15:36:37 +09:00
smoogipooo	e307b6d563	Make SpecialColumnPosition only have an effect during load().	2017-05-04 15:12:32 +09:00
smoogipooo	a2bdd020e5	ColumnStyle -> ColumnPosition.	2017-05-04 14:54:31 +09:00
smoogipooo	956a7288fb	Add basic DrawableNote.	2017-05-03 20:12:27 +09:00
smoogipooo	8d82a52942	Add revert to normal special style after all steps.	2017-05-03 19:38:27 +09:00
smoogipooo	14e4714f08	Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.	2017-05-03 19:38:15 +09:00
smoogipooo	7de36b7aa2	CI cleanups.	2017-05-03 12:58:46 +09:00
smoogipooo	71acf1c57d	Move classes out of test case.	2017-05-03 12:37:47 +09:00
smoogipooo	b4052a099f	Create ManiaPlayfield, support up to 9 columns, improve testcase automation.	2017-05-03 12:30:03 +09:00
smoogipooo	27e16b8cfd	Merge remote-tracking branch 'origin/master' into mania-stage	2017-05-03 10:50:10 +09:00
Dean Herbert	5a8a8acbc8	Merge branch 'master' into roompanel	2017-05-02 18:04:48 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
smoogipooo	e856abe59a	Let's not use Country for drawings-specific stuff...	2017-05-02 13:02:14 +09:00
smoogipooo	80ebd04e85	Add keys to columns and add key down transformations.	2017-05-01 20:48:43 +09:00
smoogipooo	82cbb63af5	Add column generation + put spacing one level up.	2017-05-01 17:24:35 +09:00
smoogipooo	4aea18b673	Add initial column design.	2017-05-01 17:00:41 +09:00
Naeferith	bf6c170541	IStateful implementation	2017-04-28 10:59:34 +02:00
Dean Herbert	eb5d334838	Add non-toggle support for showing seek bar in SongProgress.	2017-04-25 22:59:46 +09:00
Dean Herbert	a850f4bda3	Merge branch 'master' into roompanel	2017-04-25 12:53:49 +09:00
smoogipooo	d7477955ac	CI fixes.	2017-04-21 20:42:13 +09:00
smoogipooo	5cdbb226f8	Remove CurvedHitObject to make RepeatSamples not tied to curve.	2017-04-21 20:40:11 +09:00
Dean Herbert	86c60ade85	Add a percentage-based slider testcase.	2017-04-20 19:16:47 +09:00
Dean Herbert	0de71ab24d	Add basic tooltip support to OsuSliderBar.	2017-04-20 17:57:58 +09:00
Dean Herbert	c87657707f	Add tooltip to sliderbars. Move interface.	2017-04-20 17:33:07 +09:00
Dean Herbert	ce5763ed97	Remove using.	2017-04-20 16:37:29 +09:00
Dean Herbert	30c3c932b1	Remove redundancies.	2017-04-20 15:29:34 +09:00
Dean Herbert	4ca27a5395	Merge branch 'master' into tooltips	2017-04-20 15:08:26 +09:00
Dean Herbert	b11315ca46	Remove unnecessary interfaces and simplify tooltip logic.	2017-04-20 14:34:29 +09:00
Dean Herbert	6cf026e5c1	Remove OsuScore and change the way statistics are stored (dynamic dictionary).	2017-04-20 11:03:11 +09:00
Jorolf	ea67b41683	move tooltip outside of the cursor	2017-04-20 00:42:40 +02:00
Jorolf	d04893a43a	---changing---	2017-04-19 15:33:24 +02:00
Jorolf	af9a45fd6c	Merge branch 'master' into tooltips	2017-04-19 13:51:39 +02:00
Jorolf	8e4288168a	renaming and some changes in TestCaseTooltip	2017-04-19 13:47:00 +02:00
Dean Herbert	3b95fbab7d	Add score statistic tracking (osu!).	2017-04-19 16:29:27 +09:00
Dean Herbert	2f53f2e248	Add license headers.	2017-04-18 22:35:21 +09:00
Dean Herbert	dc13d4d4ab	Display an actual date/time.	2017-04-18 22:22:14 +09:00
Dean Herbert	4a3fc710c4	Add temporary combo/accuracy display.	2017-04-18 22:22:14 +09:00
Dean Herbert	886ac1fb40	Add progress graph background and update ruleset references.	2017-04-18 22:22:14 +09:00
Dean Herbert	72fcc09a98	Add beatmap info and score date. ... Also adjusts design metrics.	2017-04-18 22:22:14 +09:00
Dean Herbert	d51b37cb44	Add a basic implementation of the new design results screen.	2017-04-18 22:22:14 +09:00
Dean Herbert	3b21340e1b	Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.	2017-04-18 18:40:02 +09:00
Dean Herbert	66865c50ad	Remove explicit RelativeSize setting.	2017-04-18 18:10:13 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Dean Herbert	2df21066e7	Add constant for osu! playfield size.	2017-04-18 12:19:39 +09:00
smoogipooo	8844ff7ab7	CI fixes.	2017-04-18 11:20:39 +09:00
Dean Herbert	5939ba9143	Fix ruleset not always being initialised correctly.	2017-04-18 10:55:33 +09:00
Jorolf	5d828a20e0	some formatting	2017-04-17 17:09:17 +02:00
Jorolf	dd26f9fcac	Merge branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-17 14:45:46 +02:00
Dean Herbert	fe0d18777e	Fix appveyor issues.	2017-04-17 19:52:07 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
Dean Herbert	83b083ce64	Move SQLite connections out of database classes; make abstract Database.	2017-04-17 14:37:52 +09:00
smoogipooo	4a149c4ab8	Better default values + don't set Mode from outside.	2017-04-15 06:14:31 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
Dean Herbert	627114abec	Improve test case.	2017-04-14 19:23:33 +09:00
Dean Herbert	ea0631ede8	Encapsulate progress update logic better.	2017-04-14 18:23:34 +09:00
Dean Herbert	acd7a5b254	Hook up beatmap object density to progress display.	2017-04-14 17:58:37 +09:00
Dean Herbert	8c41707ac7	Fix incorrect default state. Handle input better.	2017-04-14 14:40:52 +09:00
Dean Herbert	09195a03a2	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-14 11:25:00 +09:00
Jorolf	7f08c3c417	add IHasOverhangingTooltip	2017-04-14 00:18:17 +02:00
Jorolf	f6f75fac74	Merge branch 'master' of git://github.com/ppy/osu into tooltips ... # Conflicts: # osu.Game/Graphics/Cursor/MenuCursor.cs	2017-04-13 23:12:07 +02:00
Jorolf	c2b2e5ec19	changed way the tool tip is found and displayed	2017-04-13 23:00:49 +02:00
Dean Herbert	2c3fa30386	Metric -> Metrics.	2017-04-12 21:09:39 +09:00
Dean Herbert	157ad17606	Merge branch 'master' into details	2017-04-12 20:25:51 +09:00
smoogipooo	50a598dd05	Revert another masking container.	2017-04-12 15:01:54 +09:00
smoogipooo	32c3e34eb7	Revert "Better masking." ... This reverts commit 5d5040ee73.	2017-04-12 15:00:26 +09:00
smoogipooo	5d5040ee73	Better masking.	2017-04-12 14:34:49 +09:00
smoogipooo	04baa9eb72	Reset stage to normal height after tests.	2017-04-12 12:45:07 +09:00
smoogipooo	0c90ef79fa	Make TestCaseTaikoPlayfield work again.	2017-04-12 12:37:02 +09:00
Jorolf	50b6bcd574	Merge branch 'master' into details	2017-04-11 19:06:58 +02:00
Jorolf	d4e5f55091	the power of linq	2017-04-11 18:43:48 +02:00
Jorolf	fb5952186c	changes and fixes	2017-04-11 14:02:56 +02:00
Dean Herbert	9e6fa965b2	TestCasePlayer doesn't need a PlayerLoader.	2017-04-11 19:38:03 +09:00
Jorolf	ad41fd5c1a	more unnecessary stuff	2017-04-10 16:49:48 +02:00
Jorolf	a597149b7f	Merge branch 'details' of github.com:Jorolf/osu into details	2017-04-10 16:42:42 +02:00
Jorolf	24b4b3ad7d	update to everything	2017-04-10 16:42:23 +02:00
Dean Herbert	c6a24bb549	Merge branch 'master' into details	2017-04-10 20:07:13 +09:00
Dan Balasescu	ba4d654a21	Merge branch 'master' into has-bindable-value	2017-04-10 19:40:37 +09:00
Dean Herbert	cd016c57c8	Merge branch 'master' into more-taiko-relative-sizings	2017-04-10 17:34:18 +09:00
Dean Herbert	5af4259ab4	Add back explicit binds.	2017-04-10 17:10:15 +09:00
Dean Herbert	b7cfdff8d1	Update SliderBar to use IHasCurrentValue.	2017-04-10 15:30:17 +09:00
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
smoogipooo	f4094fbde2	Extend TestCaseTaikoPlayfield a bit.	2017-04-10 14:28:28 +09:00
smoogipooo	c882b9bafd	Make taiko playfield scale by height.	2017-04-10 05:08:05 +09:00
Jorolf	841d101be7	renaming	2017-04-07 20:41:03 +02:00
Jorolf	c60a55285c	updated TestCase and some null checks	2017-04-07 20:32:09 +02:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
Dean Herbert	3dbf4879c7	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:18:58 +09:00
Dean Herbert	fa28e7bdc3	Improve clickability and visuals of MusicController buttons.	2017-04-07 14:09:26 +09:00
Dean Herbert	1842d80e28	Update test case.	2017-04-07 09:43:08 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Andrey Zavadskiy	b380cbfd7a	Merge remote-tracking branch 'refs/remotes/ppy/master' into testcase_fix	2017-04-06 12:28:44 +03:00
Andrey Zavadskiy	c6f4cff2e7	Fix Pause/Fail testcase	2017-04-06 12:27:45 +03:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
smoogipooo	e299d7286e	Update framework + fix TestCaseTaikoHitObjects.	2017-04-06 12:52:56 +09:00
Dean Herbert	eed78d4251	Improve TestCaseTaikoPlayfield.	2017-04-05 13:53:29 +09:00
Dean Herbert	1b2713239a	Rename PreEmpt to ScrollTime and remove VelocityMultiplier for now.	2017-04-05 11:48:19 +09:00
Dean Herbert	a5cb233975	Use more suffixes.	2017-04-05 10:37:49 +09:00
Dean Herbert	028e941ab2	Major rsefinements to taiko drawable classes.	2017-04-05 10:01:40 +09:00
Dean Herbert	6dc03c1cc4	Add adjustable clock to testcase.	2017-04-05 09:58:47 +09:00
Dean Herbert	7040cee99b	Remove unnecessary width specifcations from TestCaseTaikoHitObjects.	2017-04-05 09:31:41 +09:00
Jorolf	f9bf1c69bf	add Flags to BarDirection and remove unused "using"	2017-04-04 18:23:29 +02:00
Jorolf	cd2fc3148e	added TestCaseGraphAndBar	2017-04-04 18:10:57 +02:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
Jorolf	b2731bb0a1	some formatting	2017-04-04 17:27:08 +02:00