1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:22:59 +08:00
Commit Graph

1298 Commits

Author SHA1 Message Date
Dean Herbert
d379d02761 Remove unnecessary base class 2018-12-07 20:12:56 +09:00
Ivan Pavluk
cb2444e01c Remove Meh from TaikoHitWindows 2018-12-06 19:04:54 +07:00
WebFreak001
3cb91979bd Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 2018-12-06 12:14:48 +01:00
Ivan Pavluk
1b6658f4ee Move HealthIncreaseFor to Judgement 2018-12-06 15:09:42 +07:00
smoogipoo
9fdd48ded2 Add 1ms offset to controlpoint lookup times 2018-12-04 12:08:46 +09:00
Roman Kapustin
c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
smoogipoo
eb88768bd0 Fix incorrect controlpoint being applied to samples 2018-12-03 17:21:27 +09:00
Dean Herbert
f9fb6dc39b Remove health from ScoreInfo 2018-12-01 00:17:05 +09:00
Dean Herbert
af3ef9a089 Fix some data types on ScoreInfo 2018-11-30 20:43:38 +09:00
Dean Herbert
9718e476c7 Add license header 2018-11-30 18:07:15 +09:00
Dean Herbert
be37f3c328 Rename NoModMod 2018-11-30 17:35:13 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
e82ad3539b Move JsonIgnore specification to interface 2018-11-30 16:39:25 +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
smoogipoo
69370c53ca Fix rank not being read 2018-11-30 14:48:25 +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
7ffc597a8e Fix one-frame issues 2018-11-29 14:55:20 +09:00
Dean Herbert
3d46ac7d35 Remove unnecessary high frequency input 2018-11-29 13:21:11 +09:00
Dean Herbert
86a0f8d2a9
Merge branch 'master' into note-placement 2018-11-29 13:06:11 +09:00
smoogipoo
aea84f737b Fix taiko hitobjects potentially disappearing before being judged 2018-11-29 12:12:29 +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
ea52d2d527 Make Mod IJsonSerializable 2018-11-28 13:12:29 +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
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
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +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
smoogipoo
d5b937f88f Fix post-merge issue 2018-11-19 19:17:03 +09:00
Dan Balasescu
8cee4141e8
Merge branch 'master' into note-placement 2018-11-19 19:08:53 +09:00
smoogipoo
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
smoogipoo
595e2ffbff Unbind event when column changes 2018-11-19 16:20:21 +09:00
smoogipoo
4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
smoogipoo
df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
smoogipoo
d5464702fa Fix post-merge issue 2018-11-15 20:56:34 +09:00
smoogipoo
eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
smoogipoo
4b86c29f7b Merge remote-tracking branch 'origin/master' into placement-hiding 2018-11-14 18:34:45 +09:00
smoogipoo
c963fc7cd2 Reduce chaining 2018-11-14 18:34:13 +09:00
Dean Herbert
4dec2d1db0 Merge remote-tracking branch 'upstream/master' into note-placement 2018-11-14 18:29:31 +09:00
Dean Herbert
84d16ee71b
Merge branch 'master' into placement-hiding 2018-11-14 16:59:41 +09:00
Dean Herbert
2ae139d260
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:54:53 +09:00
Dean Herbert
34973a3e9f
Merge branch 'master' into scrollalgorithm-timeat 2018-11-14 13:32:16 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
Dean Herbert
3caf0cb0d9
Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
smoogipoo
6d43baf4bf Make show/hide only invoked once each 2018-11-13 13:12:11 +09:00
smoogipoo
fbc20d2d4d Hide placement when cursor is not in the playfield 2018-11-13 12:52:04 +09:00
smoogipoo
3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
smoogipoo
a0c75a0597 Merge branch 'notepieces' into note-placement 2018-11-12 17:59:54 +09:00
smoogipoo
9e1b54f1ef Merge branch 'more-global-scrollalgo' into note-placement 2018-11-12 17:47:02 +09:00
smoogipoo
b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
54668a0dec Simplify construction of ScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
48486895ba Remove unused code 2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
smoogipoo
f3ba429701 Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
smoogipoo
f4fd6189f8 Implement IEquatable 2018-11-12 16:53:30 +09:00
smoogipoo
0220ed21b0 Ignore distance for json serialisation 2018-11-12 16:38:49 +09:00
smoogipoo
0e92b385f0 Define default json deserialisation constructor 2018-11-12 16:38:33 +09:00
smoogipoo
8ad9b6a02a Safety for default(SliderPath) 2018-11-12 16:38:14 +09:00
smoogipoo
d594ce3530 Revert "Make SliderPath.ControlPoints read-only"
This reverts commit 3b88d94793.

# Conflicts:
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 16:20:38 +09:00
smoogipoo
77d16aa968 Add xmldocs 2018-11-12 14:16:21 +09:00
smoogipoo
4eef1134a6 Re-order file 2018-11-12 14:08:36 +09:00
smoogipoo
3aba462e52 Make Path.Distance a property again 2018-11-12 14:07:48 +09:00
smoogipoo
3b88d94793 Make SliderPath.ControlPoints read-only 2018-11-12 14:03:54 +09:00
smoogipoo
54ab256c8e Instantiate a new path rather than setting properties on it
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
jorolf
023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
Dean Herbert
4783df1d4b Fix compose mode not working 2018-11-09 11:36:06 +09:00
Dean Herbert
27549586e6
Merge branch 'master' into manual-position-adjustments 2018-11-09 10:53:41 +09:00
smoogipoo
33056b8098 Adjust namespaces 2018-11-08 14:04:21 +09:00
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo
2f87f267a3 Fix height being set instead of width 2018-11-08 14:04:20 +09:00
smoogipoo
195f82fa96 Give visualiser methods range+length params again 2018-11-08 14:04:20 +09:00
smoogipoo
f41bfd14ca Add some xmldocs 2018-11-08 14:04:20 +09:00
smoogipoo
76ea314c27 Reorder params 2018-11-08 14:04:20 +09:00
smoogipoo
589c3a47e2 Remove state computation + updates from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
smoogipoo
0bdeebbce2 Expose basic values from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
smoogipoo
c6350c6efd Remove IHasEditablePosition 2018-11-08 13:03:11 +09:00
smoogipoo
5d51719572 Make selection blueprints handle position adjustments 2018-11-07 16:21:32 +09:00
smoogipoo
cf4dad0fe8 Fix hitobjects not updating IsMaskedAway after being judged 2018-11-07 15:42:40 +09:00
smoogipoo
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
smoogipoo
ac25718c5a Renamespace compose-mode components 2018-11-06 18:14:46 +09:00
smoogipoo
27d82052f4 BorderLayer -> EditorPlayfieldBorder 2018-11-06 18:10:46 +09:00
smoogipoo
85f96ad62f Fix a few missed renames 2018-11-06 18:07:53 +09:00
smoogipoo
bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
smoogipoo
11be820efe CreateMaskFor -> CreateBlueprintFor 2018-11-06 18:03:21 +09:00
smoogipoo
90c813618a Merge PlacementContainer into BlueprintContainer 2018-11-06 18:02:55 +09:00