117 Commits

Author	SHA1	Message	Date
DrabWeb	1eeb4aa875	Missed some	2017-03-02 09:21:16 -04:00
DrabWeb	536925c77a	Comply to naming conventions	2017-03-02 09:15:53 -04:00
Dean Herbert	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
Dean Herbert	c4ca18eeba	Remove references to PassThrough.	2017-03-02 16:28:51 +09: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
Jorolf	522034020e	Moved Bindable init	2017-02-28 11:44:12 +01: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
Dean Herbert	68dd3c02aa	Fix failing testcase (nullref).	2017-02-27 17:05:12 +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
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
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	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
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	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Dean Herbert	7cda82d016	Space to skip.	2017-02-22 21:28:40 +09:00
Dean Herbert	2d2660c1c5	Improve transition when retrying a beatmap.	2017-02-22 14:14:37 +09:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Dean Herbert	9a2beb5979	Update Key Counter font.	2017-02-16 22:43:49 +09:00
Dean Herbert	d570a6d308	Handle cases where HitObjects were not parsed.	2017-02-15 12:38:10 +09:00
Dean Herbert	343e48c195	Merge branch 'master' into followpoints	2017-02-13 22:23:57 +09:00
Dean Herbert	1aeb48b920	Merge remote-tracking branch 'upstream/master' into osb_loading	2017-02-13 18:22:29 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Damnae	2d155f6a5c	Bring back the delay to what it was before.	2017-02-10 10:48:25 +01:00
Damnae	6f37c02868	Fix followpoints needing a DelayReset.	2017-02-10 10:07:52 +01:00
DrabWeb	c61052d62e	Added toggling the progress bar, added buttons to the visual test	2017-02-09 20:12:15 -04:00
DrabWeb	0327c46d36	Fixed columns not being able to have zero fill	2017-02-09 19:29:12 -04:00
DrabWeb	843b58c8f4	Moved random graph values to test case, added null handling for graph values	2017-02-09 19:08:23 -04:00
DrabWeb	ac6726ee2e	Fixed setting column filled values not updating visually, added gray background to visual test	2017-02-09 18:56:50 -04:00
DrabWeb	4d7766b92b	Added displaying given values to the graph	2017-02-09 18:51:05 -04:00
DrabWeb	7fea233181	Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar	2017-02-09 16:28:40 -04:00
Damnae	a504c73f33	Load beatmap data from an optional osb file.	2017-02-09 15:19:09 +01:00
Andrey Zavadskiy	e06aa44c4c	Warning Fixes	2017-02-09 16:18:08 +03:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
DrabWeb	50f93bc215	Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class	2017-02-08 16:22:31 -04:00