1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 00:43:21 +08:00
Commit Graph

961 Commits

Author SHA1 Message Date
smoogipoo
e319a760b8 Add mania difficulty calculator test 2019-02-15 16:25:44 +09:00
HoLLy
ae9d5f999c Use correct DifficultyAttributes where possible 2019-02-06 21:28:42 +01:00
Dean Herbert
2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00
Dean Herbert
f4729d41f3 Merge branch 'master' into samah-ios 2019-01-25 18:49:08 +09:00
Dean Herbert
67331039ef
Don't use TransferValueOnCommit 2019-01-25 12:53:30 +09:00
Dean Herbert
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
Unknown
01ab371c87 add "Scroll speed" to ManiaSettingsSubsection 2019-01-24 17:39:23 +01:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
8160162cde Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-01-21 20:58:17 +09:00
Shane Woolcock
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Kyle Chang
bd6c845fc8 Use IApplicableToBeatmap for mirror and random mania mods 2019-01-15 22:51:52 -05:00
Shane Woolcock
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
aec3753863 Fix imported replays having excess statistics 2019-01-03 14:01:20 +09:00
Shane Woolcock
32ffcb9865 Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
a83bee9461 Add ruleset visual tests 2018-12-29 20:05:37 +10:30
smoogipoo
b64932f6db Implement hit windows 2018-12-27 22:39:15 +09:00
Ivan Pavluk
cb2444e01c Remove Meh from TaikoHitWindows 2018-12-06 19:04:54 +07:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert
a1666fb7fa MouseDownPosition -> DragPosition 2018-11-30 14:21:20 +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
085acf29a0 Fix blueprints behaving incorrectly 2018-11-29 19:29:36 +09:00
Dean Herbert
ab0ce46362 Make hold note placement blueprints look a bit more blueprint-y 2018-11-29 18:13:15 +09:00
Dean Herbert
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
Dean Herbert
8fd04cb47b Fix mania placement blueprints appearing outside valid stage placement area 2018-11-29 13:20:37 +09:00
smoogipoo
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
Dean Herbert
4cfeb1b9a1
Merge branch 'master' into note-placement 2018-11-26 14:35:31 +09:00
Dean Herbert
c944e8bb29
Merge branch 'master' into fix-deletion-crash 2018-11-26 14:20:02 +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
5d6a438f98 Make selected mania hitobjects always alive 2018-11-26 11:34:25 +09:00
smoogipoo
91aa00b0e9 Add helper method to get column by position 2018-11-26 10:54:54 +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
dc8cd51e15 Implement mania note deletion 2018-11-20 17:26:00 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dan Balasescu
8cee4141e8
Merge branch 'master' into note-placement 2018-11-19 19:08:53 +09:00
smoogipoo
2ee56e4a78 Add a body piece 2018-11-19 18:59:05 +09:00