Dean Herbert
|
b1fd7da824
|
Merge branch 'master' into editor-position-snap
|
2020-05-21 15:47:20 +09:00 |
|
Dean Herbert
|
ce223a2bd8
|
Silence hit sounds while seeking
|
2020-05-21 11:08:06 +09:00 |
|
smoogipoo
|
acba1f3ad6
|
Integrate score panel list into results screen
|
2020-05-20 23:46:54 +09:00 |
|
smoogipoo
|
1b8d657ead
|
Implement score panel list
|
2020-05-20 23:46:47 +09:00 |
|
Dean Herbert
|
82d6549161
|
Pass down snap result and remove local TimeAt usage
|
2020-05-20 21:01:29 +09:00 |
|
Dean Herbert
|
23bf0d000e
|
Implement mania beat snapping support
|
2020-05-20 21:01:19 +09:00 |
|
Dean Herbert
|
ffb8d48fc3
|
Fix osu!mania editor placement regressions
|
2020-05-20 21:01:03 +09:00 |
|
Dean Herbert
|
c46bfc2532
|
Create SnapResult class to hold various snapping results
|
2020-05-20 21:00:47 +09:00 |
|
Dean Herbert
|
3354d48a38
|
Change snapping to be screen space coordinate based
|
2020-05-20 21:00:29 +09:00 |
|
smoogipoo
|
e5de382760
|
Merge branch 'master' into storyboard-overlay-layer
|
2020-05-20 15:08:45 +09:00 |
|
smoogipoo
|
85088c9b3b
|
Privatise setter
|
2020-05-20 15:08:33 +09:00 |
|
Bartłomiej Dach
|
ce4301c5b8
|
Add overlay layer to player by proxying
|
2020-05-19 19:47:50 +02:00 |
|
Dan Balasescu
|
a075529f93
|
Merge branch 'master' into fix-outwards-event-bindings
|
2020-05-20 00:07:30 +09:00 |
|
Dean Herbert
|
eee8af28f6
|
Merge pull request #9018 from Game4all/allowgameplayoverlays-hide-skip
Allow disabling SkipOverlay through AllowGameplayOverlays.
|
2020-05-19 19:22:51 +09:00 |
|
Dean Herbert
|
052ad79fc6
|
Convert dangerous events to IBindables
|
2020-05-19 16:44:22 +09:00 |
|
smoogipoo
|
3ee698cfa0
|
Fix being able to press enter to create matches
|
2020-05-19 12:39:09 +09:00 |
|
smoogipoo
|
6d70f4b410
|
Merge branch 'master' into allowgameplayoverlays-hide-skip
|
2020-05-18 19:54:38 +09:00 |
|
smoogipoo
|
49ee05c3c4
|
Make into CompositeDrawable
|
2020-05-18 19:37:49 +09:00 |
|
smoogipoo
|
e3c1112b5a
|
Initial integration into results screen
|
2020-05-16 19:00:20 +09:00 |
|
smoogipoo
|
8c5ccf574b
|
Add better fix for 1px bleed
|
2020-05-16 18:33:21 +09:00 |
|
smoogipoo
|
2bde4fc3ee
|
Initial implementation of contracted score panel
|
2020-05-16 18:20:19 +09:00 |
|
Lucas A
|
4096463d02
|
Move SkipOverlay internal alpha manipulation to a nested container and adjust visual tests.
|
2020-05-15 19:43:01 +02:00 |
|
Dean Herbert
|
9b6525bb03
|
Fix applied platform/user offsets being incorrect when rate adjust mods are active
|
2020-05-15 18:44:47 +09:00 |
|
Lucas A
|
7874045b1f
|
Allow disabling SkipOverlay through AllowGameplayOverlays.
|
2020-05-12 23:05:56 +02:00 |
|
Dean Herbert
|
de50b725d5
|
Fix mod failure checks executing actual game logic
|
2020-05-12 20:08:35 +09:00 |
|
Dean Herbert
|
a5c1b461f6
|
Fix null reference in difficulty recommender
|
2020-05-12 11:14:51 +09:00 |
|
Dan Balasescu
|
6841bd5609
|
Merge branch 'master' into taiko-scroller
|
2020-05-11 11:10:55 +09:00 |
|
Bartłomiej Dach
|
ee2ff77b89
|
Merge branch 'master' into fix-draining-in-between-break-sections
|
2020-05-10 17:57:44 +02:00 |
|
Dean Herbert
|
c712e98f2b
|
Merge branch 'master' into publicly-expose-hud
|
2020-05-10 20:06:28 +09:00 |
|
Dean Herbert
|
9b8589583c
|
Merge branch 'master' into taiko-scroller
|
2020-05-08 19:10:39 +09:00 |
|
smoogipoo
|
dcfef6b443
|
Add clear method to EditorBeatmap
|
2020-05-08 18:46:37 +09:00 |
|
Lucas A
|
30dd158c33
|
Rename property to AllowGameplayOverlays and update XMLDoc accordingly.
|
2020-05-08 09:37:50 +02:00 |
|
Lucas A
|
83be5455d3
|
Disable the display of HUD through DisplayHud property.
|
2020-05-07 08:52:36 +02:00 |
|
smoogipoo
|
401c516503
|
Expose searchable terms from beatmap info instead
|
2020-05-07 13:04:08 +09:00 |
|
smoogipoo
|
5186da8412
|
Fix potential song select nullref
|
2020-05-07 11:37:04 +09:00 |
|
Lucas A
|
aff74db80d
|
Publicly expose HUDOverlay in Player.
|
2020-05-05 10:40:10 +02:00 |
|
Dan Balasescu
|
0eae8d078b
|
Merge branch 'master' into master
|
2020-05-05 13:33:29 +09:00 |
|
alex
|
0e2ccac33b
|
Add spaces to comments
|
2020-05-04 18:36:24 -07:00 |
|
alex
|
c987af988c
|
Fix typo
|
2020-05-04 18:26:12 -07:00 |
|
Dean Herbert
|
06f58dd3e3
|
Ensure correct beatmap and ruleset when presenting a score from song select
|
2020-05-04 15:20:43 +09:00 |
|
Dan Balasescu
|
5767bcb8d7
|
Merge branch 'master' into add-interval-list
|
2020-05-04 02:00:14 +09:00 |
|
Dean Herbert
|
cea6be5e52
|
Expose as JudgementResult instead of "passing" state
|
2020-05-03 23:55:44 +09:00 |
|
Bartłomiej Dach
|
8118747732
|
Make PeriodTracker actually immutable
|
2020-05-02 01:33:33 +02:00 |
|
Dean Herbert
|
ff1d63060d
|
Add and consume passing state in GameplayBeatmap
|
2020-05-01 20:08:18 +09:00 |
|
Joehu
|
700214d249
|
Truncate beatmap title and artist on score panel
|
2020-04-30 22:13:38 -07:00 |
|
Dean Herbert
|
d470e092a3
|
Merge branch 'master' into fix-overlapping-object-undoredo
|
2020-05-01 10:45:29 +09:00 |
|
Dan Balasescu
|
5740563391
|
Merge pull request #8903 from peppy/carousel-loading-spinner
Show loading spinner when carousel is not ready to be displayed
|
2020-04-30 21:29:53 +09:00 |
|
Dean Herbert
|
53474c74ee
|
Merge pull request #8913 from smoogipoo/fix-mania-undo-redo-crash
Fix mania crashing on undo/redo
|
2020-04-30 21:03:38 +09:00 |
|
Dean Herbert
|
000c34dc26
|
Move recommender to field construction
|
2020-04-30 21:01:53 +09:00 |
|
smoogipoo
|
c96bc5c51c
|
Fix undo/redo behaving poorly with simultaneous objects
|
2020-04-30 20:39:41 +09:00 |
|
smoogipoo
|
9bec42bc7e
|
Fix mania crashing on undo/redo
|
2020-04-30 20:03:46 +09:00 |
|
Dean Herbert
|
21c6ac8c43
|
Allow closing the game during intro
|
2020-04-30 12:12:28 +09:00 |
|
Dean Herbert
|
cf4e79cf38
|
Show loading spinner when carousel is not ready to be displayed
|
2020-04-30 11:51:06 +09:00 |
|
Dean Herbert
|
064e5004ed
|
Merge branch 'master' into fix-mania-selection
|
2020-04-29 17:15:48 +09:00 |
|
Salman Ahmed
|
6fa9feb15c
|
Merge remote-tracking branch 'upstream/master' into add-interval-list
|
2020-04-29 05:14:40 +03:00 |
|
Salman Ahmed
|
6e76e5900a
|
Rename is-in-any check method to a more legible name
|
2020-04-29 05:11:44 +03:00 |
|
Salman Ahmed
|
8d899f4e77
|
Apply changes to the BreakTracker and more adjustment
|
2020-04-29 05:11:43 +03:00 |
|
Dean Herbert
|
cd22e5883d
|
Merge pull request #8883 from peppy/dont-use-internal-ef-linq
Avoid using internal EF methods in tests
|
2020-04-29 09:54:06 +09:00 |
|
Dean Herbert
|
119000f1ab
|
Reduce database includes where possible
|
2020-04-28 21:43:35 +09:00 |
|
Dean Herbert
|
c3a41c8476
|
Also avoid using internal TypeExtensions
|
2020-04-28 17:02:10 +09:00 |
|
smoogipoo
|
cebc0fc046
|
Attempt to fix multiple selection movements
|
2020-04-27 20:35:24 +09:00 |
|
smoogipoo
|
7f5a1d7f44
|
Merge branch 'master' into fix-mania-selection
|
2020-04-27 17:09:40 +09:00 |
|
smoogipoo
|
104c61d622
|
Remove unnecessary scale
|
2020-04-27 11:06:23 +09:00 |
|
Dean Herbert
|
48168dddce
|
Adjust editor timeline current marker to promote tick visibility
|
2020-04-27 10:54:32 +09:00 |
|
Dean Herbert
|
1c13fa6c61
|
Fix editor crashing when entering with no beatmap selected
|
2020-04-24 10:27:32 +09:00 |
|
smoogipoo
|
4ebb28d3e7
|
wip
|
2020-04-23 17:52:54 +09:00 |
|
smoogipoo
|
e1142b424d
|
Fix test failures
|
2020-04-22 18:14:21 +09:00 |
|
smoogipoo
|
9c22d2f1dd
|
Use platform bindings for editor actions
|
2020-04-22 17:41:24 +09:00 |
|
Dean Herbert
|
9b9b710ded
|
Move and rename remaining direct classes
|
2020-04-21 16:41:07 +09:00 |
|
Dean Herbert
|
1cec0575b7
|
Remove unused classes and replace overlay in game
|
2020-04-21 16:38:47 +09:00 |
|
smoogipoo
|
fcfb2b9026
|
Merge branch 'master' into fix-select-new-from-sub-screen
|
2020-04-21 14:36:53 +09:00 |
|
Dean Herbert
|
a91c63819b
|
Refactor updateCompletionState implementation for legibility and code share
|
2020-04-21 11:55:28 +09:00 |
|
Dean Herbert
|
5a2129da7c
|
Merge branch 'master' into allow-cancelling-completion
|
2020-04-21 11:22:37 +09:00 |
|
Dan Balasescu
|
3b3a7bdd85
|
Merge branch 'master' into scroll-to-center
|
2020-04-21 10:21:08 +09:00 |
|
Bartłomiej Dach
|
e3cd3cf1da
|
Convert to auto-properties
|
2020-04-20 21:43:07 +02:00 |
|
Bartłomiej Dach
|
9b6e26583b
|
Add xmldocs
|
2020-04-20 21:42:43 +02:00 |
|
Dean Herbert
|
ee1ccb8bcb
|
Fix in a slightly different and hopefully more understandable way
|
2020-04-20 14:03:55 +09:00 |
|
Salman Ahmed
|
e12e3391fb
|
Base wait steps duration on the delay used for results display
With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.
|
2020-04-20 06:42:33 +03:00 |
|
Endrik Tombak
|
b57d709d15
|
Don't use Parent
|
2020-04-19 18:29:06 +03:00 |
|
Endrik Tombak
|
a8bfd21f3f
|
Merge branch 'master' of https://github.com/ppy/osu into scroll-to-center
|
2020-04-19 18:21:34 +03:00 |
|
Salman Ahmed
|
6d276890a7
|
Fix results screen pushed after rewinding in-between push delay
|
2020-04-19 05:59:56 +03:00 |
|
Salman Ahmed
|
7e64bec94f
|
Use HasCompleted in Player
|
2020-04-19 05:58:22 +03:00 |
|
Salman Ahmed
|
fc6c245de5
|
Replace all judged event logic with HasCompleted bindable
|
2020-04-19 05:36:04 +03:00 |
|
Dean Herbert
|
5833a7ac91
|
Fix presenting new ruleset and beatmap at once causing wedge display desync
|
2020-04-17 18:56:17 +09:00 |
|
Dean Herbert
|
d62094cd4b
|
Fix carousel not correctly updating when selection changes to a new beatmap from a child screen
|
2020-04-16 18:10:35 +09:00 |
|
Dean Herbert
|
5ec8d49241
|
Merge pull request #8764 from smoogipoo/disable-undo-redo
Disable undo/redo menu items when they can't be performed
|
2020-04-16 13:47:23 +09:00 |
|
smoogipoo
|
9e2be6f2f4
|
Remove bindable to promote one-way access
|
2020-04-16 13:25:08 +09:00 |
|
Dean Herbert
|
03a74a4320
|
Apply same conditional check changes to DrawableCarouselBeatmapSet
|
2020-04-16 12:13:26 +09:00 |
|
Dean Herbert
|
91b13f91ea
|
Add exception disallowing potential edit when disabled at a property level
|
2020-04-16 12:11:12 +09:00 |
|
Dean Herbert
|
c4caf38feb
|
Simplify menu item checks (and add for other items)
|
2020-04-16 12:10:20 +09:00 |
|
Joehu
|
e2b28bfe88
|
Hide edit context menu item in multiplayer song select
|
2020-04-15 18:17:12 -07:00 |
|
smoogipoo
|
ce21cfbb03
|
Use bindables in menu items
|
2020-04-15 16:17:34 +09:00 |
|
smoogipoo
|
e8c955ed9b
|
Add CanUndo/CanRedo bindables
|
2020-04-15 16:17:17 +09:00 |
|
smoogipoo
|
f3dbddd75c
|
Update bindings in LoadComplete()
|
2020-04-14 15:52:38 +09:00 |
|
smoogipoo
|
b8b334ca27
|
Always unbind bindings
|
2020-04-14 15:21:56 +09:00 |
|
smoogipoo
|
3183827329
|
Reorder fields
|
2020-04-14 15:09:31 +09:00 |
|
smoogipoo
|
7d2d0785fd
|
Fix potential unsafe ordering of binds
|
2020-04-14 15:07:32 +09:00 |
|
smoogipoo
|
9619fb9f6a
|
Remove bind in Player
|
2020-04-14 15:00:36 +09:00 |
|
Dan Balasescu
|
ac8a3efc46
|
Merge branch 'master' into low-hp-red-layer
|
2020-04-14 14:47:01 +09:00 |
|
Dan Balasescu
|
948e225e12
|
Merge branch 'master' into select-recommended
|
2020-04-14 13:59:03 +09:00 |
|
Endrik Tombak
|
d9c91fb943
|
Merge branch 'master' of https://github.com/ppy/osu into no-video-option
Conflicts:
osu.Game/Overlays/Direct/PanelDownloadButton.cs
|
2020-04-13 17:40:28 +03:00 |
|
Dean Herbert
|
2388799acf
|
Limit upper number of editor beatmap states saved to 50
|
2020-04-13 20:37:46 +09:00 |
|
Dean Herbert
|
0e88c28060
|
Merge branch 'editor-undo-redo' into more-change-state-support
|
2020-04-13 18:07:00 +09:00 |
|
Dean Herbert
|
6aab19413c
|
Rename differ to patcher, add xmldoc
|
2020-04-13 17:20:20 +09:00 |
|
Dean Herbert
|
bb53f96c71
|
Store states as byte[] instead of Streams
|
2020-04-13 17:18:50 +09:00 |
|
Dean Herbert
|
0c60dbe796
|
Merge branch 'master' into editor-undo-redo
|
2020-04-13 16:03:53 +09:00 |
|
Endrik Tombak
|
633b969017
|
Apply review suggestions
|
2020-04-12 21:57:35 +03:00 |
|
Endrik Tombak
|
b475316a4e
|
Simplify and comment
|
2020-04-12 20:40:08 +03:00 |
|
Endrik Tombak
|
63a1686dfb
|
Scroll to screen middle
|
2020-04-12 12:42:52 +03:00 |
|
Endrik Tombak
|
fc1d497a86
|
Change PlaylistDownloadButton default
|
2020-04-11 14:21:28 +03:00 |
|
Dean Herbert
|
73a3f1fe65
|
Remove unnecessary DI
|
2020-04-11 17:30:34 +09:00 |
|
Dean Herbert
|
7aac0e59a8
|
Reduce dictionary lookups
|
2020-04-11 17:13:35 +09:00 |
|
Dean Herbert
|
310cf830d4
|
Simplify api request logic
|
2020-04-11 17:13:35 +09:00 |
|
Dean Herbert
|
abea7b5299
|
Tidy up function passing, naming, ordering etc.
|
2020-04-11 17:13:35 +09:00 |
|
Dean Herbert
|
7f753f6b4d
|
Remove current ruleset from function call
|
2020-04-11 16:43:09 +09:00 |
|
Dean Herbert
|
a843793957
|
Un-nest class
|
2020-04-11 16:41:11 +09:00 |
|
Dean Herbert
|
ff591299e0
|
Merge branch 'master' into select-recommended
|
2020-04-11 16:40:07 +09:00 |
|
smoogipoo
|
4a87ac7840
|
Add support for sample changes
|
2020-04-10 13:53:09 +09:00 |
|
smoogipoo
|
ee7e2b0854
|
Fix editor beatmap potentially not updating hitobjects
|
2020-04-10 13:29:46 +09:00 |
|
Salman Ahmed
|
9a29797a5b
|
Use IntervalList<double> for tracking break periods
|
2020-04-09 23:00:16 +03:00 |
|
Endrik Tombak
|
deaf24f141
|
Fix oversight on null
|
2020-04-09 19:30:40 +03:00 |
|
Endrik Tombak
|
35f97dfc75
|
Style changes
|
2020-04-09 18:59:18 +03:00 |
|
Endrik Tombak
|
f40bdcd34e
|
Initial rewrite, moving API logic to SongSelect
|
2020-04-09 18:47:28 +03:00 |
|
smoogipoo
|
575b061dd7
|
Add change state support to more editor components
|
2020-04-09 22:02:42 +09:00 |
|
smoogipoo
|
2e33d38cd7
|
Merge branch 'master' into editor-undo-redo
|
2020-04-09 22:02:28 +09:00 |
|
Dean Herbert
|
cc0bcea6e5
|
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
|
2020-04-09 21:32:58 +09:00 |
|
smoogipoo
|
14eca3655b
|
Add change state handling to the editor
|
2020-04-09 21:22:07 +09:00 |
|
Dean Herbert
|
a457880eaa
|
Merge pull request #8695 from smoogipoo/fix-timeline-crash
Fix crash when trying to edit long beatmaps
|
2020-04-09 21:05:25 +09:00 |
|
smoogipoo
|
86243d463f
|
Add legacy beatmap diffing
|
2020-04-09 20:48:59 +09:00 |
|
smoogipoo
|
fde5cd34b2
|
Merge branch 'editorbeatmap-update-cleanup' into editor-undo-redo
|
2020-04-09 20:36:57 +09:00 |
|
smoogipoo
|
683302a77d
|
Fix crash when trying to edit long beatmaps
|
2020-04-09 20:25:26 +09:00 |
|
smoogipoo
|
ee6ea08cf8
|
Cleanup handling of hitobject updates
|
2020-04-09 20:16:44 +09:00 |
|
Dean Herbert
|
e10576325c
|
Merge branch 'master' into update-overlay-headers
|
2020-04-09 16:29:34 +09:00 |
|
Dean Herbert
|
260de77304
|
Merge branch 'master' into select-recommended
|
2020-04-09 15:30:35 +09:00 |
|
Dean Herbert
|
c5005eb378
|
Adjust gradient size slightly and make const
|
2020-04-09 14:55:02 +09:00 |
|
Dean Herbert
|
5a78e74470
|
Use Lerp instead of ValueAt
|
2020-04-09 14:51:50 +09:00 |
|
Dean Herbert
|
c44957db3f
|
Change initial health to 1 to avoid false fail display
|
2020-04-09 14:49:09 +09:00 |
|
Dean Herbert
|
947745d87e
|
Change fail effect to be less distracting
|
2020-04-09 14:34:23 +09:00 |
|
Dean Herbert
|
4976f80b71
|
Move implementation to HUD
|
2020-04-09 14:31:25 +09:00 |
|
Dean Herbert
|
0e2d5213ce
|
Merge branch 'master' into low-hp-red-layer
|
2020-04-09 13:53:57 +09:00 |
|
Dean Herbert
|
4bfc738f5b
|
Merge pull request #7639 from santerinogelainen/master
Add top rank to the beatmap carousel
|
2020-04-08 23:36:47 +09:00 |
|
Dean Herbert
|
61d8cfd224
|
Fix triangle intro video being out of time
|
2020-04-08 19:51:55 +09:00 |
|
Alchyr
|
737a3b608a
|
Correct spelling
|
2020-04-07 17:34:18 -07:00 |
|
smoogipoo
|
ed3e0a01e1
|
Re-namespace into song select
|
2020-04-07 15:31:22 +09:00 |
|
Joehu
|
57b6a91449
|
Remove unnecessary input override on footer button mods
Was used when it expanded on hover, but doesn't anymore.
|
2020-04-05 14:57:44 -07:00 |
|
Joehu
|
0f11ecce01
|
Make icons container private
|
2020-04-05 14:53:49 -07:00 |
|
Salman Ahmed
|
7fab07670e
|
Remove no longer necessary usage of IsBreakTime
|
2020-04-05 21:35:09 +03:00 |
|
Santeri Nogelainen
|
163de36777
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-04 22:29:15 +03:00 |
|
Santeri Nogelainen
|
1e8badb14a
|
Move all logic to TopLocalRank and remove CarouselBeatmapRank
|
2020-04-04 22:28:36 +03:00 |
|
Joehu
|
88cc552534
|
Fix results star rating display not being centered when no mods are present
Needed or the spacing will apply to the fill flow container, causing alignment issues.
|
2020-04-03 11:30:22 -07:00 |
|