1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:17:24 +08:00
Commit Graph

100 Commits

Author SHA1 Message Date
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
smoogipoo
b47ced8c58 Fix failing test 2019-02-18 15:01:14 +09:00
smoogipoo
68725dc005 Implement new difficulty calculator for Rulesets.Mania 2019-02-18 15:00:20 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
smoogipoo
e319a760b8 Add mania difficulty calculator test 2019-02-15 16:25:44 +09:00
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