3080 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	e7f32fcbce	Merge pull request #525 from huoyaoyuan/controls ... DropDown update	2017-03-23 09:26:26 +09:00
smoogipooo	5e0d9c3820	Cleanups + CircularContainer fixes.	2017-03-23 09:18:50 +09:00
smoogipooo	9c325ddd33	Cleanups + fix CircularContainer usages.	2017-03-23 09:12:51 +09:00
Dean Herbert	b0340f77d8	Remove nested types completely.	2017-03-23 08:57:14 +09:00
Dean Herbert	ff57d3800f	Merge branch 'master' into use_equilateral_triangles	2017-03-23 08:51:43 +09:00
Dan Balasescu	02dc6fb213	Merge branch 'master' into taiko_hitobject_drawable	2017-03-23 08:50:57 +09:00
Dean Herbert	3dee39346f	U -> T1.	2017-03-23 08:49:29 +09:00
smoogipooo	790997db90	Merge remote-tracking branch 'origin/master' into taiko_playfield_2	2017-03-23 08:49:20 +09:00
Dan Balasescu	972c56c73b	Merge pull request #532 from peppy/general-fixes ... Fix menu cursor size not sticking on startup.	2017-03-23 08:48:22 +09:00
Dean Herbert	ba32d50456	Consolidate nested classes.	2017-03-23 08:44:52 +09:00
smoogipooo	9247017c9a	Use EquilateralTriangle in Triangles.	2017-03-23 08:34:39 +09:00
Dean Herbert	537f0b9340	Fix menu cursor size not sticking on startup. ... Also tidied up bindables.	2017-03-23 08:07:59 +09:00
Huo Yaoyuan	5043032b48	Update framework.	2017-03-22 22:56:45 +08:00
Dean Herbert	7b06f31ddf	Merge pull request #530 from EVAST9919/checkboxes_fix ... Fix checkbox dependency in LoginOptions	2017-03-22 23:54:37 +09:00
Huo Yaoyuan	0dbc232ebf	Rename all DropDown -> Dropdown.	2017-03-22 22:32:32 +08:00
Huo Yaoyuan	6a4ca08578	Merge branch 'master' into controls	2017-03-22 22:28:19 +08:00
Andrey Zavadskiy	2d75c60463	Fix checkbox dependency in LoginOptions	2017-03-22 17:21:24 +03:00
Dean Herbert	09b59b5003	Merge pull request #529 from EVAST9919/spinner_fix ... Spinner fix	2017-03-22 22:18:42 +09:00
Andrey Zavadskiy	086191a12a	Spinner fix	2017-03-22 16:13:39 +03:00
Dan Balasescu	e5602c0938	Merge pull request #526 from peppy/general-fixes ... Fix usages of CircularContainer in line with framework changes.	2017-03-22 21:48:16 +09:00
Dean Herbert	1c83442b0b	Update framework.	2017-03-22 21:36:03 +09:00
Drew DeVault	2e1f596b2a	Move DatabaseWorkingBeatmap out of partial class	2017-03-22 06:50:48 -04:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Drew DeVault	2b1d31e69c	Address linting issues	2017-03-22 06:25:49 -04:00
Drew DeVault	267238dc27	Simplify derived classes of WorkingBeatmap	2017-03-22 06:15:32 -04:00
Drew DeVault	cc2b4c5c5b	Refactor WorkingBeatmap ... Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff from it to subclasses. Should enable us to make an OnlineWorkingBeatmap or so.	2017-03-22 05:57:08 -04:00
Dean Herbert	7fba0c4bce	Update framework.	2017-03-22 15:44:23 +09:00
Dan Balasescu	b349c7d7fd	Merge pull request #524 from peppy/update-state-safety ... Make DrawableHitObject's UpdateState safer	2017-03-22 15:38:26 +09:00
smoogipooo	aa8780797e	Abstract class + move AccentColour to base.	2017-03-22 15:22:02 +09:00
Huo Yaoyuan	e217c67bcf	Merge branch 'master' into controls	2017-03-22 08:54:03 +08:00
Dean Herbert	4f3ab879de	Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded. ... UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.	2017-03-22 09:43:44 +09:00
Dean Herbert	de5779ae8e	Merge branch 'master' into taiko_drumroll_base	2017-03-22 09:38:14 +09:00
Dean Herbert	83d3e37fd4	Merge pull request #523 from adrian17/fix_slider_test ... Fix auto-sliders in TestCaseHitObject	2017-03-22 09:37:47 +09:00
Dean Herbert	1f5c7d5be1	Merge pull request #483 from DrabWeb/leaderboards ... Leaderboards	2017-03-22 09:28:03 +09:00
Dean Herbert	bee7b43a37	Make avatar fallback work on failed load.	2017-03-22 09:20:37 +09:00
Huo Yaoyuan	b06eb0122c	Fix for colours and members rename.	2017-03-22 08:15:31 +08:00
Dean Herbert	f3486b7288	Add correct lifetime expiry for leaderboard content	2017-03-22 09:07:02 +09:00
Dean Herbert	7387dbd9fc	Tidy up LeaderboardScore	2017-03-22 09:04:33 +09:00
Huo Yaoyuan	b46ded7794	Use Bindable for DropDown.	2017-03-22 07:49:21 +08:00
Dean Herbert	1699daaf7f	Make DrawableRank safer.	2017-03-22 08:32:28 +09:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Dean Herbert	91f088e67e	Merge pull request #507 from Jorolf/seperateCursorSize ... Separated menu and gameplay cursor size	2017-03-22 08:19:12 +09:00
Huo Yaoyuan	f0edf5d3d3	Update to DropDown and Menu.	2017-03-22 07:18:53 +08:00
Dean Herbert	b00f86d809	Merge branch 'master' into seperateCursorSize	2017-03-22 08:11:45 +09:00
Adrian Wielgosik	3270fdcfde	Fix auto-sliders in TestCaseHitObject	2017-03-21 22:48:33 +01:00
smoogipooo	a72ae319a1	Override UpdateScrollPosition instead of Update.	2017-03-22 01:55:41 +09:00
smoogipooo	1532ae78a4	Fix post-merge errors.	2017-03-22 01:55:31 +09:00
smoogipooo	7cf935cef2	Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:53:44 +09:00
smoogipooo	a75a2e1794	Fix more post-merge errors.	2017-03-22 01:52:55 +09:00
smoogipooo	90c441f614	Override UpdateScrollPosition instead of Update.	2017-03-22 01:51:53 +09:00