RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,188 Commits 3 Branches 658 Tags 385 MiB
Commit Graph

91 Commits

Author SHA1 Message Date
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Dean Herbert e26958f901 Fix targeting netcoreapp2.1 in many places 2018-12-21 10:24:32 +09:00
Dean Herbert dbc33c45a6 Update nuget packages 2018-12-06 00:14:21 +09:00
Dean Herbert 68745b221e Update projects to target .NET core 2.2 2018-12-05 19:46:07 +09:00
Dean Herbert 5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
Dean Herbert 132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert bfebed053d
Merge branch 'master' into note-placement 2018-11-26 14:19:46 +09:00
smoogipoo 60ffad169f Fix post-merge errors 2018-11-26 11:47:48 +09:00
smoogipoo c0fcbc283e Merge branch 'note-placement' into inter-column-movements 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
 2018-11-26 11:47:22 +09:00
smoogipoo 56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
 2018-11-26 11:45:48 +09:00
smoogipoo 4ba3fa4ab6 osuTK 2018-11-26 10:44:48 +09:00
Dean Herbert 1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
Dean Herbert 7de85659ba Merge branch 'master' into mania-selection-movement 2018-11-21 20:00:46 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo c84f49addf Add testcase 2018-11-19 19:02:59 +09:00
smoogipoo f7fc2ca569 Basic inter-column selection movement 2018-11-15 21:37:22 +09:00
smoogipoo eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09:00
Dean Herbert 4dec2d1db0 Merge remote-tracking branch 'upstream/master' into note-placement 2018-11-14 18:29:31 +09:00
smoogipoo a9a33b1fcb Implement mania selection movements 2018-11-13 16:42:40 +09:00
smoogipoo 3d8ef97e81 Add testcase 2018-11-12 19:41:06 +09:00
smoogipoo 3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
smoogipoo 2e0e1befe9 Add selection mask testcases 
# Conflicts:
#	osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
 2018-11-12 17:40:09 +09:00
smoogipoo 10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo 9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
Dean Herbert 4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +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 dc78049839 Add test for propagation of direction through mania stack 2018-08-08 12:21:44 +09:00
smoogipoo 31146fbc01 Add anchor/origin tests 2018-08-08 11:28:55 +09:00
smoogipoo 6379c70a68 Add some ticks 2018-08-08 11:28:44 +09:00
Dean Herbert 6ee06602b8
Merge branch 'master' into mania-mask-container 2018-08-02 20:41:27 +09:00
Dean Herbert 21a19dc552 Remove remaining references to net471 2018-08-01 22:07:39 +09:00
Dean Herbert 6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert 338496452d Move testing package references to somewhere appveyor will find them 2018-07-30 15:15:51 +09:00
Dean Herbert 3cf906042e
Merge branch 'master' into remove-net471-target 2018-07-30 11:28:06 +09:00
Dean Herbert da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00
smoogipoo be297ddf76 Fix direction reversal not quite working correctly 2018-07-19 19:30:20 +09:00
Dean Herbert fb09385f51 Remove net471 targeting 2018-07-18 11:01:08 +09:00
smoogipoo 6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container 
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
 2018-07-17 16:46:48 +09:00
smoogipoo 827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container 
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
 2018-07-17 13:13:57 +09:00
Dean Herbert fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dan Balasescu 290812cf65
Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
smoogipoo 45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
smoogipoo f007e71c87 Retrieve the mania key action through DI 2018-07-02 12:31:41 +09:00
smoogipoo de3708ea3a Public + explicitly define test fixtures 2018-06-27 12:09:39 +09:00
smoogipoo 97057ced85 Merge remote-tracking branch 'origin/master' into full-mania-fix 2018-06-25 12:43:49 +09:00
smoogipoo 6cd9a22e26 Update testcase 2018-06-19 13:52:24 +09:00