2068 Commits

Author	SHA1	Message	Date
DrabWeb	88d878e1d5	Formatting	2017-03-23 02:47:27 -03:00
smoogipooo	3d1dad8185	Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable ... Conflicts: osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-23 14:40:06 +09:00
DrabWeb	b8129526a4	Typo	2017-03-23 02:29:23 -03:00
Dean Herbert	d441114011	Merge branch 'master' into taiko_playfield_2	2017-03-23 14:28:42 +09:00
Dean Herbert	e77229b34b	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 14:26:00 +09:00
Dean Herbert	681ed38941	Use const whenever possible.	2017-03-23 13:52:38 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
DrabWeb	b8b45262c5	Formatting	2017-03-23 01:35:55 -03:00
DrabWeb	67421cdf1c	Even though it was 5 minutes ago what was I thinking	2017-03-23 01:34:06 -03:00
DrabWeb	677b8afc1f	Integration	2017-03-23 01:19:29 -03:00
smoogipooo	aa2b22ff12	Fix usings.	2017-03-23 13:02:34 +09:00
smoogipooo	c9fe9e681d	Make judgement text generic to be used between game modes.	2017-03-23 12:49:28 +09:00
DrabWeb	87b8015e8f	Cleanup	2017-03-23 00:29:28 -03:00
DrabWeb	c173c4b7ee	Tab control	2017-03-23 00:22:31 -03:00
smoogipooo	8b71d70633	Add a way to get the score string from JugementInfo.	2017-03-23 12:21:09 +09:00
Dan Balasescu	39134d79a8	Merge branch 'master' into taiko_hitobject_drawable	2017-03-23 11:03:42 +09:00
Dean Herbert	1d9da8facd	Merge pull request #520 from smoogipooo/use_equilateral_triangles ... Update framework + use EquilateralTriangle in Triangles.	2017-03-23 10:27:21 +09:00
Dean Herbert	859ee5d316	Tidy up DatabaseWorkingBeatmap.	2017-03-23 10:07:26 +09:00
Dean Herbert	9601e143d4	Merge branch 'master' into working-beatmap	2017-03-23 09:37:21 +09:00
Dean Herbert	e7f32fcbce	Merge pull request #525 from huoyaoyuan/controls ... DropDown update	2017-03-23 09:26:26 +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
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	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
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
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	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
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
Jorolf	82d6129063	renamed CursorSize to MenuCursorSize	2017-03-21 17:16:23 +01:00
Dean Herbert	7d8c2c9a15	Merge pull request #521 from EVAST9919/fixes ... Fixes	2017-03-22 00:30:57 +09:00
Andrey Zavadskiy	943bd737c4	Hide letterbox position sliders	2017-03-21 18:24:19 +03:00
Andrey Zavadskiy	4fa6db6cfa	Hide options when entering the game	2017-03-21 18:20:15 +03:00
Dean Herbert	0b2bb2ea0e	Fix typo in font name declaration.	2017-03-21 22:51:49 +09:00
Dean Herbert	d5af15579c	Merge pull request #519 from smoogipooo/parse_timesignature ... Parse time signature from legacy beatmap control points.	2017-03-21 22:24:29 +09:00
smoogipooo	a272675705	Parse time signature from legacy beatmap control points.	2017-03-21 21:18:08 +09:00
smoogipooo	66752af81f	Late-add the HitObjects container in the Playfield. ... Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.	2017-03-21 16:46:43 +09:00
Huo Yaoyuan	1d13924e0a	Remove redundant type parameter. ... Nested type has implicit type parameter from base type.	2017-03-21 01:05:48 +08:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dan Balasescu	417045c37c	Merge branch 'master' into textawesome_shadow	2017-03-20 13:17:35 +09:00
Dean Herbert	09bf014ded	Simplify fade out gradient code.	2017-03-19 21:49:29 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Dean Herbert	256a3268ac	Inline single usage of EdgeEffect.	2017-03-19 18:51:40 +09:00
Thomas Müller	44f71b3975	Merge branch 'master' into fix-beatmap-options	2017-03-19 09:34:53 +01:00
Thomas Müller	66cdc76621	Merge branch 'master' into hide-cursor	2017-03-19 09:23:30 +01:00
Dean Herbert	8cb334a118	Adjust sizing a touch.	2017-03-19 16:34:29 +09:00
Dean Herbert	af85bcaf1d	Merge pull request #500 from smoogipooo/explicit_expires ... Make DrawableHitObject expires explicit.	2017-03-19 12:47:43 +09:00
Dean Herbert	6c12da54f1	Merge pull request #499 from smoogipooo/legacy_beatmap_flag ... Add legacy beatmap flag.	2017-03-19 12:39:41 +09:00
DrabWeb	5c645350f9	Formatting	2017-03-19 00:14:23 -03:00
DrabWeb	4719817b45	Merge https://github.com/ppy/osu into leaderboards	2017-03-19 00:10:08 -03:00
DrabWeb	b0e7296e25	-IHasDrawableRepresentation, User.Region -> Country	2017-03-19 00:09:58 -03:00
Dean Herbert	7337cb5f62	Merge branch 'master' into taiko_hitobject_base	2017-03-19 11:37:39 +09:00
Dean Herbert	3d8ec4fa05	FIx transition not always being correct.	2017-03-19 02:33:25 +09:00
Dean Herbert	3c7b4a8ffa	Fix cursor being displayed during disclaimer.	2017-03-19 01:59:13 +09:00
Jorolf	80de15d935	fixed typo	2017-03-18 15:22:03 +01:00
Dean Herbert	8f75032b64	Fix incorrect abs.	2017-03-18 22:37:50 +09:00
Dean Herbert	125936bad0	Fix double-assignment.	2017-03-18 22:23:53 +09:00
Dean Herbert	919ec2d3a5	Spend more when wound up.	2017-03-18 22:17:23 +09:00
Dean Herbert	6f07930110	Move cursor hiding to OsuGameDesktop (fixes headless).	2017-03-18 21:46:58 +09:00
Thomas Müller	f636f59289	Nicer cursor orientation when dragging	2017-03-18 12:47:49 +01:00
Thomas Müller	9af0104e3e	Fix NaN when dragging music controller ... When dragging music controller we divide by the dragged distance. When dragging to the origin of the drag this resulted in NaN. Now, we check for this and use 0 in this case.	2017-03-18 12:46:12 +01:00
Thomas Müller	3ee2b68215	Hide the OS cursor in OsuGameBase	2017-03-18 12:00:31 +01:00
smoogipooo	b68b017a49	What even was this lol.	2017-03-18 18:38:51 +09:00
smoogipooo	26b0bb02d8	Remove IIsLegacy, expose LegacyBeatmap without a public constructor.	2017-03-18 18:32:54 +09:00
DrabWeb	0bc8ed9c9e	Use Colour for non-faded scores	2017-03-18 01:56:19 -03:00
DrabWeb	e78069af12	Parenthesis	2017-03-18 01:48:29 -03:00
DrabWeb	b9d5ab5d8c	Only calculate fade for fading leaderboard scores	2017-03-18 01:44:05 -03:00
DrabWeb	fbb8e79f1a	Move ctor above methods	2017-03-17 19:45:51 -03:00
DrabWeb	137611ecf3	Use LeaderboardScore height for fade	2017-03-17 19:07:45 -03:00
DrabWeb	82c02fa1fc	Formatting	2017-03-17 18:29:55 -03:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
DrabWeb	27ab8e2e86	Merge	2017-03-17 18:21:35 -03:00
DrabWeb	0834b5b794	Made requested changes	2017-03-17 18:16:59 -03:00
Jorolf	8568e1536c	Separated menu and gameplay cursor size	2017-03-17 18:40:03 +01:00
Dan Balasescu	e529f5e439	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 02:12:56 +09:00
smoogipooo	bcaf12e3d9	Rename Criteria -> CreateCriteria and make into method.	2017-03-18 02:11:14 +09:00
smoogipooo	77067b7e64	Re-style.	2017-03-18 02:04:23 +09:00
Dan Balasescu	1fda7ee33e	Merge branch 'master' into menu-cursor	2017-03-18 01:51:41 +09:00
Dan Balasescu	cd30958086	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 01:25:22 +09:00
smoogipooo	dde2ac7f4a	Make TextAwesome have a shadow.	2017-03-17 22:03:47 +09:00
Dean Herbert	3e3cde01ef	Fix missing permitNulls.	2017-03-17 21:21:16 +09:00
Dean Herbert	317dc94b4c	Adjust appearance.	2017-03-17 21:09:31 +09:00