Commit Graph

39 Commits

Author SHA1 Message Date
Dan Balasescu 9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
Dean Herbert fd34b36e1a Add fruit drawable testcase 2018-01-03 16:32:09 +09:00
Dean Herbert 2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
smoogipoo 5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
FreezyLemon 4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
Dean Herbert 912d5edcf6
Merge branch 'master' into catch-hyperdash 2017-12-01 20:16:37 +09:00
Dean Herbert 79e1bf3394 Remove unused testcase 2017-12-01 20:14:42 +09:00
Dean Herbert 76a1c7db3b Hyperdash preparation 2017-12-01 13:10:51 +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 b517523f4a Add back CatcherArea to simplify layout 2017-11-28 18:39:45 +09:00
Dean Herbert 8f3fd7092e CatchBaseHit -> CatchHitObject
Also moves default scale to CatchHitObject.
2017-11-28 18:37:41 +09:00
smoogipoo 38fe95d94a Add basic display for pp in TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
Dean Herbert bbc5c05055 Disable ruleset-level tests for now 2017-10-23 21:25:54 +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
Dean Herbert 0b282a49bd Add tiny droplet support 2017-10-11 20:11:29 +09:00
Dean Herbert 03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
Dean Herbert 26215b4488 Create an abstract base class for drawable catch objects 2017-10-09 19:42:55 +09:00
Dean Herbert 7168629b2a Remove CatcherArea abstraction
Also fixes catcher size being relative to aspect ratio.
2017-10-02 21:55:37 +08:00
Dean Herbert e0911f014e Fix ruleset target path for release builds 2017-09-19 22:50:36 +09:00
Dean Herbert f96875a470 Add a catch specific player test 2017-09-19 21:40:57 +09:00
Dean Herbert d192c2d83b Merge remote-tracking branch 'upstream/master' into ctb-improvements 2017-09-19 20:54:39 +09:00
Dean Herbert 99b512cce5 Output ruleset assemblies to the game folder rather than adding special logic 2017-09-19 19:27:14 +09:00
Dean Herbert 1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
Dean Herbert 8fa76557db Avoid unnecessary dll copies 2017-09-19 16:06:59 +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
Dean Herbert 4e0aed4b8a Add combo/colour metadata to CatchBaseHit 2017-09-15 20:54:34 +09:00
Dean Herbert fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Dean Herbert 7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
Dean Herbert 3b48a6c668 Fix CI issues 2017-08-09 15:15:41 +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
Dean Herbert b71caca131 Expand abilities of catcher 2017-08-07 15:09:31 +09:00
Dean Herbert 81b738f68c Add basic Catcher 2017-08-07 11:05:54 +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
Dean Herbert fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00