197 Commits

Author	SHA1	Message	Date
DrabWeb	b856fb5991	Implemented beatmap options overlay	2017-03-02 08:40:55 -04:00
Dean Herbert	51950eef43	Merge branch 'master' into master	2017-03-02 18:06:31 +09:00
Dean Herbert	ff5f0af2d3	Merge branch 'master' into popup-dialog	2017-03-02 16:42:20 +09: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
DrabWeb	d5d8352b62	Testing build	2017-02-28 17:09:31 -04:00
DrabWeb	ce1798b8bc	DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay	2017-02-28 02:09:36 -04:00
DrabWeb	50d172be39	Added DialogManager(not wired up for desktop project yet)	2017-02-28 00:59:36 -04:00
DrabWeb	b3a231185b	Conform to naming conventions	2017-02-27 20:55:10 -04:00
DrabWeb	3094c01a40	Merge https://github.com/ppy/osu into popup-dialog	2017-02-27 16:40:04 -04:00
Alex Amadori	8b336156f0	Merge remote-tracking branch 'upstream/master'	2017-02-27 14:55:44 +01:00
Dean Herbert	21c6f66017	Fix TestCaseGamefield.	2017-02-27 18:30:10 +09:00
DrabWeb	d78dca3d85	New design	2017-02-26 23:35:13 -04:00
default0	1b92519a86	Update usages of AddToggle in Tests	2017-02-26 21:31:40 +01:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
DrabWeb	a009268370	Merge https://github.com/ppy/osu into popup-dialog	2017-02-25 21:22:47 -04:00
Alex Amadori	51b6075210	Merge remote-tracking branch 'upstream/master'	2017-02-24 16:54:37 +01:00
Alex Amadori	e2ae03e798	Merge with upstream/master	2017-02-24 16:54:27 +01:00
Dean Herbert	12db33ad4b	Visual and readability improvements to StarCounter.	2017-02-24 19:30:56 +09:00
Dean Herbert	3a89348413	Centralise access to WorkingBeatmaps. ... They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).	2017-02-24 13:43:21 +09:00
DrabWeb	c94da4fcf0	Added popup dialog	2017-02-24 00:05:37 -04:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Dean Herbert	011d2cc7cc	oops	2017-02-23 16:44:59 +09:00
Dean Herbert	d19a7813f3	Fix TestCasePlayer regression.	2017-02-22 23:27:29 +09:00
Dean Herbert	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Alex Amadori	fbb16295ae	Improved delegate syntax	2017-02-21 18:43:10 +01:00
Alex Amadori	a6fbfc8349	Using random generator from osu-framework	2017-02-20 17:49:02 +01:00
Dean Herbert	2a099bb56c	Stop TestCaseChatDisplay basically reimplementing ChatOverlay.	2017-02-19 17:06:51 +09:00
Alex Amadori	87ec0e36ea	Complying with rule "Instance fields (private)"	2017-02-18 16:45:46 +01:00
Alex Amadori	21cf96ec10	More sorting rookie mistakes	2017-02-18 16:23:13 +01:00
Alex Amadori	f48c83b787	Fix silly sorting mistakes	2017-02-18 15:56:29 +01:00
Alex Amadori	d92382c1aa	Merge remote-tracking branch 'upstream/master'	2017-02-18 15:18:26 +01:00
Alex Amadori	6bbbbd8f96	Implemented sorting in TestCasePlaySong	2017-02-18 15:11:40 +01:00
Dean Herbert	cf8b6c0697	Fix backgrounds in TestCasePlayer dimming to gray instead of black.	2017-02-18 15:54:26 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Dean Herbert	8bf3902cbd	Add the concept of nested DrawableHitObjects. ... - Applies to Slider Ticks and start circle. repeat/endpoints still need addressing. - Removed SliderTicksLayer abstraction for now.	2017-02-16 17:02:36 +09:00
Dean Herbert	c90f5e247d	Add a TickDistance to TestCaseHitObjects.	2017-02-16 13:20:40 +09:00
Dean Herbert	10dfe47638	Add spinners and improve TestCaseHitObjects.	2017-02-15 01:23:20 +09:00
Dean Herbert	ce29f0b0be	Add background layer to VisualTestGame.	2017-02-14 18:09:46 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Dean Herbert	ac548dc9ec	Rework notifications to be more flexible.	2017-02-12 14:50:42 +09:00
Dean Herbert	8ec927899f	Implement notifications.	2017-02-10 16:30:23 +09:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
Dean Herbert	6b011a50d2	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	756fd78a88	Fix incorrect line endings.	2017-02-07 13:52:19 +09:00
Dean Herbert	7ce5fc08ee	Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-02-01 14:05:58 +09:00
DrabWeb	2c12568a0d	Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser	2017-01-31 20:51:26 -04:00
DrabWeb	91a5d0b3cf	Made requested changes	2017-01-31 09:17:47 -04:00
DrabWeb	ecaa88a0d2	Changed TestCasePauseOverlay to use AddButton and removed background gradient(not needed)	2017-01-31 08:42:14 -04:00