6388 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	4d1dd70cfb	Licence headers	2017-08-08 07:32:23 +09:00
Dean Herbert	825e854aff	Merge branch 'master' into catch-catcher	2017-08-08 07:28:55 +09:00
Dean Herbert	fe625f711a	Update framework	2017-08-08 07:22:03 +09:00
Dean Herbert	fc30c471ed	Update resources	2017-08-08 07:18:31 +09:00
Dean Herbert	725a69d973	Begin conversion	2017-08-07 16:02:14 +09:00
Dean Herbert	b71caca131	Expand abilities of catcher	2017-08-07 15:09:31 +09:00
Dean Herbert	d5c6693990	Merge pull request #1085 from smoogipooo/spriteicon-invalidation-fix ... Fix SpriteIcon invalidation causing game breakness.	2017-08-07 15:04:05 +09:00
Dean Herbert	2ce30474ca	Merge branch 'master' into spriteicon-invalidation-fix	2017-08-07 14:49:09 +09:00
Dean Herbert	25bc281f00	Merge pull request #1086 from smoogipooo/add-accent-sequence ... Add transform sequence support to IHasAccentColour.	2017-08-07 14:48:59 +09:00
smoogipooo	d0906d8232	Adjust xmldocs to conform to TransformableExtensions.	2017-08-07 14:20:56 +09:00
smoogipooo	2221797273	Add transform sequence support to IHasAccentColour.	2017-08-07 14:12:05 +09:00
smoogipooo	ce7d391f06	These method calls are impure.	2017-08-07 13:37:07 +09:00
smoogipooo	953cf5af58	Fix SpriteIcon invalidation causing game breakness.	2017-08-07 13:26:54 +09:00
Dean Herbert	c930085213	Add glow	2017-08-07 11:06:03 +09:00
Dean Herbert	51d2b9c35c	Tidy up visually	2017-08-07 11:05:58 +09:00
Dean Herbert	81b738f68c	Add basic Catcher	2017-08-07 11:05:54 +09:00
Dean Herbert	554d0d6fb8	Update basic structure of Catch project	2017-08-07 11:05:48 +09:00
Dean Herbert	b8d67f65af	Merge pull request #1084 from ppy/correct-cs-multiplier ... Adjust CS multiplier to match stable	2017-08-07 10:53:39 +09:00
Dean Herbert	eb190d83bd	Adjust CS multiplier to match stable	2017-08-07 10:43:33 +09:00
Dan Balasescu	c7b59646c0	Merge pull request #1083 from peppy/more-mods ... Implement NoFail, HardRock, Easy mods	2017-08-07 10:07:06 +09:00
Dean Herbert	da84f1ce39	Update framework	2017-08-07 09:56:50 +09:00
Dean Herbert	8941c8658c	Use nested containers for shadow	2017-08-07 09:50:04 +09:00
Dean Herbert	de3b65e1fa	Fix StoredBookmarks not being serialized	2017-08-07 09:45:44 +09:00
Dean Herbert	6f93aa6131	Fix incomplete comment	2017-08-07 09:01:47 +09:00
Dean Herbert	e75f438c29	Add difficulty application mods ... Also fixes circular references when using IJsonSerializable.	2017-08-07 08:54:54 +09:00
Dean Herbert	224de9cc1e	Implement NoFail mod	2017-08-07 08:54:54 +09:00
Dean Herbert	3416925233	Fix alignment of icons on mod buttons	2017-08-07 08:54:53 +09:00
Dean Herbert	d7fede96ef	Fix shadow on SpriteIcon being a bit off	2017-08-07 08:54:53 +09:00
Dean Herbert	c9b0177e09	Merge pull request #1082 from huoyaoyuan/depth ... Remove depth setting in SectionsContainer and profile.	2017-08-07 07:28:09 +09:00
Huo Yaoyuan	8843d97895	Remove depth setting in SectionsContainer and profile.	2017-08-05 18:01:10 +08:00
Dean Herbert	0312103546	Merge pull request #1078 from smoogipooo/taiko-fixes ... Taiko fixes	2017-08-04 20:01:33 +09:00
Dean Herbert	fa7ef8ed52	Merge remote-tracking branch 'upstream/master' into taiko-fixes ... # Conflicts: # osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs # osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2017-08-04 18:04:23 +09:00
Dean Herbert	5cf8121d29	Merge pull request #1025 from huoyaoyuan/fixes ... Implement Ctrl+Enter for Auto in song select.	2017-08-04 17:48:47 +09:00
Dean Herbert	083248872b	Revert all changes on OsuGame	2017-08-04 17:36:31 +09:00
Dean Herbert	e8021c2b92	Move line inside if	2017-08-04 17:20:05 +09:00
Dean Herbert	0f8d46a990	Merge remote-tracking branch 'upstream/master' into fixes	2017-08-04 17:19:32 +09:00
Dan Balasescu	1c37efdd28	Merge pull request #1080 from peppy/visual-test-updates ... Update to support new framework VisualTests structure	2017-08-04 17:44:45 +09:30
smoogipooo	17900f3353	Update VSCode with new configurations.	2017-08-04 17:18:44 +09:30
Huo Yaoyuan	74facb32b4	Use removeAutoModOnResume as a field.	2017-08-04 15:34:11 +08:00
Dean Herbert	fc97fdb8c1	Use a common build directory between both build ccnfigurations ... There's no need to build to VisualTests when they share everything	2017-08-04 16:07:25 +09:00
Dean Herbert	7e89b1021d	FirstOrDefault	2017-08-04 15:58:59 +09:00
Dean Herbert	104c25266d	Add missing licence headers	2017-08-04 15:48:42 +09:00
Dean Herbert	e6ef50c4e4	Update framework	2017-08-04 15:40:28 +09:00
Dean Herbert	f8448b8b19	Update to support new framework VisualTests structure	2017-08-04 15:37:31 +09:00
Huo Yaoyuan	62b3540fd6	Merge branch 'master' into fixes	2017-08-04 13:49:03 +08:00
Huo Yaoyuan	eb9972581e	Provide Autoplay mod in Ruleset.	2017-08-04 00:25:24 +08:00
Huo Yaoyuan	44fd0eb78b	Pass input state in OnSelected.	2017-08-04 00:09:41 +08:00
smoogipooo	ba31bfcdf1	CI fixes.	2017-08-03 20:44:05 +09:30
smoogipooo	351d255355	Fix brokenness due to relative sizes.	2017-08-03 20:12:31 +09:30
smoogipooo	0a4464bbe8	Merge remote-tracking branch 'origin/master' into taiko-fixes ... # Conflicts: # osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs	2017-08-03 20:02:19 +09:30