1098 Commits

Author	SHA1	Message	Date
Dean Herbert	a312fb365a	Merge remote-tracking branch 'ppy/master' into skinning-basics	2018-02-24 22:41:17 +09:00
V.Kalyuzhny	ef6b207c7e	Fix file case	2018-02-24 14:18:53 +02:00
smoogipoo	278b25bcbd	Fix border being the wrong size	2018-02-23 15:29:56 +09:00
Dean Herbert	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +09:00
Dean Herbert	84b707f4f8	Add basic hitcircle skinning	2018-02-23 13:38:12 +09:00
Dean Herbert	3726db53b5	Allow instantiation of skins	2018-02-23 13:38:12 +09:00
Dean Herbert	2351b6ab26	Add migration	2018-02-22 15:46:11 +09:00
Dean Herbert	4c14b32783	Add basic skin database model layout and importing	2018-02-22 15:46:11 +09:00
smoogipoo	7fd7dc1538	Extract playfield scaling into a separate class ... And make it more general.	2018-02-21 11:07:42 +09:00
smoogipoo	7fe0989427	Merge branch 'general-slider-improvements' into editor-hitobject-overlays	2018-02-20 23:51:47 +09:00
smoogipoo	ad2f556133	Add hitobject overlays to selected hitobjects	2018-02-20 18:01:45 +09:00
smoogipoo	4a5cd6520c	Extract playfield scaling into a separate class ... And make it more general.	2018-02-20 13:50:31 +09:00
Dean Herbert	835136aecb	Merge branch 'master' into api-interface	2018-02-20 09:33:53 +09:00
Dean Herbert	f41a40be15	Merge branch 'master' into editor-hitobject-movement	2018-02-19 17:59:50 +09:00
smoogipoo	4898c321f8	Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement	2018-02-19 17:07:03 +09:00
Dean Herbert	75dcf72520	Improve testability of API	2018-02-16 13:57:39 +09:00
Dean Herbert	f22f9b5de0	Merge branch 'master' into PlayerBase	2018-02-16 11:26:57 +09:00
TocoToucan	c57e8785e2	Move all storyboard loading to Player itself	2018-02-15 23:57:53 +03:00
Dean Herbert	1b13be1372	Cleanups and xmldoc additions	2018-02-15 16:24:14 +09:00
Dean Herbert	a0a65abcac	Crentalise all import logic	2018-02-15 14:22:39 +09:00
Dean Herbert	d340509b1d	Move ArchiveReaders to a more global namespace ... Also moves delete and action logic to a shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	6ff63c2f0c	Move deletion to ArchiveModelImportManager	2018-02-15 14:22:39 +09:00
Dean Herbert	e0d28564d0	Move import logic to shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	58f20c3723	Merge branch 'master' into editor-hitobject-movement	2018-02-13 18:56:16 +09:00
Dean Herbert	a738664167	Add interface for database context factory	2018-02-12 23:10:05 +09:00
smoogipoo	87baa6febd	Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments	2018-02-12 19:08:13 +09:00
smoogipoo	c3212d36ef	Remove handles for now (will be re-implemented)	2018-02-12 18:36:16 +09:00
smoogipoo	e10bb2db05	Unify SelectionLayer and HitObjectCapturer, rename SelectionBox	2018-02-12 18:35:01 +09:00
smoogipoo	20c0dee17d	Remove SelectionInfo	2018-02-12 18:22:52 +09:00
smoogipoo	ee168f9a77	Split out drag selection box from post-capture box ... Cleans up a lot of code, removes handles for now.	2018-02-12 18:20:05 +09:00
Dean Herbert	edc3638175	DatabaseWriteUsage	2018-02-12 17:55:11 +09:00
smoogipoo	1adbe3585c	HitObjectSelectionBox -> SelectionDragger	2018-02-12 16:03:59 +09:00
smoogipoo	cfb2b3f1e8	Rework SelctionLayer to support click-selections	2018-02-12 16:02:42 +09:00
Dean Herbert	db654004b7	Move BeatmapManagerWorkingBeatmap to its own file	2018-02-09 19:32:18 +09:00
TocoToucan	d437c1d7ec	Introduce PlayerBase class	2018-02-08 23:28:42 +03:00
Dean Herbert	534eb223b3	Merge branch 'master' into unified-hitwindows	2018-02-08 17:46:29 +09:00
Dean Herbert	789e25069f	Fix non-visual tests not cleaning up previous executions	2018-02-08 17:07:59 +09:00
smoogipoo	beaecbafbd	Merge branch 'master' into unified-hitwindows	2018-02-08 13:22:44 +09:00
Dean Herbert	dfc344b47a	Update OpenTK version	2018-02-06 13:47:54 +09:00
Dean Herbert	6b35ef7063	Update OpenTK version	2018-02-05 16:13:30 +09:00
smoogipoo	a0c1662fb7	Move mania's HitWindows to osu.Game	2018-02-02 17:52:55 +09:00
smoogipoo	13f16077d4	Implement Catmull-Rom curve approximator	2018-02-01 20:04:41 +09:00
Dan Balasescu	c1d5a68e4d	Merge branch 'master' into VisualSettingsOverlay	2018-02-01 16:37:04 +09:00
Dan Balasescu	d332a2dddd	Merge branch 'master' into url-parsing-support	2018-02-01 16:13:32 +09:00
Dean Herbert	042a34e1c2	Add migration to ensure database aligns to changed enum	2018-01-31 16:10:48 +09:00
Dean Herbert	28b67e3d77	Merge branch 'master' into url-parsing-support	2018-01-30 17:47:55 +09:00
smoogipoo	b4cd8ea716	GlobalKeyBindingContainer -> GlobalActionContainer ... Consitent with "FrameworkActionContainer".	2018-01-30 14:54:30 +09:00
smoogipoo	ef3fb8c05a	InputManager -> Container where KeyBindings are involved	2018-01-30 14:49:12 +09:00
Dean Herbert	0879366a30	Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support	2018-01-29 13:52:21 +09:00
Dean Herbert	2b14438fe4	Merge remote-tracking branch 'upstream/master' into url-parsing-support	2018-01-29 12:55:32 +09:00
Dean Herbert	247833174c	Fix incorrect case on migration file	2018-01-27 23:20:49 +09:00
Dean Herbert	a5b0d51205	Merge remote-tracking branch 'upstream/master' into url-parsing-support ... # Conflicts: # osu.Game/osu.Game.csproj	2018-01-27 14:06:58 +09:00
TocoToucan	615c831069	Merge from ppy/master	2018-01-26 21:56:17 +03:00
FreezyLemon	8f0ab2040f	Add Jetbrains.Annotations NuGet package	2018-01-26 12:46:28 +01:00
Dean Herbert	03154dbc63	Fix incorrect initial migration ... Also adds variant to settings	2018-01-25 23:41:03 +09:00
Dean Herbert	53c6526b22	Remove unused code file	2018-01-24 18:04:54 +09:00
Dean Herbert	5a00ae36d1	Add database-based configuration for rulesets	2018-01-24 17:45:28 +09:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
smoogipoo	0b7e1ce667	Add a way to have ruleset-specific configs	2018-01-17 19:45:18 +09:00
Dean Herbert	54b0f4b912	Merge branch 'master' into url-parsing-support	2018-01-17 16:16:55 +09:00
TocoToucan	a81f32a388	PlayerGroup -> PlayerSettingsGroup	2018-01-15 20:52:52 +03:00
Dean Herbert	0796d33e66	Merge branch 'master' into fix-skipbutton-ordering	2018-01-15 15:54:18 +09:00
smoogipoo	43f8a8e8c5	Rename OsuCursorVisualiser -> CursorOverrideContainer	2018-01-15 14:00:13 +09:00
TocoToucan	6e35484160	Fix osu.Game.csproj which was broken during resolving merge conflict	2018-01-13 23:09:43 +03:00
TocoToucan	43d2ae348a	Rename ReplaySomething -> PlayerSomething	2018-01-13 22:25:09 +03:00
smoogipoo	78441c05cb	OsuCursorContainer -> OsuCursorVisualiser	2018-01-12 19:45:09 +09:00
smoogipoo	16d739580b	IProvideLocalCursor -> IProvideCursor	2018-01-12 19:37:03 +09:00
Dean Herbert	45301d07fd	Merge branch 'master' into url-parsing-support	2018-01-12 19:34:44 +09:00
smoogipoo	512e4d2c9f	Rewrite the way that cursor overrides are done game-wide	2018-01-12 18:13:17 +09:00
Dean Herbert	29c8400ec7	Merge branch 'master' into scrolling-hitobjects-rewrite	2018-01-12 17:35:24 +09:00
smoogipoo	8a04c954a9	Cleanup	2018-01-12 17:19:59 +09:00
smoogipoo	441e8aced5	Better namings for the speed change "algorithms"	2018-01-12 17:18:34 +09:00
TocoToucan	c48c7b085c	Visual settings initial commit	2018-01-10 02:24:51 +03:00
Dean Herbert	72624aea18	Use a better method of link compilation ... Adds word wrap back, simplifies a lot.	2018-01-09 20:33:20 +09:00
Dean Herbert	b035a92bda	Merge branch 'master' into url-parsing-support	2018-01-09 14:28:20 +09:00
smoogipoo	c4d1922c8b	Add scrolling algorithm to global settings	2018-01-08 11:34:37 +09:00
smoogipoo	4ab3b0d76b	Implement local scrolling hit object container	2018-01-07 13:24:09 +09:00
smoogipoo	117ab8a26d	Split out scrolling algorithm	2018-01-07 13:23:16 +09:00
Aergwyn	e6b581e259	Merge branch 'master' into expand-social-tab	2018-01-06 10:48:27 +01:00
smoogipoo	1276e2c71a	Merge branch 'master' into scrolling-hitobjects-rewrite	2018-01-05 14:58:57 +09:00
Aergwyn	038fa682f7	Merge branch 'master' into expand-social-tab	2018-01-04 11:49:35 +01:00
Aergwyn	bf64b8fc69	added hover effects to panels in social ... at least partially QQ	2018-01-04 11:42:50 +01:00
smoogipoo	a7aab21a29	Re-namespace files	2018-01-04 19:22:15 +09:00
smoogipoo	e0c921ff5c	Split out ScrollingHitObjectContainer into new file	2018-01-04 19:20:43 +09:00
smoogipoo	651e24e3cc	Implement proper scrolling directions	2018-01-04 19:17:40 +09:00
smoogipoo	f34131f8f4	Initial game-wide replacement of scrolling playfields	2018-01-04 18:50:17 +09:00
smoogipoo	6d253fd33c	Add a way to adjust the conversion process with mods	2018-01-03 19:06:20 +09:00
Dan Balasescu	262a7f7d19	Merge branch 'master' into large-texture-store	2018-01-03 13:56:39 +09:00
Dean Herbert	faf1181fc3	Merge branch 'master' into url-parsing-support	2018-01-02 17:51:50 +09:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Aergwyn	cc4ef5d0aa	Merge branch 'master' into expand-social-tab	2018-01-01 12:00:50 +01:00
FreezyLemon	e7721d71f3	Changed chat link implementation according to review	2017-12-31 00:51:47 +01:00
Dean Herbert	f2d302f8dc	Create a LargeTextureStore for cached (but not atlased) global textures ... Also - Fixes first transition depth being incorrect. - Improves smoothness of transitions (and adds a slight delay to offset from screen switches).	2017-12-31 07:05:04 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	d9a80dae5d	Male NoFail use an applicable interface	2017-12-31 04:10:29 +09:00
Dean Herbert	fea4e1ff68	Add a base interface for applicable mods	2017-12-31 04:09:51 +09:00
Dean Herbert	3f8f778004	Merge branch 'master' into standard-hd-support	2017-12-29 15:56:38 +09:00
Dean Herbert	2ca10b28c6	Use a non-broken opentk library	2017-12-29 15:42:51 +09:00
FreezyLemon	7454633f63	Refactor and general tidying up	2017-12-28 20:11:21 +01:00
Aergwyn	b029f019b2	Merge branch 'master' into expand-social-tab	2017-12-28 19:36:22 +01:00