1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 06:07:25 +08:00
Commit Graph

366 Commits

Author SHA1 Message Date
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +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
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
smoogipoo
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
smoogipoo
bc3fcb87b7 Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
Dan Balasescu
e83f6707bf
Merge branch 'master' into editor-keyboard-seek 2018-11-30 15:17:06 +09:00
Dean Herbert
ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
Dean Herbert
0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
smoogipoo
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +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
Dan Balasescu
b446a73c0c
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
Dean Herbert
10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
Dean Herbert
a48c26d999 Fix precision scroll events being handled incorrectly by editor 2018-11-22 19:40:44 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
smoogipoo
4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
smoogipoo
df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
smoogipoo
c963fc7cd2 Reduce chaining 2018-11-14 18:34:13 +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
5d51719572 Make selection blueprints handle position adjustments 2018-11-07 16:21:32 +09:00
smoogipoo
e9e50f41fb Use Name/NameScreen format 2018-11-07 13:04:17 +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
smoogipoo
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
smoogipoo
ad2836a61e MaskSelection -> SelectionBox 2018-11-06 17:52:47 +09:00
smoogipoo
65bb91dcf7 Merge MaskContainer into BlueprintContainer 2018-11-06 17:51:26 +09:00
smoogipoo
26c9390c16 HitObjectMaskLayer -> BlueprintContainer 2018-11-06 17:36:10 +09:00
smoogipoo
faab744cbd DragLayer -> DragBox 2018-11-06 17:24:57 +09:00
smoogipoo
171700cb91 Debounce editor summary timeline seeks 2018-11-05 15:59:40 +09:00
Dean Herbert
0a0023920f Fix not being able to drag control points mid-snake 2018-11-02 04:09:33 +09:00
Dean Herbert
5eaf80ab76 Add missing newline 2018-10-31 12:07:06 +09:00
smoogipoo
72d48aa7f5 Add xmldocs to IPlacementHandler 2018-10-18 16:46:30 +09:00