3040 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alex Amadori	1cd93f79b3	General sorting improvements	2017-02-18 07:59:01 +01:00
Thomas Müller	7a29603800	Merge pull request #365 from peppy/general-fixes ... Better screen hierarchy	2017-02-18 07:58:03 +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	94dd268fd2	Move constant for default ControlPoint out of Slider.	2017-02-18 15:54:16 +09:00
Dean Herbert	bf33cc6f53	Make disclaimer actually be a thing.	2017-02-18 14:16:46 +09:00
Dean Herbert	76cab600d9	Update framework.	2017-02-18 13:23:53 +09:00
Alex Amadori	6b3ecc28b8	Fixed BeatmapPanels disappearing	2017-02-17 23:32:14 +01:00
Thomas Müller	ef775458dd	Fix compilation error introduced in merge conflict resolution.	2017-02-17 21:27:17 +01:00
Thomas Müller	04de28d8b2	Merge branch 'refs/heads/update-framework' into general-fixes	2017-02-17 21:26:39 +01:00
Thomas Müller	1198705a6f	Merge branch 'master' of github.com:ppy/osu into general-fixes ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2017-02-17 21:22:34 +01:00
Thomas Müller	4b0d6cd26b	Don't rely on default relative size of ScrollContainer.	2017-02-17 20:08:28 +01:00
Andrey Zavadskiy	2f4855b00f	Added exception	2017-02-17 21:07:59 +03:00
Thomas Müller	6a58d7ab2a	Merge pull request #366 from OussamaDanba/slider_timingpoint_fix ... Fix beatmap import crash when the first timingPoint starts later than…	2017-02-17 18:22:55 +01:00
Shadoxfix	7a45ea58b2	Add comment explaining why the branch is necessary	2017-02-17 18:17:18 +01:00
Alex Amadori	7dcbefd50f	Implemented basic sorting logic	2017-02-17 17:41:53 +01:00
Shadoxfix	72306e8757	Fix beatmap import crash when the first timingPoint starts later than a slider	2017-02-17 17:36:00 +01:00
Jorolf	88c48bec46	Merge branch 'master' of https://github.com/ppy/osu	2017-02-17 12:54:11 +01:00
Dean Herbert	fe3a6248ec	Add better screen hierarchy and placeholder for dev build disclaimer.	2017-02-17 20:07:16 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Dean Herbert	366e95dd4f	Remove outdated comment.	2017-02-17 17:33:41 +09:00
Dean Herbert	9e8b4d43dd	Improve exit procedure.	2017-02-17 17:25:28 +09:00
Dean Herbert	0b922365bb	Fix nullref due to missing controlPoints.	2017-02-17 15:27:48 +09:00
DrabWeb	4ccfa380f5	Added high/low multiplier indication	2017-02-16 19:09:18 -04:00
DrabWeb	e0dab3490f	Added toggling mods with keys	2017-02-16 19:00:18 -04:00
DrabWeb	9fc3726925	ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly	2017-02-16 18:32:27 -04:00
DrabWeb	0a58fc62db	Added mod selection overlay	2017-02-16 16:05:03 -04:00
Dean Herbert	ecb840e26f	Merge pull request #364 from peppy/general-fixes ... Design improvements	2017-02-16 22:49:57 +09:00
Dean Herbert	aaed714160	Adjust Explode alpha slightly.	2017-02-16 22:48:47 +09:00
Dean Herbert	53e40804ab	Move other score components to centre alignment (and switch font).	2017-02-16 22:44:41 +09:00
Dean Herbert	ca6946c7a2	Update Health display design.	2017-02-16 22:44:21 +09:00
Dean Herbert	9a2beb5979	Update Key Counter font.	2017-02-16 22:43:49 +09:00
Dean Herbert	04346dbb92	Make osu! logo at song select correctly handle mouse focus.	2017-02-16 22:24:25 +09:00
Dean Herbert	a3cdbe234e	Merge pull request #362 from Nabile-Rahmani/apply-suggestions ... Fixed "Namespace does not correspond to file location".	2017-02-16 21:39:42 +09:00
Nabile Rahmani	9c4bb82dd6	Merged upstream/master.	2017-02-16 13:23:11 +01:00
Nabile Rahmani	1cdd2a6072	Updated submodule.	2017-02-16 13:09:42 +01:00
Nabile Rahmani	3068fa1a62	Namespace does not correspond to file location.	2017-02-16 11:30:31 +01:00
Thomas Müller	e10c5644fe	Merge pull request #359 from Damnae/slider_ticks ... Add slider ticks.	2017-02-16 10:31:05 +01:00
Dean Herbert	b55d85a5c5	Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects.	2017-02-16 17:33:13 +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	2640c2ac43	Add tick sample.	2017-02-16 13:39:01 +09:00
Dean Herbert	19eb58e724	Fix namespace.	2017-02-16 13:37:08 +09:00
Dean Herbert	97b782128e	Adjust tick appear/disappear animations.	2017-02-16 13:33:59 +09:00
Dean Herbert	c90f5e247d	Add a TickDistance to TestCaseHitObjects.	2017-02-16 13:20:40 +09:00
Dean Herbert	6c9fe544b2	Handle case where TickDistance is zero (don't draw ticks).	2017-02-16 13:20:30 +09:00
Dean Herbert	23677a309f	Merge branch 'master' into slider_ticks	2017-02-16 11:06:23 +09:00
Thomas Müller	d3335f778b	Merge pull request #361 from peppy/general-hitobject-improvements ... General HitObject improvements.	2017-02-15 19:49:46 +01:00
Damnae	f1535363f4	Rename SliderTicksRenderer to SliderTicksLayer.	2017-02-15 19:06:54 +01:00
Damnae	b7fca88b4f	Clearer slider Velocity and TickDistance calculations.	2017-02-15 18:55:49 +01:00
Dean Herbert	25f65a978b	Framework bump.	2017-02-16 02:41:30 +09:00
Dean Herbert	31a617363a	Improve the feel of spinners.	2017-02-15 23:24:08 +09:00