662 Commits

Author	SHA1	Message	Date
Dean Herbert	b88f37de45	Add custom actions for Catch ... Reworks input management for rulesets	2017-08-09 11:50:34 +09: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
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
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