1510 Commits

Author	SHA1	Message	Date
Dean Herbert	83663467ce	Update dependencies	2019-05-08 21:08:46 +09:00
David Zhao	732b0b22a3	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-05-07 12:04:58 +09:00
Dean Herbert	015b5cecb5	Update framework	2019-05-02 12:53:59 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
Dean Herbert	41d0b00120	Update framework	2019-04-27 16:43:23 +09:00
David Zhao	9ce7d0416b	Fix framework version	2019-04-25 23:16:08 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Dean Herbert	8dc7fd8223	Update framework	2019-04-25 12:16:12 +09:00
Dean Herbert	1f18c08cfc	Update framework	2019-04-22 19:17:58 +09:00
Dean Herbert	732c38fa79	Update framework again	2019-04-22 10:45:56 +09:00
Dean Herbert	9d6912a692	Update framework	2019-04-18 21:23:40 +08:00
Dean Herbert	d1799d197d	Update resources and mods usage	2019-04-18 09:27:30 +08:00
Dean Herbert	b684cd49e6	Update framework	2019-04-16 22:51:57 +08:00
Dean Herbert	a34a511f22	Update framework	2019-04-05 14:55:25 +09:00
Dean Herbert	072954e4c0	Update framework	2019-04-02 21:00:05 +09:00
Dean Herbert	22519ddacc	Update framework	2019-03-30 12:45:09 +09:00
Dean Herbert	bca8714905	Update framework	2019-03-28 23:25:31 +09:00
Dean Herbert	97675f6495	Update framework	2019-03-23 00:55:31 +09:00
Dean Herbert	d6f17a5ecd	Bring nuget packages up to date	2019-03-22 02:41:21 +09:00
Dean Herbert	c555019692	Update framework	2019-03-20 22:50:50 +09:00
Dean Herbert	def15645f7	Update framework	2019-03-19 17:32:36 +09:00
Dean Herbert	8c6caf0b18	Update framework	2019-03-16 01:38:42 +09:00
Dean Herbert	108dcd0a92	Update framework	2019-03-13 21:58:50 +09:00
Dean Herbert	10734b774c	Update framework	2019-03-08 20:48:50 +09:00
Dean Herbert	27edc41c11	Update framework	2019-03-07 20:14:43 +09:00
Dean Herbert	7f1f812f29	Update framework	2019-03-01 22:06:42 +09:00
Dean Herbert	48fcaf34e6	Update framework	2019-02-28 18:49:59 +09:00
Dean Herbert	42442edf5a	Update framework	2019-02-27 22:41:46 +09:00
Dean Herbert	69b9de5acd	Update framework	2019-02-23 21:13:53 +09:00
Dean Herbert	8f53af1c71	Update framework	2019-02-22 11:32:14 +09:00
Dean Herbert	b1337ed07f	Update framework	2019-02-20 16:09:29 +09:00
Dean Herbert	c607b8c979	Update framework	2019-02-15 21:28:59 +09:00
Dean Herbert	cf66fc6924	Update framework	2019-02-14 13:29:07 +09:00
Dean Herbert	a28689ff4c	Update framework	2019-02-12 17:58:36 +09:00
Dean Herbert	e8aed6b686	Update framework	2019-02-08 17:38:18 +09:00
smoogipoo	b5cc0ec8db	Update framework	2019-02-08 15:44:11 +09:00
Dean Herbert	09056fd0d8	Merge branch 'master' into resources-via-nuget	2019-01-31 18:40:45 +09:00
Dean Herbert	aac921c298	Update framework again	2019-01-31 13:33:21 +09:00
smoogipoo	a8a34f8f20	Update framework	2019-01-30 23:56:14 +09:00
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
Dean Herbert	144533706e	Update framework	2019-01-25 18:51:29 +09:00
Dean Herbert	828b9451e5	Update framework	2019-01-22 16:48:32 +09:00
Dean Herbert	b904bd9e8f	Update framework	2019-01-17 22:13:41 +09:00
Dean Herbert	5ff58870b8	Update framework	2019-01-16 19:05:46 +09:00
Dean Herbert	bfb18b4ffb	Update framework and other nuget packages	2019-01-16 10:14:37 +09:00
Dean Herbert	c1656a7608	Update framework	2019-01-10 21:22:42 +09:00
Dean Herbert	415df52c69	Update framework	2019-01-08 21:26:24 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Dean Herbert	edfb027ff2	Update framework	2018-12-26 18:49:33 +09:00
Dean Herbert	59452800ed	Update framework	2018-12-21 13:33:06 +09:00
Dean Herbert	8d458b0b6e	Update framework version	2018-12-19 19:45:50 +09:00
Dean Herbert	64626f62db	Update framework	2018-12-14 19:02:25 +09:00
Dean Herbert	2a2561e5c8	Update framework and otehr nuget packages	2018-12-07 19:39:54 +09:00
Dean Herbert	14d9f1d8bb	Fix hard crash due to out-of-order chat sequencing	2018-12-03 18:13:10 +09:00
Dean Herbert	7543af07dd	Remove weird reference	2018-11-30 14:30:50 +09:00
Dean Herbert	5254b07680	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
smoogipoo	2a41c38294	Update package	2018-11-20 17:30:03 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dean Herbert	caaa5645e3	Correct framework version	2018-11-14 21:16:08 +09:00
smoogipoo	f1f2fc133a	Use SkinInfo directly	2018-11-14 19:29:20 +09:00
Dean Herbert	1101e161d9	Update framework and resources	2018-11-12 17:02:46 +09:00
Dean Herbert	4554fc2c7b	Update framework and other dependencies	2018-11-05 18:22:16 +09:00
FreezyLemon	56ff2686ac	Update osu-resources and osu-framework to use binary fonts	2018-11-03 18:09:11 +01:00
Dean Herbert	e6ee3dc73e	Use framework helper functions for path approximation	2018-11-02 19:26:29 +09:00
Dean Herbert	0b534885b8	Update framework	2018-10-30 00:10:34 -07:00
smoogipoo	dd5a3ad59c	Fix SliderMask not working	2018-10-29 15:17:45 +09:00
Dean Herbert	ae94aab677	Update framework	2018-10-18 21:04:29 +09:00
Dean Herbert	15dae9b2e4	Update nuget dependencies (version mismatches)	2018-10-12 18:51:51 +09:00
Dean Herbert	182aa63cc8	Update nuget dependencies	2018-10-12 17:08:59 +09:00
Dean Herbert	c52a292935	Update framework	2018-10-12 16:10:32 +09:00
ekrctb	68980fc477	Adjust usage of Handle(Non)PositionalInput to follow framework update	2018-10-02 14:45:33 +09:00
ekrctb	b7a2ad1aa5	Use UIEvent level getters for modifier keys.	2018-10-02 13:26:36 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Dean Herbert	9baf587246	Bump framework again	2018-09-28 18:25:40 +09:00
Dean Herbert	1b77d9fd05	Merge branch 'update-chat-api' into update-framework	2018-09-26 19:50:23 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Dean Herbert	7cd547a760	Update chat to work with new API version	2018-09-25 20:53:24 +09:00
Dean Herbert	5ee4130351	Update framework reference	2018-09-20 18:39:44 +09:00
Dean Herbert	6a1e2c6fa5	Update efcore packages	2018-09-15 18:49:01 +09:00
smoogipoo	067bc39185	Update nuget package	2018-09-13 12:47:26 +09:00
Dean Herbert	144779c698	Update framework	2018-09-11 00:30:13 +09:00
Dean Herbert	cc533a05c5	Update framework	2018-09-07 19:00:43 +09:00
Dean Herbert	1327aed164	Update framework again	2018-09-06 19:23:19 +09:00
Dean Herbert	da906c0ddf	Update framework	2018-09-06 18:03:27 +09:00
Dean Herbert	62a8245f11	Update framework	2018-09-01 10:59:04 +09:00
Dean Herbert	4c72565936	Update framework	2018-08-31 19:20:10 +09:00
Dean Herbert	3276f0f54d	Update ef/sqlite version	2018-08-30 14:58:00 +09:00
Dean Herbert	9fb78852de	Update framework	2018-08-30 14:58:00 +09:00
smoogipoo	da2f04c79c	Update framework once more	2018-08-28 21:06:32 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
Dean Herbert	59d6ccbaab	Update framework	2018-08-24 15:27:13 +09:00
Dean Herbert	c97548804e	Update framework	2018-08-21 18:46:44 +09:00
Dean Herbert	7add4a8cc7	Update framework	2018-08-20 18:26:34 +09:00
Dean Herbert	6b0ed4a68d	Update framework	2018-08-20 13:37:59 +09:00
Dean Herbert	9fc0a75b71	Merge branch 'master' into sentry-logging	2018-08-16 13:33:24 +09:00
smoogipoo	add78508e0	Update framework	2018-08-15 15:54:26 +09:00
smoogipoo	4dfb63023f	Update with recent changes	2018-08-15 15:49:48 +09:00
Dean Herbert	7233e863db	Update framework	2018-08-07 01:07:50 +09:00
Dean Herbert	8d98826f69	Update framework	2018-08-03 21:17:17 +09:00
Dean Herbert	2ea90ef98a	Add sentry logging	2018-08-03 19:25:55 +09:00
Dean Herbert	6ce32bd431	Update remaining nuget deps	2018-08-01 19:17:16 +09:00
Dean Herbert	4224d35a75	Use forked squirrel ... Allows for updating SharpCompress, too.	2018-08-01 16:56:36 +09:00
Shane Woolcock	4fdca2b198	Update framework	2018-07-31 21:21:26 +09:30
Dean Herbert	f57ba4ffb1	Update framework	2018-07-30 14:14:16 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	6bcc8d1cbc	Update framework	2018-07-12 19:56:41 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	2150cb1028	Update framework and other packages	2018-07-10 20:31:04 +09:00
Dean Herbert	abfebbddd9	Update framework	2018-07-09 23:50:45 +09:00
Dean Herbert	7e28a993f7	Update framework	2018-07-05 21:08:53 +09:00
Dean Herbert	cd47bd2cf8	Update framework	2018-06-29 21:06:43 +09:00
Dean Herbert	8742f41b7d	Revert SharpCompress library to fix delta patching regression	2018-06-29 11:34:52 +09:00
Dean Herbert	563cb46b4a	Update framework and other nuget dependencies	2018-06-26 12:10:56 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Dean Herbert	8092d70402	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:33 +09:00
Dean Herbert	fd4f61fc88	Update framework and other packages	2018-06-08 21:51:43 +09:00
rootyElf	b3cab35a2c	Update EntityFramework libraries ... Updated Microsoft.EntityFrameworkCore.Sqlite and Microsoft.EntityFrameworkCore.Sqlite.Core to 2.1.0 to enable the app to run on arm linux platforms. This also updates SQLitePCLRaw.lib.e_sqlite3.linux from 1.1.7 to 1.1.11. While 1.1.7 only provides native libraries for linux-x64 and linux-x86, 1.1.11 adds alpine-x64, linux-arm, linux-arm64, linux-armel and linux-musl-x64.	2018-06-07 15:46:31 +01:00
Dean Herbert	475fb06559	Use new bind method	2018-06-07 16:46:54 +09:00
Dean Herbert	00b4a2519f	Update framework	2018-06-06 21:22:22 +09:00
Dean Herbert	601ef3b6f7	Consume osu.Framework via nuget	2018-06-05 14:14:56 +09:00
Dean Herbert	d4e7f08c20	Bring entity framework up-to-date and re-enable transactions	2018-05-29 16:23:27 +09:00
FreezyLemon	4b3a129738	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	1a8aa87469	Make everything better	2018-03-27 18:56:54 +09:00
Dean Herbert	988141408f	Update copyright year	2018-03-27 15:26:15 +09:00
Dean Herbert	b290d2d039	Move NUnit includes to individual projects	2018-03-27 15:07:09 +09:00
smoogipoo	dd5bbbbd9f	Define testable projects	2018-03-26 19:11:23 +09:00
smoogipoo	5159127bce	Fix SQLite failing to initialize on test projects	2018-03-26 18:07:09 +09:00
smoogipoo	35ef9d99c6	Only compile with net461 in visual studio	2018-03-26 15:44:55 +09:00
smoogipoo	96901b6498	Add msbuild/dotnet build + launch targets	2018-03-26 10:52:54 +09:00
smoogipoo	4dc317d4df	Fix msbuild warnings	2018-03-25 03:38:52 +09:00
smoogipoo	d28de89e50	Add net461 target to test projects for nunit discovery ... Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).	2018-03-25 01:35:50 +09:00
smoogipoo	a30270658d	Merge remote-tracking branch 'origin/master' into netstandard	2017-12-01 18:50:28 +09:00
smoogipoo	36be171c29	Fix up/clean up csprojs for C#7 support	2017-11-30 02:06:03 +09:00
smoogipoo	a0c3349935	Add LangVer.props and osu.Game.props for common csproj properties	2017-11-30 00:45:37 +09:00
smoogipoo	a9cc156d7a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-28 21:38:26 +09:00
Dean Herbert	880418fd0d	Split out click and hover sound layers	2017-11-26 17:21:22 +09:00
Dean Herbert	ac7e373f40	Add hover/click sound effects to more stuff everywhere	2017-11-26 17:21:21 +09:00
Dean Herbert	af499df6dd	Make a base OsuButton class to handle default samples	2017-11-26 17:17:48 +09:00
Dean Herbert	9565a9c352	Fix TestCasePlayer not working as expected	2017-11-23 20:42:07 +09:00
Dean Herbert	9d481eba96	Merge branch 'master' into kudosu-section	2017-11-23 17:19:42 +09:00
Dean Herbert	0f8499c580	Rename to PlaybackControl and add a TestCase	2017-11-22 11:22:46 +09:00
smoogipoo	0f8d4a455a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-21 19:18:06 +09:00
EVAST9919	10f730a004	Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed	2017-11-21 12:39:14 +03:00
smoogipoo	238756ec5d	Merge remote-tracking branch 'origin/master' into editor-playback-speed	2017-11-21 17:41:16 +09:00
Dan Balasescu	142b74cc47	Merge branch 'master' into sudden-death	2017-11-21 17:32:31 +09:00
smoogipoo	a66edea6dc	Move sqlite batteries to osu.Desktop ... Fixes e_sqlite.dll not being copied to output on Windows	2017-11-21 15:33:05 +09:00
Brayzure	da30d76f9b	Implement Score Processor Mod Interface ... - Add a delegate whenever we want to register an additional fail condition	2017-11-20 02:15:29 -05:00
smoogipoo	756f6f2d16	Remove net461 targets	2017-11-20 10:10:28 +09:00
Dean Herbert	492120e88c	Add migration for unique constraint on online id	2017-11-19 16:02:08 +09:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
EVAST9919	87f1368869	Add KudosuInfo container in the kudosu section	2017-11-18 18:19:35 +03:00
EVAST9919	d62da4334e	Add and place all the bottom bar objects	2017-11-17 12:26:13 +03:00
smoogipoo	1e023f0419	Implement PerformanceCalculator testcase	2017-11-17 14:37:19 +09:00
smoogipoo	38fe95d94a	Add basic display for pp in TestCasePerformancePoints	2017-11-17 14:37:19 +09:00
smoogipoo	18f2e92a48	Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator	2017-11-17 12:36:13 +09:00
smoogipoo	f461f03b08	Make osu! compile with framework changes	2017-11-16 14:51:31 +09:00
EVAST9919	d157e6baf1	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-13 16:02:44 +03:00
Dean Herbert	46ad986301	Merge branch 'master' into profile-beatmaps-section	2017-11-13 20:02:40 +09:00
EVAST9919	072e5db6ef	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-11 07:16:26 +03:00
EVAST9919	5bf756c3c6	Add DrawableTopScore	2017-11-11 06:54:52 +03:00
EVAST9919	3261af5200	Add scores container	2017-11-11 03:46:06 +03:00
EVAST9919	4b21c83f35	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-11-10 17:24:26 +03:00
EVAST9919	c9353e3795	Fix humanizer package path	2017-11-09 15:49:17 +03:00
Dean Herbert	5547348d07	Merge branch 'master' into profile-beatmaps-section	2017-11-09 18:31:46 +09:00
EVAST9919	a46dbee532	Add Humanizer package	2017-11-07 12:38:10 +03:00
EVAST9919	761d885167	Add Favourite Beatmaps section in UserProfileOverlay	2017-11-03 20:25:21 +03:00
Dean Herbert	d6c86ebcb1	Merge branch 'master' into intro	2017-11-01 15:38:14 +09:00
Dean Herbert	8138796ee3	Fix VisualTests configuration being completely wrong	2017-11-01 14:53:33 +09:00
Dean Herbert	ca8afc0c80	Merge remote-tracking branch 'upstream/master' into intro	2017-10-31 15:49:28 +09:00
Dean Herbert	069f4b1fcf	Make DrawableScore abstract and move shared class to own file	2017-10-30 19:15:19 +09:00
Dean Herbert	b660366d96	ScoreContainer -> PaginatedScoreContainer	2017-10-30 19:06:40 +09:00
Dean Herbert	dce7d1c910	Move pp score representation to own file	2017-10-30 19:05:13 +09:00
Dean Herbert	fcb88de626	Merge branch 'master' into recent-scores	2017-10-30 18:48:26 +09:00
EVAST9919	08637253df	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-26 15:04:44 +03:00
EVAST9919	189b51551d	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-26 14:40:40 +03:00
DerpyCrabs	de10300675	Fix case-sensitive linux build	2017-10-26 10:44:38 +07:00
Dean Herbert	ead3ca1f27	Merge branch 'master' into fix-threaded-context-issues	2017-10-25 23:42:08 +09:00
Dean Herbert	8452e315f4	Allow "refreshing" instances via DatabaseBackedStore	2017-10-25 22:06:25 +09:00
Dean Herbert	487b888f4f	Add missing database indices ... Also add missing unique constraints where applicable.	2017-10-25 22:05:10 +09:00
Jorolf	9109b1b3f1	Merge branch 'master' of git://github.com/ppy/osu into recent-scores	2017-10-24 20:34:26 +02:00
Jorolf	aadc699e73	show recent scores	2017-10-24 20:31:38 +02:00
Dean Herbert	ffe94ea880	Merge branch 'master' into revert-to-default-glow	2017-10-24 08:14:53 +09:00
Dean Herbert	dc9c474033	Move all TestCases to Testing project ... This allows tests to successfully retrieve rulesets, as they are referenced.	2017-10-23 19:32:02 +09:00
Dean Herbert	1b455019a8	Merge remote-tracking branch 'upstream/master' into revert-to-default-glow	2017-10-23 11:56:17 +09:00
Nabile Rahmani	5af6fb41f5	Fixed .NET Standard build on Linux.	2017-10-23 02:03:46 +02:00
DerpyCrabs	cf468d6708	Fix linux build ... Build is failing on linux because of case sensitive file system. This change fixes it.	2017-10-22 20:14:38 +07:00
Shane Woolcock	98044a17d3	Fix misaligned settings buttons	2017-10-21 13:16:06 +10:30
Dean Herbert	908c6d827f	ValueTuple please	2017-10-19 14:49:23 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	71d614b813	FIx missing columns yet again	2017-10-18 21:57:54 +09:00
Dean Herbert	ac4b2797dc	valuetuple nightmare	2017-10-18 20:07:25 +09:00
Dean Herbert	4e8019b313	Add some more missing indices	2017-10-17 19:59:22 +09:00
Dean Herbert	b9d0fb96ed	Fix cascade deletions	2017-10-17 18:26:28 +09:00
Dean Herbert	cd41862e3b	Add back transaction support for beatmap importing	2017-10-17 15:00:27 +09:00
Dean Herbert	ef10bb73db	osu.Game csproj fixes	2017-10-17 10:31:54 +09:00
Dean Herbert	eff1c20e38	CI fixing	2017-10-16 22:00:54 +09:00
Dean Herbert	e378d0685d	Remove weird additions	2017-10-16 20:37:10 +09:00
Dean Herbert	1a16784db9	Add BindingRedirects rule to fix dependency when running via nunit ... See https://github.com/ErikEJ/EntityFramework.SqlServerCompact/issues/463	2017-10-16 14:18:01 +09:00
Dean Herbert	a5ccf12e4a	Fix ValueTuple mess	2017-10-16 14:04:04 +09:00
Dean Herbert	29b46a5c5e	Add missing reference to System.ValueTuple	2017-10-16 13:23:41 +09:00
Dean Herbert	8a0b184dd6	Revert "Return back DatabaseBackedStore's query and populate functions" ... This reverts commit 7cf5d63cd3.	2017-10-16 12:59:59 +09:00
Dean Herbert	04e5f764a3	Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects"	2017-10-16 12:59:59 +09:00
TocoToucan	db2750592d	Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects	2017-10-15 14:01:35 +03:00
TocoToucan	7cf5d63cd3	Return back DatabaseBackedStore's query and populate functions	2017-10-15 00:40:41 +03:00
EVAST9919	e3ce641ea0	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-15 00:15:25 +03:00
EVAST9919	f4428980a6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-15 00:10:15 +03:00
smoogipoo	9924f518b7	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config	2017-10-14 16:36:37 +09:00
Dean Herbert	179542daf1	Standardise AssemblyInfos	2017-10-14 15:02:20 +09:00
Dean Herbert	c5046f6b3c	Add back osu.Desktop project ... While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day. This allows for the project to build again with default visual studio settings.	2017-10-14 14:33:05 +09:00
smoogipoo	b178be21d1	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
smoogipoo	b83d7cd4df	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs # osu.Game/Beatmaps/BeatmapInfo.cs # osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs	2017-10-14 12:38:59 +09:00
EVAST9919	6711331f66	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-14 05:18:03 +03:00
EVAST9919	bdcc70e0bb	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-14 05:06:36 +03:00
Dean Herbert	7550b461e3	Add individual beatmap set lookup request	2017-10-13 19:57:59 +09:00
Dean Herbert	520b806305	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-10-13 18:49:05 +09:00
Dean Herbert	f9a1240325	Merge remote-tracking branch 'upstream/master' into direct-previews	2017-10-13 14:06:46 +09:00
Dean Herbert	d98f1a2bb7	Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline	2017-10-12 21:48:08 +09:00
Dean Herbert	182bb71eb0	Merge branch 'master' into editor-waveform	2017-10-12 20:49:48 +09:00
Dean Herbert	70c55b23f4	Remove references to CodeAnalysisRulesets ... Having these produce warnings under certain compile environments.	2017-10-12 20:37:20 +09:00
smoogipoo	622659336d	Merge + update framework	2017-10-12 17:02:39 +09:00
Thomas Müller	78f2037d84	Remove now obsolete RatioAdjust	2017-10-12 09:42:06 +02:00
smoogipoo	de8f9325a3	Implement TimelineButton and use for the magnification buttons	2017-10-12 16:10:33 +09:00
smoogipoo	df6409308a	Merge remote-tracking branch 'origin/master' into editor-waveform-timeline ... # Conflicts: # osu-framework	2017-10-12 15:32:11 +09:00
EVAST9919	57a9116355	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-12 06:41:06 +03:00
TocoToucan	8b01f8671f	Merge from ppy/master	2017-10-10 21:07:36 +03:00
smoogipoo	c2f3c0e6df	Add TestCaseIconButton to demonstrate IconButton usages	2017-10-10 18:32:09 +09:00
smoogipoo	1cf8c0284a	Re-namespace a few classes	2017-10-10 15:22:39 +09:00
EVAST9919	0baceaaf0d	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-10 00:56:54 +03:00
TocoToucan	cbae19b604	Fix BeatmapMetadata removing	2017-10-10 00:17:12 +03:00
smoogipoo	cb58a1371e	Merge branch 'editor-waveform' into editor-waveform-timeline ... # Conflicts: # osu.Game/osu.Game.csproj	2017-10-09 18:10:52 +09:00
smoogipoo	b97b575b27	Merge remote-tracking branch 'origin/master' into editor-waveform ... # Conflicts: # osu-framework	2017-10-09 17:20:24 +09:00
Jorolf	de2181b8f5	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-10-06 21:02:48 +02:00
Jorolf	5a8b8dacbb	move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton	2017-10-06 21:02:00 +02:00
EVAST9919	402531d04c	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-06 20:37:59 +03:00
smoogipoo	fc99860f4e	Remove EditorMenuBarItem	2017-10-07 00:51:20 +09:00
Dean Herbert	55267abe67	Merge branch 'master' into editor-screens	2017-10-06 23:19:16 +08:00
EVAST9919	0ec7d2dcf6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-06 15:56:08 +03:00
smoogipoo	0a9d23b4ba	Update with framework changes (removal of WaveformDisplay)	2017-10-05 14:33:39 +09:00
EVAST9919	6fa45aafc6	Basic logic	2017-10-04 23:06:31 +03:00
TocoToucan	6a4198d0d6	Initial EF Core commit	2017-10-04 22:52:12 +03:00
smoogipoo	8427bb44d1	Implement basic layout for the compose screen ScrollableTimeline	2017-10-04 22:00:42 +09:00
smoogipoo	8bc20a2545	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-04 19:49:23 +09:00
smoogipoo	34eede0d04	Re-namespace EditorScreenMode	2017-10-04 19:36:55 +09:00
smoogipoo	357a467337	Implement design mode	2017-10-04 19:24:19 +09:00
smoogipoo	01c839eda7	Move WaveformDisplay into separate class and add some commenting	2017-10-04 17:51:28 +09:00
smoogipoo	1a7e3fa09e	Initial implementation of a test case which showcases waveforms	2017-10-04 17:51:27 +09:00
EVAST9919	b94c78e993	Hide/Show Replay settings on pressing Ctrl+H	2017-10-02 19:33:58 +03:00
smoogipoo	69b61a62a5	Implement base Compose screen	2017-10-02 10:09:21 +09:00
smoogipoo	c2d63eb0bd	Add EditorScreen + screen changing functionality	2017-10-02 09:26:52 +09:00
smoogipoo	2a9edcbb4f	Add test case for the editor	2017-10-02 08:11:02 +09:00
EVAST9919	2f852d705e	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-10-01 23:10:49 +03:00
Jorolf	259d49e6b9	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-09-29 23:09:33 +02:00
Jorolf	647304c14b	move logic to DirectPanel and reuse stuff for the PreviewButton	2017-09-29 23:08:30 +02:00
Dean Herbert	eed358a2c1	Merge branch 'master' into editor-screen-selection	2017-09-29 18:24:46 +08:00
EVAST9919	e7632b6e6f	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-28 14:44:31 +03:00
Dean Herbert	4eaf6b4b94	Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll	2017-09-28 00:14:04 +08:00
smoogipoo	ba8bf6cbd5	Add ScreenSelectionTabControl to EditorMenuBar	2017-09-27 22:01:53 +09:00
EVAST9919	3cd6319ffa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-27 00:32:38 +03:00
Jorolf	355a7b6649	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-09-26 12:22:11 +02:00
Dan Balasescu	b8b54e95a5	Merge branch 'master' into editor-timing-timeline	2017-09-26 15:54:01 +09:00
smoogipoo	5953c1084e	Re-namespace SummaryTimeline	2017-09-26 15:45:27 +09:00
smoogipoo	85cb541fef	Implement MarkerPart for the marker	2017-09-26 15:45:08 +09:00
smoogipoo	a1f88a17b1	Re-namespace and split out timeline parts from the SummaryTimeline	2017-09-26 15:44:40 +09:00
Dean Herbert	40f597f762	Add download button to grid view panels	2017-09-26 00:18:35 +08:00
Dean Herbert	5be11f539b	Rename to BeatmapSetOverlay	2017-09-25 17:26:27 +08:00
smoogipoo	7fb8008e44	Merge remote-tracking branch 'origin/master' into editor-timing-timeline ... # Conflicts: # osu-framework	2017-09-25 17:20:55 +09:00
Dean Herbert	b83596b44d	Merge branch 'master' into online-beatmap-set-overlay	2017-09-25 16:15:58 +08:00
EVAST9919	2da3ea00b6	Bind break overlay to accuracy	2017-09-23 16:42:18 +03:00
MrTheMake	0a27916761	Added infoMessage class to the project, use the class for the /help command and handle command parameter better	2017-09-22 15:31:30 +02:00
EVAST9919	56bde64839	Add arrows overlay	2017-09-22 01:16:05 +03:00
Jorolf	72141935e8	make pagination work and remove duplication in RanksSection	2017-09-21 22:07:23 +02:00
DrabWeb	cb4818e84e	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-21 14:25:34 -03:00
EVAST9919	c79568135a	Add arrows	2017-09-21 01:44:30 +03:00
EVAST9919	18a714df74	Move every class to it's own file	2017-09-20 22:33:07 +03:00
smoogipooo	f9568619e7	Move SummaryTimeline into /Edit/Components/SummaryTimeline	2017-09-20 16:59:03 +09:00
smoogipooo	5978668d2b	Mini -> Summary	2017-09-20 16:48:30 +09:00
smoogipooo	fd278256ad	EditorTimingTimeline -> EditorMiniTimeline	2017-09-20 15:50:32 +09:00
Jorolf	5b90f45691	Merge branch 'master' of git://github.com/ppy/osu into ranks-section	2017-09-19 21:26:05 +02:00
jorolf	ce4a44000f	Merge branch 'master' into direct-previews	2017-09-19 19:25:41 +02:00
EVAST9919	4cf88c72bf	Move testcase to the correct project	2017-09-19 17:37:34 +03:00
EVAST9919	c59d398aa5	Fix includes	2017-09-19 17:26:17 +03:00
EVAST9919	1b0ab414fa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-19 17:23:10 +03:00
smoogipooo	67d3861226	Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline ... Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.	2017-09-19 23:09:08 +09:00
Dean Herbert	511874389a	Define trace for VisualTests	2017-09-19 16:07:00 +09:00
Dean Herbert	1f20c5eb69	Optimise project references	2017-09-19 16:07:00 +09:00
Dean Herbert	6db705a3a8	Update relative paths	2017-09-19 16:06:58 +09:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
Jorolf	f8b09df13c	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-09-17 22:40:14 +02:00
Jorolf	be1e868a2a	add previews to osu!direct	2017-09-17 22:39:34 +02:00
EVAST9919	740e766201	BreakOverlay and LetterboxOverlay implementation	2017-09-15 19:39:55 +03:00
Dean Herbert	98b847b025	Add API retrieval support	2017-09-14 20:08:07 +09:00
Dean Herbert	9c4876d135	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-09-14 18:52:44 +09:00
Dean Herbert	02fa9eeb3b	Merge branch 'master' into online-beatmap-set-overlay	2017-09-14 16:52:44 +09:00
Dean Herbert	33d33a49ae	Merge branch 'master' into storyboards	2017-09-14 16:06:19 +09:00
Dean Herbert	fb7740a3ab	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
Damnae	bab3ef0669	Rename storyboard classes.	2017-09-13 11:22:24 +02:00
DrabWeb	08b5d4e16c	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-12 21:26:06 -03:00
Dean Herbert	28a25c201f	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-09-12 19:50:58 +09:00
Damnae	47cd1d486b	Merge branch 'master' into storyboards	2017-09-11 12:29:19 +02:00
DrabWeb	43fa314fe0	Details and more data displaying.	2017-09-11 02:48:48 -03:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
DrabWeb	e61ab72c0d	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-11 01:24:52 -03:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	6d33e39c5e	Merge branch 'master' into beatmap-details-rewrite	2017-09-10 11:26:00 +09:00
Damnae	bc01d9a1b0	Animate Additive / FlipH and FlipV.	2017-09-09 15:41:56 +02:00
DrabWeb	1d3139d3c3	Basic layout.	2017-09-08 18:32:07 -03:00
naoey	20f93c83d6	Make downloads happen in BeatmapManager.	2017-09-09 00:57:40 +05:30
Damnae	e63fb5720c	Make CI happy.	2017-09-08 13:04:53 +02:00
Damnae	e547416193	Storyboards implementation.	2017-09-08 09:08:52 +02:00
DrabWeb	109531b66c	Cleanup, remove unneeded files.	2017-09-07 15:21:18 -03:00
DrabWeb	5e685ff5b1	Rewrite BeatmapDetails to be more modular for future code sharing.	2017-09-07 14:53:53 -03:00
smoogipooo	e85d511645	No more partial judgements.	2017-09-06 17:48:01 +09:00
Dean Herbert	d7d0e96e6b	Merge branch 'master' into ranks-section	2017-09-01 18:46:53 +09:00
smoogipooo	b17d9ac06e	Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.	2017-08-28 17:55:50 +09:00
smoogipooo	fc6c682d88	Update in-line with framework changes.	2017-08-28 14:42:52 +09:00
smoogipooo	4fb9570618	Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework.	2017-08-25 15:10:29 +09:00
Dean Herbert	307c4dd392	Merge branch 'master' into direct-downloads	2017-08-24 21:30:38 +09:00
Dean Herbert	9adff5f697	Add osu!direct toggle to toolbar	2017-08-24 20:18:47 +09:00
Dean Herbert	36629f5207	Make ProgressBar usable in more places than just MusicController	2017-08-24 18:51:34 +09:00
Dean Herbert	189988236b	Move PlayerInputManager logic inside RulesetInputManager	2017-08-24 15:23:17 +09:00
smoogipooo	c1860f2ce2	Make KeyBindingOverlay support variants as settings sub sections.	2017-08-23 12:49:30 +09:00
Dean Herbert	250fb33fbc	Merge branch 'master' into ranks-section	2017-08-22 12:46:28 +09:00
Dean Herbert	102caf4b91	Merge branch 'master' into chat-local-echo-v2	2017-08-21 18:27:32 +09:00
Dean Herbert	877c69d5fe	Add local chat echo support	2017-08-21 17:43:26 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
Dean Herbert	3df51540e1	Code review fixes	2017-08-16 17:39:57 +09:00
Dean Herbert	dc82a88bb8	Improve namespaces of key bindings	2017-08-16 17:24:01 +09:00
Dean Herbert	9c75df884f	Add initial implementation of KeyConfiguration overlay	2017-08-16 00:17:33 +09:00
Dean Herbert	7c9d6c9c83	Initial refactoring of key binding logic	2017-08-14 20:19:25 +09:00
Dean Herbert	66fa84a451	Make settings more modular	2017-08-14 13:09:59 +09:00
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	a93a92a2bb	Remove GlobalHotkeys	2017-08-10 19:52:45 +09:00
Dean Herbert	798fff00b2	Remove shortcomings, remove InputState.Data usage, make everything amazing ... No more casting!	2017-08-10 19:28:24 +09:00
Dean Herbert	1fe273cbc0	Move GameplayCursor to osu! ruleset and make work with OsuActions	2017-08-10 18:37:41 +09:00
Dean Herbert	c82db54fb5	Rename OsuAction to GlobalAction	2017-08-10 17:22:08 +09:00
Dean Herbert	30bd1d70b5	ActionMapping doesn't support concurrent actions by default ... But can when required. Also supports key combination bindings now.	2017-08-10 16:08:43 +09:00
jorolf	934c2a1dc8	Merge branch 'master' into ranks-section	2017-08-09 18:47:25 +02:00
Dean Herbert	34b12fbfa4	Add global actions; improve default assignment	2017-08-09 17:10:32 +09:00
Dean Herbert	c70f96a9cd	Add basic documentation and split out classes.	2017-08-09 14:50:10 +09:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	b88f37de45	Add custom actions for Catch ... Reworks input management for rulesets	2017-08-09 11:50:34 +09:00
Jorolf	7d7cfe5d92	Merge branch 'master' of git://github.com/ppy/osu into ranks-section	2017-08-08 23:13:25 +02:00
Jorolf	1c2329f111	generalize the hover code	2017-08-08 23:11:46 +02:00
smoogipooo	62ee613da3	Merge remote-tracking branch 'origin/master' into timingchange-improvements	2017-08-07 17:35:53 +09:00
smoogipooo	933740664c	SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.	2017-08-07 16:43:54 +09:00
Dean Herbert	e75f438c29	Add difficulty application mods ... Also fixes circular references when using IJsonSerializable.	2017-08-07 08:54:54 +09:00
smoogipooo	b1d25ed388	Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection). ... Also removing a lot of mania code relating to gravity mod for now.	2017-08-04 23:07:08 +09:00
smoogipooo	54503eef71	Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract.	2017-08-04 22:50:29 +09:30
smoogipooo	0f901c99a0	Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.	2017-08-04 20:11:18 +09:30
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +09:00
Dean Herbert	57d45b180c	Merge remote-tracking branch 'upstream/master' into import-from-stable	2017-07-31 17:31:10 +09:00
Dean Herbert	17c5bdbc92	Merge branch 'master' into fix-notification-threading	2017-07-31 16:33:34 +09:00
Jorolf	4720a47363	Merge branch 'master' of git://github.com/ppy/osu into ranks-section	2017-07-29 00:45:14 +02:00
Jorolf	88f206cfe4	rename file	2017-07-29 00:39:47 +02:00
Jorolf	0fc36065f4	replace Play with Score	2017-07-29 00:31:52 +02:00
Dean Herbert	f705589bf2	Rename NotificationManager to NotificationOverlay	2017-07-28 15:03:42 +09:00
Dean Herbert	7d4218ea6c	Add option to import from osu-stable ... Also adds an option to delete all beatmaps for testing purposes.	2017-07-28 12:58:35 +09:00
Dean Herbert	9ee59dd637	Add the ability to create migrations on a per-store level ... Now stores store versions to the database itself.	2017-07-28 12:58:35 +09:00
Dean Herbert	3a6f3cdd8a	Add the ability to create migrations on a per-store level ... Now stores store versions to the database itself.	2017-07-27 20:38:40 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Jorolf	8e685a98d4	add RanksSection	2017-07-26 19:21:45 +02:00
Dean Herbert	898a601098	Introduce a reference counting file store	2017-07-26 20:22:02 +09:00
Dean Herbert	9e20a02c0a	Split out BeatmapDatabase into BeatmapStore ... Hide database functionality at a lower level in preparation from eventually making it private.	2017-07-26 16:31:34 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
Dean Herbert	e47faf4e85	Add a dummy beatmap provider for use in BeatmapInfoWedge	2017-07-19 15:16:33 +09:00
Thomas Müller	4d8261fe0b	Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs	2017-07-18 15:16:02 +03:00
Dean Herbert	c5d23daa6b	Merge remote-tracking branch 'upstream/master' into remove-dragbar ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-07-18 13:44:23 +09:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +03:00
Huo Yaoyuan	6cf36da389	Merge branch 'master' into profile	2017-07-14 22:52:19 +08:00
Dan Balasescu	3914b3ba13	Merge branch 'master' into right-mouse-scrollbar	2017-07-14 19:15:00 +10:00
Dean Herbert	3aeed86392	Merge branch 'master' into drawable-room-update	2017-07-14 15:29:27 +09:00
Dean Herbert	ab5341eadc	Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash	2017-07-14 09:46:36 +09:00
Dean Herbert	ce204b8e7b	Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar	2017-07-14 06:23:07 +09:00
Dean Herbert	c7a13740f9	Move sections to own namespace	2017-07-13 13:53:45 +09:00
Dean Herbert	3a4150c6c3	Merge remote-tracking branch 'upstream/master' into profile ... # Conflicts: # osu.Game/Graphics/Containers/SectionsContainer.cs	2017-07-13 13:44:21 +09:00
DrabWeb	fea40ccc1a	Share BeatmapSet cover sprite code.	2017-07-13 01:17:47 -03:00
DrabWeb	dc5ec319a2	Merge https://github.com/ppy/osu into drawable-room-update	2017-07-13 01:00:32 -03:00
Dean Herbert	56c817e4b6	Merge branch 'master' into osu-direct-search	2017-07-13 10:16:27 +09:00
Dean Herbert	9d47dd9ff9	Add support for right mouse absolute scrolling (when enabled) ... Will likely need to be bindable when hooked up to settings and actually used.	2017-07-12 18:57:44 +09:00
Dean Herbert	c8c1dcae28	Fix incorrect filename	2017-07-12 12:55:40 +09:00
Seth	b30721edbe	Merge branch 'master' into drawable-room-update	2017-07-11 20:42:44 -03:00
Thomas Müller	4045083dcd	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
DrabWeb	202e3ca530	Merge https://github.com/ppy/osu into medal-splash	2017-07-11 02:00:36 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Jai Sharma	6eaeba5a92	Merge branch 'master' into remove-dragbar	2017-07-06 20:14:08 +01:00
Huo Yaoyuan	cadc191602	Merge branch 'master' into profile	2017-07-02 22:03:30 +08:00
Dean Herbert	28f0da606a	Add OsuFocusedOverlayContainer with predefined sounds.	2017-06-28 10:18:12 -07:00
Dean Herbert	480cdba023	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
DrabWeb	fe875957a7	Share ruleset and type displaying, fix tag team icon.	2017-06-24 05:43:52 -03:00
DrabWeb	05b5fe8ae7	Share host/participant info displaying.	2017-06-24 05:21:42 -03:00
DrabWeb	e09625e49d	Merge https://github.com/ppy/osu into medal-splash	2017-06-23 22:42:36 -03:00
Jai Sharma	de50a1694f	Merge branch 'master' into remove-dragbar	2017-06-23 19:26:47 +01:00
Dean Herbert	b90c9bcacf	Merge branch 'master' into profile	2017-06-23 22:51:31 +09:00
Dean Herbert	81de1bd5a7	Merge branch 'master' into multiplayer-room-inspector	2017-06-23 21:55:18 +09:00
Dean Herbert	076d561615	Merge branch 'master' into profile	2017-06-23 13:12:36 +09:00
Jai Sharma	73c004fb71	Removed DragBar from song progress	2017-06-22 17:42:29 +01:00
Dean Herbert	89c8a34025	Merge branch 'master' into better-drawablehitobject-lifetimes	2017-06-21 20:13:57 +09:00
Huo Yaoyuan	2cbed67b01	Merge branch 'master' into profile	2017-06-20 05:05:05 +08:00
smoogipooo	34ac932fe2	Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.	2017-06-19 10:54:23 +09:00
ColdVolcano	ccac2e9a75	Add a visualizer around the logo	2017-06-18 19:33:50 -05:00
Huo Yaoyuan	6372cd0a13	Move namespace under Overlays.	2017-06-16 16:36:23 +08:00
Huo Yaoyuan	af4ddf8fbd	Merge branch 'master' into profile.	2017-06-16 16:32:54 +08:00
Huo Yaoyuan	273e2b4a3c	Fill more json fields.	2017-06-15 22:09:53 +08:00
smoogipooo	fda220acbc	Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.	2017-06-15 19:34:28 +09:00
Huo Yaoyuan	13d9f3b9bb	Move namespace and setup for DI.	2017-06-15 17:53:12 +08:00
Dan Balasescu	6fd37ebc32	Merge branch 'master' into timingchange-rework	2017-06-15 16:23:51 +09:00
Huo Yaoyuan	53ad7bc8ca	Add RankChart.	2017-06-15 00:48:01 +08:00
Huo Yaoyuan	190de76d9a	Add LineGraph.	2017-06-14 20:37:07 +08:00
Huo Yaoyuan	9ceb4930e9	Merge branch 'master' into profile	2017-06-13 15:23:12 +08:00
Dean Herbert	178e2b716e	Merge branch 'master' into us	2017-06-13 15:46:53 +09:00
Dean Herbert	679786c76f	Move MenuItemType to correct namespace	2017-06-13 15:20:21 +09:00
Dean Herbert	41d4aee4f5	Update nuget packages ... - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820	2017-06-13 11:50:46 +09:00
Huo Yaoyuan	fcd137ced2	Add OsuTextFlowContainer.	2017-06-13 00:51:06 +08:00
EVAST9919	41eb084191	CI fixes	2017-06-12 13:37:13 +03:00
EVAST9919	1711258038	Context Menu	2017-06-12 12:56:07 +03:00
smoogipooo	419682b740	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework	2017-06-12 13:09:02 +09:00
Huo Yaoyuan	d5dc37ec62	Merge branch 'master' into profile	2017-06-11 23:41:08 +08:00
Krzysztof "Nairaner" Machura	e7a732068c	Fix issue where nuget was only sometimes updating modules case-sensitive	2017-06-09 12:03:18 +02:00
smoogipooo	921350128d	Rename SpeedAdjustment -> MultiplierControlPoint + reworking.	2017-06-09 16:57:17 +09:00
smoogipooo	4b2669e65d	Namespace movement.	2017-06-09 16:20:55 +09:00
smoogipooo	d11002e499	Use new naming structure + VisibleTimeRange bindable.	2017-06-09 16:11:49 +09:00
Huo Yaoyuan	283b6b2b5e	Merge branch 'master' into profile	2017-06-09 13:45:32 +08:00
smoogipooo	cd435f7ec6	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs	2017-06-09 03:37:55 +09:00
smoogipooo	1231d5d35e	More renaming + fixes.	2017-06-09 02:42:17 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
Alex Amadori	59e539f166	Fix build error on unix	2017-06-07 18:03:27 +02:00
Huo Yaoyuan	e3cdb9f6fe	Create section classes.	2017-06-07 22:53:31 +08:00
DrabWeb	8006fab3c7	Merge https://github.com/ppy/osu into osu-direct-search	2017-06-07 09:56:13 -03:00
Dean Herbert	97db4856fc	Add toolbar toggle button ... Also ensure chat is hidden when social is displayed and vice-versa.	2017-06-07 20:15:58 +09:00
Dean Herbert	6a12173175	Add very temporary data source for social browser	2017-06-07 20:05:43 +09:00
Dean Herbert	a07f6801da	Merge remote-tracking branch 'upstream/master' into timingchange-rework	2017-06-07 18:39:27 +09:00
Dean Herbert	1de296747f	Merge remote-tracking branch 'upstream/master' into social-browser	2017-06-07 17:38:06 +09:00
Dan Balasescu	eb545d907d	Merge branch 'master' into simplify-hud-overlay	2017-06-06 14:31:54 +09:00
Huo Yaoyuan	8fa076b5d7	Merge branch 'master' into userpage	2017-06-05 21:14:46 +08:00
Huo Yaoyuan	428b44f7d9	UserPage -> Profile.	2017-06-05 21:07:57 +08:00
Dean Herbert	bf971f6613	Merge branch 'master' into social-browser	2017-06-05 19:16:28 +09:00
Dean Herbert	778865b6eb	Merge remote-tracking branch 'upstream/master' into channel-selection	2017-06-05 17:36:14 +09:00
Dean Herbert	5568df1aee	Remove StandardHUDOverlay ... This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now. We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.	2017-06-05 17:18:07 +09:00
Dean Herbert	af6f8bbd89	Fix namespaces and class names	2017-06-05 16:47:42 +09:00
Dean Herbert	0cb1df35e9	Merge remote-tracking branch 'upstream/master' into ingame_options	2017-06-05 14:53:37 +09:00
smoogipooo	a3299809fe	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs	2017-06-05 10:19:53 +09:00
Dan Balasescu	d6a1205d08	Merge branch 'master' into Daycore	2017-06-05 09:33:30 +09:00
Jorolf	a43890ffb4	update osu to use the framework's TooltipContainer	2017-06-03 14:50:35 +02:00
Dan Balasescu	43f73c298f	Merge branch 'master' into timingchange-rework	2017-06-02 20:19:23 +09:00
smoogipooo	7022c8d496	Move timing change stuff to osu.Game project.	2017-06-02 20:17:44 +09:00
DrabWeb	fc6f8b9c0c	Merge https://github.com/ppy/osu into medal-splash	2017-06-01 21:19:11 -03:00
DrabWeb	212b2c1142	Initial layout and animation	2017-06-01 04:45:46 -03:00
Patrick Andersson	1dd85b5986	Add alternative for random beatmap selection ... "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button	2017-05-31 20:11:26 +02:00
DrabWeb	9e01074852	Add GameType and DrawableGameType	2017-05-30 21:41:20 -03:00
Shawdooow	ecc0d0b11c	Daycore mod	2017-05-30 12:49:06 -04:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
DrabWeb	3aa1f35127	Basic layout	2017-05-30 05:12:11 -03:00
smoogipooo	72fa50f944	Make replay settings match design colours.	2017-05-30 17:02:04 +09:00
DrabWeb	21a8071293	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 20:31:35 -03:00
Dean Herbert	5e4558cc54	Merge branch 'master' into social-browser	2017-05-29 18:35:22 +09:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
Dean Herbert	4a0c8fb5dd	Merge branch 'master' into breadcrumbs	2017-05-29 15:59:37 +09:00
DrabWeb	8745948a01	Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class	2017-05-28 02:26:25 -03:00
DrabWeb	ab32e962ca	Make BeatmapOnlineInfo and BeatmapSetOnlineInfo separate classes, -OnlineWorkingBeatmap	2017-05-28 00:37:55 -03:00
Huo Yaoyuan	159e8d84c2	Move namespace and make cover background public.	2017-05-27 23:37:15 +08:00
Huo Yaoyuan	25387c996f	Merge branch 'master' into userpage	2017-05-27 22:42:56 +08:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
DrabWeb	cbe36259c3	Add BreadcrumbControl	2017-05-26 07:49:45 -03:00
smoogipooo	9517bfc2f1	Add file to csproj.	2017-05-26 19:33:23 +09:00
DrabWeb	64016f9466	Merge https://github.com/ppy/osu into channel-selection	2017-05-26 03:24:41 -03:00
DrabWeb	68377494f7	Browser - SearchableList	2017-05-26 02:44:09 -03:00
DrabWeb	8fca0fddb3	Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser	2017-05-26 00:54:03 -03:00
Huo Yaoyuan	9bc1eece0a	Basic section management of userpage.	2017-05-25 02:11:07 +08:00
Seth	3094a8267f	Merge branch 'master' into drawable-multiplayer-room	2017-05-24 04:39:57 -03:00
Dean Herbert	3134f92051	Merge branch 'master' into user-panel	2017-05-24 16:32:09 +09:00
DrabWeb	ba2627d4e2	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-24 02:40:00 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
ColdVolcano	c6d744eb7c	Merge branch 'master' of ppy/osu into menu-flashes	2017-05-23 20:00:02 -05:00
EVAST9919	2ca0794b37	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-23 14:45:38 +03:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
Dean Herbert	1295b0a7e1	Merge branch 'master' into ColdVolcano/beat-syncing	2017-05-23 10:51:47 +09:00
DrabWeb	9798117d53	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
DrabWeb	03f6cded84	MultiplayerRoom -> Room	2017-05-22 12:44:58 -03:00
ColdVolcano	a1547f12d4	Applied suggestions + Update Framework	2017-05-22 04:38:21 -05:00
smoogipooo	3235e280a9	Add to csproj.	2017-05-22 17:32:18 +09:00
EVAST9919	b99bad055d	oops	2017-05-22 09:28:36 +03:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
DrabWeb	7ce3b73ecd	Added UserPanel and UserStatus	2017-05-22 03:11:42 -03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
Huo Yaoyuan	d0ff9e6576	Merge branch 'master' into sections	2017-05-22 12:52:27 +08:00
DrabWeb	800a319470	Remove newline	2017-05-22 01:08:35 -03:00
DrabWeb	0c30b2c698	Remove folder from osu.Game.csproj	2017-05-22 01:07:26 -03:00
DrabWeb	0795089d86	Merge https://github.com/ppy/osu into drawable-multiplayer-room	2017-05-22 01:06:05 -03:00
DrabWeb	e5ee7096f8	Initial cleanup	2017-05-22 00:07:15 -03:00
DrabWeb	c4e6870c12	Merge https://github.com/ppy/osu into roompanel	2017-05-21 22:37:00 -03:00
DrabWeb	bc980b60ac	Add files to project, update with framework changes	2017-05-21 22:36:46 -03:00
smoogipooo	0a0139aded	Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.	2017-05-22 10:12:33 +09:00
Jorolf	5b244367ee	allow for solutions were the osu repository isn't at the solution level	2017-05-21 20:29:05 +02:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
DrabWeb	6a8d745db1	Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned	2017-05-20 18:29:57 -03:00
DrabWeb	31890a1e01	Initial layout, channels items	2017-05-20 18:06:25 -03:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	e030573436	Add ReverseDepthFillFlowContainer to remove code duplication	2017-05-19 23:44:36 -03:00
DrabWeb	cdd2b54dc7	Move SlimEnumDropdown into it's own file	2017-05-19 20:25:08 -03:00
DrabWeb	83c81c0626	Cleanup (again)	2017-05-19 20:03:07 -03:00
Huo Yaoyuan	24a813e907	Basic children management of SectionsContainer.	2017-05-20 05:15:57 +08:00
DrabWeb	5b2c74be50	Remove Direct folder from csproj	2017-05-19 16:24:27 -03:00
DrabWeb	e1c4c36122	+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds	2017-05-19 15:43:18 -03:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	d07d94d606	better resizing	2017-05-18 07:09:36 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
DrabWeb	cabfe72c92	Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel	2017-05-17 18:02:33 -03:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	e0625a9b30	More overlays and overall fixes	2017-05-17 15:39:26 +03:00
smoogipooo	74c23ff6d8	Add base for event parsing code.	2017-05-17 20:46:23 +09:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03:00
smoogipooo	17466a662c	Add hold note conversion.	2017-05-17 13:09:07 +09:00
Dan Balasescu	91de72e161	Merge branch 'master' into on-screen-display	2017-05-16 16:27:19 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +09:00
Dean Herbert	dcd4b4450d	Add error message in chat when attempting to use commands	2017-05-15 13:26:35 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dean Herbert	d3770d8395	Merge branch 'master' into chat-design-update	2017-05-12 19:57:57 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace ... Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dean Herbert	dbf60d24bf	Second design update pass.	2017-05-12 15:39:00 +09:00
Dean Herbert	c4a93cbc85	Move drawable chat related classes to better namespace	2017-05-12 15:38:51 +09:00
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
Dean Herbert	9a1c662d1f	Update framework	2017-05-11 21:25:43 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
EVAST9919	d06b5783cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-06 17:33:51 +03:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
EVAST9919	26985dbc62	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 16:22:40 +03:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
EVAST9919	f49cc124ed	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 08:26:54 +03:00
EVAST9919	a897dcbfbe	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-03 08:26:01 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
EVAST9919	108cd28e96	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-02 10:15:56 +03:00