Dean Herbert
37b88d834e
Adjust padding slightly
2017-10-12 22:10:37 +09:00
smoogipoo
ab62390336
Make TimelineButtons combined take up the full height of the timeline
2017-10-12 18:32:39 +09:00
smoogipoo
a6901c0a27
Change TimelineButton icon colour to white when hovered
2017-10-12 18:17:36 +09:00
smoogipoo
5ccfc1918e
Hook up more bindables for hitobjects/hitsounds
2017-10-12 17:51:01 +09:00
smoogipoo
db672becbc
Implement waveform checkbox
2017-10-12 17:50:51 +09:00
smoogipoo
3c35a7a6ae
graph -> waveform
2017-10-12 17:37:40 +09:00
smoogipoo
4586877239
Implement magnification buttons
2017-10-12 17:31:21 +09:00
smoogipoo
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
smoogipoo
2844764e3c
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
2017-10-12 15:37:45 +09:00
smoogipoo
e12fa49436
Integrate timeline into Compose
2017-10-12 15:37:00 +09:00
smoogipoo
6fbf52c3eb
Remove unused usings
2017-10-12 15:32:18 +09:00
EVAST9919
7cff413ab0
Fix wrong beatmap selection in song-select menu on deleting selected beatmap
2017-10-11 20:25:12 +03:00
TocoToucan
4653470779
Fix RulesetStore preparation
2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03:00
EVAST9919
28a594179f
CI fixes
2017-10-10 21:03:35 +03:00
EVAST9919
15160f5116
Simplify the code by using more delayed sequences
2017-10-10 20:43:07 +03:00
EVAST9919
d3a62082b4
Final adjustments
2017-10-10 20:20:49 +03:00
EVAST9919
a58e828f54
Timing adjustments
2017-10-10 20:06:18 +03:00
EVAST9919
10a3f7c1d0
Use constants instead of magic numbers
2017-10-10 18:30:46 +03:00
EVAST9919
c34b9aef98
No need to put a lot of stuff inside the big circular container
2017-10-10 15:29:29 +03:00
EVAST9919
67a6da44f9
Rings timing adjustment
2017-10-10 15:02:43 +03:00
smoogipoo
1cf8c0284a
Re-namespace a few classes
2017-10-10 15:22:39 +09:00
smoogipoo
166194e6b6
Further logic simplification
2017-10-10 15:09:26 +09:00
EVAST9919
9cad0ce2e9
Group transforms using delayed sequence
...
And some timing adjustments
2017-10-10 07:07:09 +03:00
smoogipoo
074a1db4a1
Implement scrolling and better zoom
2017-10-10 12:45:27 +09:00
EVAST9919
6fb8755a95
Use less masking for the ring
2017-10-10 06:06:09 +03:00
EVAST9919
19723b82f7
Remove ring's background field and adjust some timings
2017-10-10 04:12:01 +03:00
EVAST9919
e2d6659d48
Change Ring type, use RelativeSizeAxes for Background/Foreground
2017-10-10 03:57:15 +03:00
EVAST9919
59a0343c01
CI fixes
2017-10-10 01:36:40 +03:00
EVAST9919
0baceaaf0d
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-10 00:56:54 +03:00
smoogipoo
cb58a1371e
Merge branch 'editor-waveform' into editor-waveform-timeline
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
smoogipoo
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df
Update in-line with framework
2017-10-09 17:18:11 +09:00
TocoToucan
81b9e08fb6
Fix foreign key constraint failure
2017-10-09 00:30:52 +03:00
EVAST9919
402531d04c
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-06 20:37:59 +03:00
smoogipoo
10abaa866b
Put screens below the top and bottom bars of the editor
2017-10-07 01:56:11 +09:00
smoogipoo
c0b394811f
Make compose mode the default
...
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
smoogipoo
d432ab7510
Reorder screen tab control items
2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e
Fix bindable binding to make the editor load a screen by default again
2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e
Remove rounded corners on the editor menu bar
2017-10-07 01:38:13 +09:00
smoogipoo
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
smoogipoo
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11
Remove scale effect on editor screen switches
2017-10-06 23:41:49 +08:00
Dean Herbert
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
EVAST9919
0ec7d2dcf6
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-06 15:56:08 +03:00
EVAST9919
95ac4e9265
Remove useless using
2017-10-06 04:57:46 +03:00
EVAST9919
96fcc095eb
Apply suggested shrinking bar changes
2017-10-06 04:49:16 +03:00
TocoToucan
887aa7496b
Rework EF Core usage in model classes
2017-10-06 00:23:26 +03:00
EVAST9919
f8830e1b7c
Animation adjustments
2017-10-05 21:37:37 +03:00
smoogipoo
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
EVAST9919
5caca1d328
Don't use '#' in RankDisplay for now
2017-10-05 05:27:52 +03:00
EVAST9919
cb0dbc6d9e
Fix shrinking bar lingering on the screen for too long
2017-10-05 05:23:18 +03:00
EVAST9919
cc99678a96
Remove useless usings
2017-10-05 05:09:23 +03:00
Dean Herbert
20bf0502ab
Use scheduling rather than raw transform delays
2017-10-05 10:03:48 +08:00
EVAST9919
22a59d753b
Make all the overlays IStateful
2017-10-05 04:38:13 +03:00
EVAST9919
cafacf20ff
Add all the needed objects
2017-10-05 02:50:13 +03:00
EVAST9919
6fa45aafc6
Basic logic
2017-10-04 23:06:31 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
smoogipoo
dcd5cc6753
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 22:00:44 +09:00
smoogipoo
8427bb44d1
Implement basic layout for the compose screen ScrollableTimeline
2017-10-04 22:00:42 +09:00
smoogipoo
ea45452993
Allow resolution > 1
2017-10-04 21:57:46 +09:00
smoogipoo
1377f73b46
Multiply resolution before clamping
2017-10-04 21:57:29 +09:00
smoogipoo
8bc20a2545
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 19:49:23 +09:00
smoogipoo
8a52fdc8fa
Use a bindable for the current screen in EditorMenuBar
...
Replaces the current Action.
2017-10-04 19:37:17 +09:00
smoogipoo
34eede0d04
Re-namespace EditorScreenMode
2017-10-04 19:36:55 +09:00
smoogipoo
e2824d4732
Reduce harshness of scale for now
...
Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...
2017-10-04 19:26:26 +09:00
smoogipoo
357a467337
Implement design mode
2017-10-04 19:24:19 +09:00
smoogipoo
5ca4a2d2c8
Add some nullchecks to WaveformDisplay
2017-10-04 19:09:39 +09:00
smoogipoo
81960c7b48
CI fixes
2017-10-04 19:03:02 +09:00
smoogipoo
80e984f72d
Update in-line with framework
2017-10-04 18:55:38 +09:00
smoogipoo
01c839eda7
Move WaveformDisplay into separate class and add some commenting
2017-10-04 17:51:28 +09:00
smoogipoo
cf44868bcd
Give EditorScreen a Beatmap
2017-10-04 15:02:11 +09:00
EVAST9919
1c132938df
Allow visibility can be toggled only if replay is loaded
2017-10-03 20:26:53 +03:00
EVAST9919
feb0b1852f
Remove the dangerous function
2017-10-03 20:05:50 +03:00
EVAST9919
b94c78e993
Hide/Show Replay settings on pressing Ctrl+H
2017-10-02 19:33:58 +03:00
EVAST9919
4a298098c5
CI fixes
2017-10-02 18:19:55 +03:00
EVAST9919
c34cc07fda
Remove default bindable from the config manager
2017-10-02 18:09:00 +03:00
EVAST9919
b6ed977e1e
Fix hard crash and fix breaks have been initialized twice
2017-10-02 09:04:03 +03:00
EVAST9919
7052462863
Update inline with framework
2017-10-02 08:51:00 +03:00
EVAST9919
c2f487aa3e
Add Rank as a property to the Score Processor
2017-10-02 05:56:38 +03:00
EVAST9919
5ce2723719
Don't use linq query
2017-10-02 05:12:56 +03:00
EVAST9919
6d97da8b19
Add replay speed adjustment
2017-10-02 04:42:38 +03:00
smoogipoo
7211dd2015
Remove unnecessary usings
2017-10-02 10:11:43 +09:00
smoogipoo
69b61a62a5
Implement base Compose screen
2017-10-02 10:09:21 +09:00
smoogipoo
af4c6276e4
Adjust transforms of EditorScreen
2017-10-02 10:09:10 +09:00
smoogipoo
91cede79c2
Mask the editor screens
2017-10-02 10:07:34 +09:00
smoogipoo
6018b4e5e4
Make EditorScreen a Container
2017-10-02 09:34:51 +09:00
smoogipoo
2a310f02bc
modeContainer -> screenContainer
2017-10-02 09:27:27 +09:00
smoogipoo
c2d63eb0bd
Add EditorScreen + screen changing functionality
2017-10-02 09:26:52 +09:00
smoogipoo
221902f4fe
Restructure Editor construction
2017-10-02 09:26:16 +09:00
smoogipoo
7b1ef53f36
Expose a mode change event from EditorMenuBar
2017-10-02 09:24:25 +09:00
smoogipoo
8ed23a60e9
Remove items from the editor menu bar
2017-10-02 09:10:40 +09:00
EVAST9919
ac6c323f93
Clear all tasks and transforms when resetting Breaks
2017-10-02 00:44:57 +03:00
EVAST9919
b62f2437ac
Don't allow counter became 0
2017-10-01 23:38:11 +03:00
EVAST9919
2f852d705e
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-01 23:10:49 +03:00
smoogipoo
21c6a63fa1
Use using for Description
2017-09-29 20:03:09 +09:00
smoogipoo
7b4348254c
Don't use new
2017-09-29 20:02:55 +09:00
Dean Herbert
eed358a2c1
Merge branch 'master' into editor-screen-selection
2017-09-29 18:24:46 +08:00
smoogipoo
775e8bada5
Make the background bottom corners look nice with the new hover functionality
2017-09-29 15:13:38 +09:00
smoogipoo
b2eab1f435
Set the hover background colour as dictated by flyte
2017-09-29 15:09:56 +09:00
smoogipoo
6bb5210c7c
Remove the parentSizedBox
2017-09-29 15:09:28 +09:00
EVAST9919
e7632b6e6f
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-28 14:44:31 +03:00
Dean Herbert
4eaf6b4b94
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
2017-09-28 00:14:04 +08:00
smoogipoo
95364d0173
No more box background
2017-09-27 22:15:11 +09:00
smoogipoo
ba8bf6cbd5
Add ScreenSelectionTabControl to EditorMenuBar
2017-09-27 22:01:53 +09:00
smoogipoo
545c375199
Update design of EditorMenuBar to match flyte's design more closely
2017-09-27 22:01:03 +09:00
Dean Herbert
e64860ad45
Fix test case not working as expected
2017-09-27 12:46:34 +08:00
Dean Herbert
faad3fc7d3
Arbitrarily move colour assignment
2017-09-27 12:40:32 +08:00
Dean Herbert
d5ed218488
Fix timeline sizes being updated potentially before the track has a length
2017-09-27 11:07:43 +08:00
Dean Herbert
7ad21d9a6d
Simplify marker part construction
2017-09-27 11:07:23 +08:00
Dean Herbert
eae29820c0
Fix marker being cleared each beatmap change
2017-09-27 11:07:17 +08:00
Dean Herbert
708632bca8
Remove second unnecessary colour set
2017-09-27 10:06:36 +08:00
EVAST9919
c696f74578
Fix broken testcase and apply suggested changes
2017-09-27 01:10:48 +03:00
EVAST9919
3cd6319ffa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-27 00:32:38 +03:00
Dean Herbert
7c70d3d2cb
Merge branch 'master' into storyboard_integration
2017-09-26 20:19:26 +08:00
smoogipoo
10dbd68c1e
Simplify null check
2017-09-26 20:11:45 +09:00
smoogipoo
c578509a20
Bind to the screen Beatmap instead of the game-wide Beatmap
2017-09-26 17:58:40 +09:00
smoogipoo
3937ebdc3d
Add missing license headers
2017-09-26 15:58:30 +09:00
Dan Balasescu
b8b54e95a5
Merge branch 'master' into editor-timing-timeline
2017-09-26 15:54:01 +09:00
smoogipoo
10e5fe40b2
A bit of cleanup
2017-09-26 15:51:45 +09:00
smoogipoo
5953c1084e
Re-namespace SummaryTimeline
2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef
Implement MarkerPart for the marker
2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1
Re-namespace and split out timeline parts from the SummaryTimeline
2017-09-26 15:44:40 +09:00
Dean Herbert
f129902ee0
Avoid nullrefs when data is not present
2017-09-25 23:35:02 +08:00
Damnae
2d4616fd43
Apply beatmap settings when creating the DrawableStoryboard.
2017-09-25 11:03:57 +02:00
smoogipoo
d787c740fa
Fix bookmarks not working
...
We should be dealing with the array in every situation, with the exception of the database.
2017-09-25 17:46:51 +09:00
Damnae
0996867112
Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
2017-09-25 10:40:22 +02:00
smoogipoo
7fb8008e44
Merge remote-tracking branch 'origin/master' into editor-timing-timeline
...
# Conflicts:
# osu-framework
2017-09-25 17:20:55 +09:00
Dean Herbert
0aebfdd578
Merge branch 'master' into icons_jumping_fix
2017-09-25 12:07:25 +08:00
EVAST9919
94269e119e
Reset text only if it has been changed
2017-09-23 19:59:34 +03:00
EVAST9919
0615f375e1
Show current grade
2017-09-23 19:52:44 +03:00
EVAST9919
a69bef8ec0
Use existing enum instead of my own
2017-09-23 16:51:31 +03:00
EVAST9919
2da3ea00b6
Bind break overlay to accuracy
2017-09-23 16:42:18 +03:00
EVAST9919
2290c3d5d5
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-23 15:48:29 +03:00
Huo Yaoyuan
442259d9e0
Fix overlay toggling in song select.
2017-09-23 19:47:23 +08:00
EVAST9919
ced6204219
oops
2017-09-22 22:10:05 +03:00
EVAST9919
d73b40768e
More arrow adjustments to match the design
2017-09-22 21:12:58 +03:00
EVAST9919
92eb8e4fa9
Move blurred icons to a parallax container
2017-09-22 21:00:45 +03:00
EVAST9919
6fe2b64abd
Start breakOut animation a bit earlier
2017-09-22 20:50:00 +03:00
EVAST9919
d58e5a6130
Arrows improvements
2017-09-22 20:43:51 +03:00
EVAST9919
3202d35a79
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-22 17:36:37 +03:00
EVAST9919
56bde64839
Add arrows overlay
2017-09-22 01:16:05 +03:00
EVAST9919
5383e33f3d
Remove useless clock assignment
2017-09-21 22:58:49 +03:00
EVAST9919
22ab2c5e5d
Apply suggested changes
2017-09-21 22:54:46 +03:00
EVAST9919
9667270336
Remove using
2017-09-21 01:56:50 +03:00
EVAST9919
e051bcc6df
Fix wrong arrows position on startup
2017-09-21 01:51:40 +03:00
EVAST9919
c79568135a
Add arrows
2017-09-21 01:44:30 +03:00
EVAST9919
18a714df74
Move every class to it's own file
2017-09-20 22:33:07 +03:00
EVAST9919
581689a84d
CI fixes
2017-09-20 20:58:20 +03:00
EVAST9919
4699a44608
Add info container
2017-09-20 20:50:14 +03:00
EVAST9919
8d7db52200
Add remaining time counter
2017-09-20 19:45:38 +03:00
EVAST9919
0f04d8c6a7
Add remaining time container
2017-09-20 15:58:28 +03:00
smoogipooo
e65a17ad96
Remove redundant usings
2017-09-20 18:40:41 +09:00
smoogipooo
7168e8fd99
Improve layout of bottom bar in the Editor
2017-09-20 18:16:03 +09:00
smoogipooo
7588f1b6ca
Add SummaryTimeline to Editor
2017-09-20 17:09:38 +09:00
smoogipooo
f9568619e7
Move SummaryTimeline into /Edit/Components/SummaryTimeline
2017-09-20 16:59:03 +09:00
Dean Herbert
120446e4a7
Ensure only one dialog is being displayed by the SongSelect footer at a time
...
Fixes #1208
2017-09-20 14:32:15 +09:00
Damnae
fcaabf7fdf
Merge branch 'master' into storyboard_integration
2017-09-19 17:36:29 +02:00
EVAST9919
1b0ab414fa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-19 17:23:10 +03:00
EVAST9919
1de8bca7f6
Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix
2017-09-19 17:08:32 +03:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Dan Balasescu
02ccea1c4e
Merge branch 'master' into scores-lookup-requires-id
2017-09-16 08:43:59 +09:00
EVAST9919
429e7723b3
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-15 19:40:30 +03:00
EVAST9919
740e766201
BreakOverlay and LetterboxOverlay implementation
2017-09-15 19:39:55 +03:00
Damnae
757a159516
Display a non-parallax background at the appropriate size when storyboards do not replace it.
2017-09-15 14:31:54 +02:00
Damnae
f5368505ab
Load the storyboard asynchronously if it wasn't loaded with the beatmap.
2017-09-15 11:58:37 +02:00
Damnae
4a15762139
Don't create drawables for hidden storyboards.
2017-09-15 11:58:37 +02:00
Damnae
c8cdf6787e
Better property name.
2017-09-15 11:58:31 +02:00
Damnae
7c3ce7e830
Unbind events affecting the background after gameplay has ended.
2017-09-15 09:16:56 +02:00
Damnae
cb8029af9e
Add a setting to hide storyboards.
2017-09-15 09:16:56 +02:00
Damnae
ddaf28d7f6
Integrate storyboards with gameplay.
2017-09-15 09:16:56 +02:00
Damnae
010a6ec252
Fix player loading.
2017-09-15 09:06:27 +02:00
EVAST9919
e7c9ad245e
Fix icons in main button system jumps on one side for a long time
2017-09-15 09:24:31 +03:00
Dean Herbert
b72921b30e
Ensure an OnlineBeatmapID is present before attempting API requests
2017-09-15 12:44:48 +09:00
Dean Herbert
6ea22cc6c7
Add missing return to PlayerLoader
...
was being a bit too eager previously
2017-09-15 08:15:23 +09:00
Dean Herbert
396a56ddf4
Remove global OsuContextMenuContainer
2017-09-14 15:41:32 +09:00
Dean Herbert
d330b39db4
Remove max
2017-09-14 13:47:25 +09:00
Dean Herbert
4f09f30b7a
Fix incorrect exception
2017-09-14 13:13:54 +09:00
Dean Herbert
b1145272d1
Update code to support new inspectcode analysis rules
2017-09-14 12:58:32 +09:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Dean Herbert
fb7740a3ab
Update all dependencies in line with framework
2017-09-13 20:25:40 +09:00
smoogipooo
2e0218f388
Move AllObjectsJudged into ScoreProcessor as AllJudged
...
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
Shane Woolcock
262aea8b6b
Fix osu! logo triangles going super fast when the track is paused
2017-09-11 19:16:44 +09:30
smoogipooo
58c875bdca
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 15:02:12 +09:00
Dean Herbert
adba5b5ba6
Merge branch 'master' into beatmap-details-rewrite
2017-09-11 12:30:32 +09:00
Dean Herbert
eedfbdc0e8
Add nullref check in KeyCounterCollection's Add method
2017-09-11 11:41:09 +09:00
smoogipooo
cde22865b9
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
6d33e39c5e
Merge branch 'master' into beatmap-details-rewrite
2017-09-10 11:26:00 +09:00
DrabWeb
d95940ed5e
CI fixes.
2017-09-08 14:25:41 -03:00
DrabWeb
ce68b6661e
Update visual test.
2017-09-08 14:15:28 -03:00
DrabWeb
55e8bdfb05
CI fixes.
2017-09-07 15:38:23 -03:00
DrabWeb
109531b66c
Cleanup, remove unneeded files.
2017-09-07 15:21:18 -03:00
DrabWeb
2153865de5
Adjust fail on missing logic to match original.
2017-09-07 15:09:50 -03:00
DrabWeb
fd2700a5b4
Fix .00 being displayed for star difficulty when the value is 0.
2017-09-07 15:01:31 -03:00
DrabWeb
5e685ff5b1
Rewrite BeatmapDetails to be more modular for future code sharing.
2017-09-07 14:53:53 -03:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
Dean Herbert
b9bec6a983
CI fixes
2017-09-07 23:06:35 +09:00
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +09:00
Dean Herbert
41398f57d6
Changes in line with framework
2017-09-07 20:36:32 +09:00
smoogipooo
06fac913bf
Re-implement EditorMenuBar.
2017-09-06 21:14:29 +09:00
smoogipooo
df79d8918d
Merge branch 'master' into menu-bar
2017-09-06 18:26:18 +09:00
smoogipooo
5508fa0fd9
Merge remote-tracking branch 'origin/master' into new-menus
2017-09-05 19:14:42 +09:00
smoogipooo
57678a13d9
Update in-line with framework changes.
2017-09-04 09:32:35 +09:00
Dean Herbert
543a71efcc
Fix ObjectDisposal exceptions due to lingering event binds
2017-09-04 08:21:07 +09:00
Dean Herbert
dd26c80837
Delete -> Hide
2017-09-04 07:59:32 +09:00
Dan Balasescu
19ad5d5328
Merge branch 'master' into song-select-context-menus
2017-09-04 07:56:31 +09:00
Dean Herbert
3ede685ee9
Fix crash on random selection from a previously null selection
2017-09-01 18:44:51 +09:00
Dean Herbert
3d61cde266
Correctly delay loading of PlaySongSelect-specific components
2017-09-01 18:22:38 +09:00
Dean Herbert
f9d02afb00
Don't allow selection of a hidden beatmap
2017-09-01 18:13:21 +09:00
Dean Herbert
1f646e6d54
Add hiding support for beatmap difficulties
2017-09-01 17:57:12 +09:00
Dean Herbert
3b4b4b669b
Add framework for deleting difficulties
2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc
Use BeatmapSetInfo instead of WorkingBeatmap
2017-08-30 20:53:33 +09:00
Dean Herbert
07da29ea1c
Add context menu to beatmap set header
2017-08-30 20:41:41 +09:00
Dan Balasescu
cabf671811
Merge branch 'master' into menu-bar
2017-08-30 12:31:12 +09:00
Huo Yaoyuan
4aa5ce8b41
Always load background and info wedge when no beatmap available.
2017-08-28 17:53:57 +08:00
smoogipooo
b17d9ac06e
Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.
2017-08-28 17:55:50 +09:00
Dean Herbert
189988236b
Move PlayerInputManager logic inside RulesetInputManager
2017-08-24 15:23:17 +09:00
Dean Herbert
c5a20e3372
Remove permitNulls
2017-08-22 18:28:32 +09:00
Dean Herbert
803cbddfe2
Ensure score's user is set directly from API
...
Previously would fail in visualtests due to `OsuGame` case.
2017-08-22 16:59:54 +09:00
Dean Herbert
09dd0cabd6
Move beatmap/ruleset change restrictions to OsuGame
...
Allows test cases to more freely exist
2017-08-22 15:59:32 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Shane Woolcock
4901ac9e35
Add some comments explaining why the Track is being forcefully added to the TrackManager
2017-08-18 18:01:18 +09:30
Dean Herbert
ffc8f763e5
Merge branch 'master' into fix-track-not-resetting
2017-08-18 17:24:22 +09:00
Dan Balasescu
cc6a5824f0
Merge branch 'master' into fix-ruleset-changing
2017-08-18 13:40:52 +09:00
Dean Herbert
7e21ddb5eb
Remove usage of HideOnEscape
2017-08-16 22:56:32 +09:00
Dean Herbert
2c7f0629ef
Merge remote-tracking branch 'upstream/master' into is-alive
2017-08-16 12:11:32 +09:00
MrTheMake
105048500a
Made modString private and moved the beatmap assignment inside GetScoresRequest
2017-08-15 15:30:53 +02:00
Dean Herbert
6ded194c53
Remove all usage of DI to retrieve InputManager
...
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
Dean Herbert
97ac8e1a64
Update usages of IsAlive/IsLoaded in line with framework changes
2017-08-15 13:57:48 +09:00
Dean Herbert
70f148f0b4
Fix icons on skip button
2017-08-15 09:30:46 +09:00
MrTheMake
920710e7d0
Assign a score's beatmap and cleanup to the Score class
2017-08-14 13:30:54 +02:00
Dean Herbert
9e1ffa27dc
Fix leaderboard icons not displaying correctly
2017-08-14 12:52:20 +09:00
MrTheMake
6b1184e8af
General formatting
2017-08-14 00:27:54 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3
Fix nullref in the leaderboard's test case
2017-08-13 18:00:53 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Dean Herbert
94b8d1de8b
Merge branch 'master' into fix-ruleset-changing
2017-08-13 11:14:41 +09:00
Dean Herbert
fe2911f165
Fix some formatting issues
2017-08-13 10:36:57 +09:00
Shane Woolcock
096e574401
Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)
2017-08-12 19:52:09 +09:30
Shane Woolcock
e48c5898bd
Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.
2017-08-11 17:26:30 +09:30
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Dean Herbert
e75f438c29
Add difficulty application mods
...
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e
Implement NoFail mod
2017-08-07 08:54:54 +09:00
Dean Herbert
e8021c2b92
Move line inside if
2017-08-04 17:20:05 +09:00
Huo Yaoyuan
74facb32b4
Use removeAutoModOnResume as a field.
2017-08-04 15:34:11 +08:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b
Pass input state in OnSelected.
2017-08-04 00:09:41 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
c8b5c1b8a5
Merge branch 'master' into scroll_to_selected
2017-08-01 11:06:32 +09:00
EVAST9919
700c7753c3
Applied suggestions
2017-07-31 14:20:12 +03:00
EVAST9919
1ce4966644
Merge remote-tracking branch 'refs/remotes/ppy/master' into scroll_to_selected
2017-07-31 14:08:15 +03:00
Huo Yaoyuan
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
Dean Herbert
57d45b180c
Merge remote-tracking branch 'upstream/master' into import-from-stable
2017-07-31 17:31:10 +09:00
EVAST9919
62365090ad
Removed useless variable
2017-07-29 17:51:11 +03:00
EVAST9919
6b3a81f567
Fix hard crash when pressing random if no beatmaps avaliable
2017-07-29 17:42:32 +03:00
EVAST9919
e121b119be
Added "scroll to" container
2017-07-29 17:33:20 +03:00
EVAST9919
8458622c4d
Add ScrollToSelected method
2017-07-29 16:03:17 +03:00
Dean Herbert
e691dd12c5
Fix potential sequen of execution issues in BeatmapCarousel
2017-07-28 15:05:08 +09:00
Dean Herbert
f705589bf2
Rename NotificationManager to NotificationOverlay
2017-07-28 15:03:42 +09:00
Dean Herbert
6f4efbeda6
Merge remote-tracking branch 'upstream/master' into database-tidy
2017-07-27 17:41:29 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777
Simplify and document DatabaseStore API
2017-07-27 15:06:10 +09:00
Dean Herbert
31bfa00d60
Schedule API callback to own scheduler
...
Fixes race condition when API returns a failure after exiting song select. Note that the API does also schedule to the correct thread, but this schedule ensures the callback is never run, which is what we want in this case.
2017-07-27 12:55:14 +09:00
Dean Herbert
898a601098
Introduce a reference counting file store
2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Dean Herbert
3c7546e2c1
Merge remote-tracking branch 'upstream/master' into no-more-colourinfo
2017-07-25 10:14:48 +09:00
Dean Herbert
b528568547
Merge branch 'master' into drawableflag-ctor
2017-07-25 09:46:27 +09:00
Huo Yaoyuan
47b4ef5cd2
Handle control key with OnKeyUp/OnKeyDown.
2017-07-24 22:14:21 +08:00
Huo Yaoyuan
c2e5788ed1
Make OsuScreen.Ruleset protected.
2017-07-24 21:47:31 +08:00
Huo Yaoyuan
e0b1057b87
Merge branch 'master' into fixes
2017-07-24 20:50:33 +08:00
Dean Herbert
84f12c722f
Merge branch 'master' into master
2017-07-24 18:23:36 +09:00
tgi74000
d0e99f0c95
check removed beatmap being null, check promptdelete beatmap being default
2017-07-24 10:25:33 +02:00
tgi74000
5d30efc090
Do not trigger Random if no Beatmaps are imported
2017-07-24 09:57:12 +02:00
Nabile Rahmani
c80f5c708a
Less verbose DrawableFlag constructor.
2017-07-24 09:25:49 +02:00
Dean Herbert
64f2e2dc32
Use Colour instead of ColourInfo
2017-07-23 13:06:16 +02:00
EVAST9919
d9e9ab22db
Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel
2017-07-23 13:27:03 +03:00
Dean Herbert
831bd24b00
Merge branch 'master' into easing
2017-07-23 13:46:35 +09:00
Dean Herbert
c6250e1da5
Supress compiler warning
...
I don't think this is a sustainable solution if we start doing this in more places.
2017-07-23 11:34:09 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
750fc0db0e
Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
2017-07-22 11:34:27 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
dae0f61b2b
Don't obtain DependencyContainer via DI
2017-07-22 11:09:13 +02:00
Thomas Müller
e469a114a6
Update dependency caching according to framework
2017-07-21 19:03:43 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
EVAST9919
388fcfb295
Make BeatmapCarousel inherit from OsuScrollContainer
2017-07-21 13:13:53 +03:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
9a33e77d63
Merge branch 'master' into fix-carousel-debounce-race
2017-07-21 17:44:04 +09:00
Thomas Müller
3a086534f8
Merge branch 'master' into fix-selection-changing
2017-07-21 10:22:11 +02:00
Dean Herbert
12b6b80d5c
Make method to flush filter requests
2017-07-21 17:20:52 +09:00
Dean Herbert
bf254bf5cf
Merge branch 'master' into fix-songprogress-endtime
2017-07-21 16:46:41 +09:00
Dean Herbert
6bdf6bb675
Merge branch 'master' into previewtime-seeking
2017-07-21 15:06:18 +09:00
Dean Herbert
f7b64a458a
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:10:25 +09:00
Dean Herbert
b4dddc98ee
Fix selection changing on entering song select
...
Conditional was backwards, easy fix.
2017-07-21 06:15:44 +09:00
Dean Herbert
fb2f1224b3
Fix carousel filter debounce causing a race condition
...
Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.
2017-07-21 05:58:58 +09:00
Thomas Müller
e84d8cc020
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:15:58 +02:00
Thomas Müller
4e33efd41f
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:04:45 +02:00
Thomas Müller
518a7c460e
Merge branch 'master' into fix-beatmap-select-race
2017-07-20 21:04:40 +02:00
Thomas Müller
ed6478be8b
Merge branch 'master' into always-load-storyboard
2017-07-20 20:54:16 +02:00
Thomas Müller
e21822cdeb
Merge branch 'master' into fix-working-beatmap-double-load
2017-07-20 20:35:31 +02:00
Thomas Müller
01ff7e8f4b
Merge branch 'master' into fix-empty-carousel
2017-07-20 20:31:06 +02:00
MrTheMake
22f3e97241
Small optimization to the main menu intro seeking.
2017-07-20 17:15:39 +02:00
Dean Herbert
c1a3e4a008
Remove unnecessary using
2017-07-20 20:06:24 +09:00
Dean Herbert
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
Thomas Müller
8108f3e78d
Merge branch 'master' into no-set-exclusive
2017-07-20 12:11:32 +02:00
Dean Herbert
6e0b7b81f8
Switch to correct ruleset when changing beatmap
...
This is only really noticeable when using the MusicController to change tracks while at song select.
2017-07-20 19:10:20 +09:00
Dean Herbert
577740d329
Fix footer button light fading incorrectly
...
Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.
2017-07-20 18:08:51 +09:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
4f10256182
Remove unnecessary count check
2017-07-20 15:34:44 +09:00
Dean Herbert
61c665f239
Add required null check
2017-07-20 15:16:07 +09:00
Dean Herbert
a59557f039
Fix selection not being reset correct when changing between rulesets
...
Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.
2017-07-20 15:12:20 +09:00
Dean Herbert
c130981184
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
2017-07-20 14:06:09 +09:00
Dean Herbert
15eb6954da
Fix hitting down and enter at song select causing a hard-crash
...
Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
2017-07-20 11:50:52 +09:00
Dean Herbert
d6968ca09c
Remove FullyLoaded logic
...
Always parse storyboards for now.
Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
Dean Herbert
b00fc857dd
Merge branch 'master' into fix-beatmap-null
2017-07-20 09:33:14 +09:00
Dean Herbert
8d727b898f
Don't rely on BeatmapSetInfo being present
2017-07-20 09:23:11 +09:00
Dean Herbert
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
MrTheMake
fd518e2294
Don't start a beatmap's track until the intro is done playing
2017-07-20 01:57:46 +02:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
smoogipooo
d75e439f94
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 01:27:27 +09:30
Dean Herbert
38431f8555
Fix remaining test case issues
2017-07-19 19:10:04 +09:00
Dean Herbert
8ce71ef235
Fix broken test case
2017-07-19 18:48:27 +09:00
Dean Herbert
da92fccdb0
Merge branch 'master' into non-null-beatmap
2017-07-19 18:32:42 +09:00
Dean Herbert
35157ca6b8
Make DefaultBeatmap private get.
2017-07-19 18:09:59 +09:00
Dean Herbert
c34856922c
Gratify CI
2017-07-19 16:34:18 +09:00
Dean Herbert
2a2f4e2a8b
Ensure side flashes are not visible during moving transitions
2017-07-19 16:13:01 +09:00
Dean Herbert
2b1e19814c
Side flashes should not be affected by parallax
2017-07-19 16:07:11 +09:00
Dean Herbert
c8593a38c8
Remove incorrect looping reset behaviour
...
Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.
2017-07-19 15:55:16 +09:00
Dean Herbert
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
Dean Herbert
8e8767cd37
Give song select a better default background whecn the beatmap's can't be loaded
2017-07-19 15:16:55 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Dean Herbert
0846414c5b
Simplify state changes
2017-07-19 15:16:51 +09:00
Dean Herbert
632d2e8ba5
Dummy beatmap has dummy ruleset
2017-07-19 15:16:48 +09:00
Dean Herbert
f168ee660c
Move dummy to BeatmapDatabase
2017-07-19 15:16:43 +09:00
Dean Herbert
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
Dean Herbert
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
Dean Herbert
df60fc0f0a
Stop playing previous beatmap even if new beatmap has no track
2017-07-19 15:16:36 +09:00
Dean Herbert
e47faf4e85
Add a dummy beatmap provider for use in BeatmapInfoWedge
2017-07-19 15:16:33 +09:00
Thomas Müller
3ba119c115
Ensure toolbar disappears when osu logo transition is cancelled
2017-07-18 17:09:53 +03:00
Thomas Müller
b40c897dbd
Fix osu logo shockwave playing when transition is aborted
...
This is a very nice use-case scenario for TransformSequence.OnComplete
2017-07-18 15:28:56 +03:00
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Huo Yaoyuan
9cd895c249
Implement Ctrl+Enter in PlaySongSelect.
2017-07-18 15:55:21 +08:00
Dean Herbert
c5d23daa6b
Merge remote-tracking branch 'upstream/master' into remove-dragbar
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-07-18 13:44:23 +09:00
