Dean Herbert
|
970ea928ae
|
Fix hold for menu button occasionally disappearing
|
2018-11-19 12:06:47 +09:00 |
|
Roman Kapustin
|
ecf8a89f26
|
Set AccentColour and GlowColour in StandardHealthDisplay
|
2018-11-16 19:30:58 +03:00 |
|
smoogipoo
|
4cbda97b1e
|
Move positional adjustment to SelectionBox
|
2018-11-16 17:12:24 +09:00 |
|
Roman Kapustin
|
37b19f78ae
|
Set AccentColour in concrete counters
|
2018-11-15 23:37:21 +03:00 |
|
smoogipoo
|
df7515b66f
|
Pass all selected hitobjects to the selection blueprints
|
2018-11-15 21:01:09 +09:00 |
|
Dan Balasescu
|
e8f34ddff0
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-11-15 15:16:10 +09:00 |
|
Dean Herbert
|
30547ac064
|
Merge remote-tracking branch 'upstream/master' into dropdown-updates
|
2018-11-14 20:03:45 +09:00 |
|
Dan Balasescu
|
81a3170e3b
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 19:13:07 +09:00 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
Dan Balasescu
|
e9b47c6233
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:22:34 +09:00 |
|
smoogipoo
|
aff5fa6169
|
Update with osu!-side dropdown changes
|
2018-11-14 18:02:38 +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 |
|
Dean Herbert
|
7f73fc2d39
|
Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
|
2018-11-07 01:49:21 +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
|
d7f3e51050
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 15:00:38 +09:00 |
|
Kyle Chang
|
214ed43b81
|
Check if SongSelect is current screen before playing selected song
|
2018-10-30 23:47:54 -04:00 |
|
Dean Herbert
|
5eaf80ab76
|
Add missing newline
|
2018-10-31 12:07:06 +09:00 |
|
Dean Herbert
|
b28c0cd128
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 06:46:48 +09:00 |
|
Dean Herbert
|
5f5e30c378
|
Merge branch 'master' into mask-separation
|
2018-10-31 05:59:07 +09:00 |
|
Dean Herbert
|
6f1ef3243d
|
Proportionally adjust width in line with change
|
2018-10-31 02:56:25 +09:00 |
|
Dean Herbert
|
4502fa39e9
|
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
|
2018-10-31 02:55:38 +09:00 |
|
Paul Teng
|
4bc9161cd1
|
Leave bigger gap if replaying
|
2018-10-30 08:32:12 -04:00 |
|
smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
smoogipoo
|
619a0dfd59
|
Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-29 15:24:15 +09:00 |
|
Kyle Chang
|
c7e950af7f
|
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
|
2018-10-29 00:04:51 -04:00 |
|
Kyle Chang
|
886dd0f0d4
|
Remove unneeded using directive
|
2018-10-28 13:21:12 -04:00 |
|
Kyle Chang
|
2b736c3cd6
|
Make beatmap edit button reload beatmap without mods
|
2018-10-28 13:04:45 -04:00 |
|
Kyle Chang
|
f8a8c7cb6b
|
Stop transferring track when editing
|
2018-10-28 12:43:19 -04:00 |
|
HoLLy
|
cf3b4447eb
|
Fade only textContainer instead of entire MetadataSection
|
2018-10-26 13:35:51 +02:00 |
|
smoogipoo
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|
HoLLy
|
88aca46500
|
Fade MetadataSection back in if non-null Text is set
|
2018-10-24 18:53:22 +02:00 |
|
Paul Teng
|
b351aae93f
|
Reduce height of song progress handle
|
2018-10-18 07:02:18 -04:00 |
|
smoogipoo
|
72d48aa7f5
|
Add xmldocs to IPlacementHandler
|
2018-10-18 16:46:30 +09:00 |
|
smoogipoo
|
0e841628b6
|
Implement hitobject deletion
|
2018-10-18 16:36:06 +09:00 |
|
smoogipoo
|
969477dadd
|
Remove placement events, make everything pass top-down
|
2018-10-17 17:43:16 +09:00 |
|
smoogipoo
|
62635c5ab8
|
Add container to handle placement mask
|
2018-10-17 16:17:49 +09:00 |
|
smoogipoo
|
4ea4ec0d25
|
Move placement handling events to a higher level
|
2018-10-17 15:46:30 +09:00 |
|
smoogipoo
|
70f1d17b7e
|
Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2018-10-16 17:28:16 +09:00 |
|
Dean Herbert
|
eaa5ef5168
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-10-12 22:14:23 +09:00 |
|
Dean Herbert
|
2babdc079c
|
Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
|
2018-10-10 20:14:58 +09:00 |
|
Dean Herbert
|
d28b9860ff
|
Don't use "beatmapset" terminology
|
2018-10-10 19:26:35 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
Dean Herbert
|
3be50c2941
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-10-09 18:02:36 +09:00 |
|
smoogipoo
|
6d24bde72b
|
Fix beatmap details not displaying
|
2018-10-09 17:39:27 +09:00 |
|
smoogipoo
|
934b687965
|
Fix selection masks not being added for new objects
|
2018-10-03 16:49:59 +09:00 |
|
smoogipoo
|
4cdb6dcea5
|
Rename HitObjectMask -> SelectionMask
|
2018-10-03 13:28:00 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +09:00 |
|
ekrctb
|
b7a2ad1aa5
|
Use UIEvent level getters for modifier keys.
|
2018-10-02 13:26:36 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
Dean Herbert
|
6841d5c2ec
|
Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework
|
2018-09-28 18:32:59 +09:00 |
|
Roman Kapustin
|
baf9e028c3
|
Fix possible idleTracker nullref
|
2018-09-26 19:44:01 +03:00 |
|
Dean Herbert
|
a4bf21268b
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-26 19:59:18 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Roman Kapustin
|
bdba22a576
|
Override Handle(UIEvent e) in IdleTracker
|
2018-09-25 20:11:10 +03:00 |
|
Roman Kapustin
|
c7b3fa51d5
|
Inject IdleTracker into ButtonSystem
|
2018-09-25 19:58:50 +03:00 |
|
UselessToucan
|
3c0b77658c
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-09-25 19:48:38 +03:00 |
|
smoogipoo
|
cb500e80e4
|
Make BeatmapInfoWedge present until info is not null
|
2018-09-25 14:45:26 +09:00 |
|
Roman Kapustin
|
5c741eaa89
|
Fix possible game nullref
|
2018-09-21 17:07:46 +03:00 |
|
Paul Teng
|
ed0ea3ad41
|
Merge branch 'master' into patch-1
|
2018-09-21 06:31:15 -04:00 |
|
smoogipoo
|
4380ef15bf
|
Fix potential exception during async load callback
|
2018-09-21 16:31:09 +09:00 |
|
Paul Teng
|
654345f380
|
Remove duplicate condition test
|
2018-09-20 22:32:24 -04:00 |
|
Paul Teng
|
1644719893
|
Update SongSelect.cs
|
2018-09-20 22:29:37 -04:00 |
|
Paul Teng
|
49fbe8443a
|
Test if there are beatmaps when click on delete btn
|
2018-09-20 22:00:20 -04:00 |
|
Dean Herbert
|
83bf38f4bc
|
Make menu background blurrable
Not actually blurring yet, needs further testing.
|
2018-09-21 03:13:34 +09:00 |
|
Dean Herbert
|
78d78b5510
|
Fade menu background a bit when menu is active
|
2018-09-21 03:13:15 +09:00 |
|
Dean Herbert
|
07a1c39fe5
|
Use random default background on starting the game
|
2018-09-21 03:12:20 +09:00 |
|
Dean Herbert
|
37f3035437
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-20 18:39:48 +09:00 |
|
smoogipoo
|
62135c39aa
|
Cleanup
|
2018-09-20 12:56:39 +09:00 |
|
smoogipoo
|
7b8094d731
|
Move text size/padding out of constructor
|
2018-09-20 12:53:45 +09:00 |
|
Dean Herbert
|
ae4c371bec
|
Merge branch 'update-framework-event-handling' into update-framework
|
2018-09-20 00:29:42 +09:00 |
|
Dean Herbert
|
b2cf636ab5
|
Merge branch 'localisation-changes' into update-framework
|
2018-09-20 00:29:31 +09:00 |
|
smoogipoo
|
38a3c2a820
|
Fix song select wedge sometimes not updating when localisation changes
|
2018-09-19 14:57:32 +09:00 |
|
smoogipoo
|
28f31540c4
|
Apply changes in-line with framework localisation changes
|
2018-09-19 14:07:46 +09:00 |
|
ekrctb
|
b790e16217
|
Use Click instead of now removed TriggerOnClick
|
2018-09-19 11:42:32 +09:00 |
|
ekrctb
|
a3e6973b41
|
Replace usage of now removed TriggerKeyPress and similar methods.
|
2018-09-19 11:36:55 +09:00 |
|
Dan Balasescu
|
d3bb78d139
|
Merge branch 'master' into add-rank-status
|
2018-09-18 14:10:42 +09:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
Dean Herbert
|
41be757a11
|
Merge branch 'master' into fix-logo-overhead
|
2018-09-15 18:33:22 +09:00 |
|
Dean Herbert
|
79b56cb35c
|
Make saveState private
|
2018-09-15 16:34:08 +09:00 |
|
Dean Herbert
|
65b2bceef2
|
Simplify implementation
|
2018-09-15 14:51:04 +09:00 |
|
Dean Herbert
|
1662575f88
|
Merge branch 'master' into replay_keycounter
|
2018-09-14 19:08:54 +09:00 |
|
Unknown
|
04853b8c83
|
don't show StatusPill without a difficulty
|
2018-09-13 13:49:57 +02:00 |
|
Unknown
|
5414ce9932
|
add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet
|
2018-09-13 10:18:20 +02:00 |
|