1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:42:55 +08:00
Commit Graph

6301 Commits

Author SHA1 Message Date
BananeVolante
2e8f30461f play/stops music when entering the pause overlay, instead of letting it play silently in the background 2020-06-24 14:22:12 +02:00
BananeVolante
9514a02eeb Merge branch 'master' of https://github.com/ppy/osu into Issue#9170 2020-06-24 14:12:07 +02:00
jorolf
768e28faba generalize and simplify animation 2020-06-24 14:11:38 +02:00
BananeVolante
53107973a3
merged 2 lines
Co-authored-by: Salman Ahmed <email@iisalman.me>
2020-06-24 14:01:13 +02:00
Viktor Rosvall
9e1bf71233 Added text explaining a second copy will be made 2020-06-24 11:29:38 +02:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Sebastian Krajewski
68f078c9e6 Replace logo-triangles.mp4 with shadered logo-triangles.png 2020-06-24 10:30:33 +02:00
Dean Herbert
ccb27082d5 Fix background appearing too late 2020-06-24 11:08:32 +09:00
Dean Herbert
4244024fc3 Merge branch 'master' into fallback-intro 2020-06-24 10:49:45 +09:00
Bartłomiej Dach
43be75d481
Merge branch 'master' into Issue#9170 2020-06-23 20:49:13 +02:00
Dan Balasescu
11446a7864
Merge pull request #9355 from peppy/update-framework
Update framework
2020-06-23 22:27:55 +09:00
Dan Balasescu
fd9ac3503f
Merge branch 'master' into fix-editor-drag-selection-while-playing 2020-06-23 21:56:31 +09:00
Dean Herbert
92cf2dd3bb
Merge pull request #9352 from smoogipoo/fix-editor-drag-exception
Fix exception when dragging after deleting object
2020-06-23 21:45:58 +09:00
Dean Herbert
9d753a4fc2 Update intro resource locations 2020-06-23 21:34:57 +09:00
Dean Herbert
5cdabbc8bb Update access to FrequencyAmplitudes via span 2020-06-23 21:33:03 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
smoogipoo
e7238e25f9 Fix exception when dragging after deleting object 2020-06-23 20:36:09 +09:00
BananeVolante
624ad65806 formating 2020-06-23 13:09:24 +02:00
Dean Herbert
a5eac716ec Make work for all editors based on track running state 2020-06-23 18:42:56 +09:00
Dean Herbert
53d542546e Fix editor drag selection not continuing to select unless the mouse is moved 2020-06-23 18:04:50 +09:00
Dean Herbert
a6c6e391ca Fix player not exiting immediately on Alt-F4 2020-06-23 17:38:30 +09:00
Dean Herbert
6bcc693c2f Add ability to close statistics by clicking anywhere 2020-06-23 15:21:23 +09:00
Dean Herbert
49d3511063 Read amplitudes from piano reverb source 2020-06-23 13:55:44 +09:00
Dean Herbert
4554a7db33 Update naming 2020-06-23 13:49:18 +09:00
Dean Herbert
b289beca53 Fix samples being played too early 2020-06-23 13:33:33 +09:00
smoogipoo
1bf00e0c82 Schedule continuation 2020-06-22 23:22:49 +09:00
BananeVolante
579d7cedcc Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
updated local source
2020-06-22 15:29:05 +02:00
BananeVolante
836386d03b removed duplicate lines 2020-06-22 15:22:13 +02:00
Dean Herbert
f60a80b263 Fix animations and general code quality 2020-06-22 21:35:52 +09:00
BananeVolante
9dea96e5fd added pause sound with fading 2020-06-22 14:02:21 +02:00
BananeVolante
a4eb6c81c5 undid changes to the file 2020-06-22 13:40:31 +02:00
smoogipoo
ff2f3a8484 Fix div-by-zero errors with autoplay 2020-06-22 20:32:04 +09:00
smoogipoo
5c4df2e32c Cancel load on dispose 2020-06-22 20:20:42 +09:00
smoogipoo
988baad16f Expand statistics to fill more of the screen 2020-06-22 19:20:43 +09:00
smoogipoo
261adfc4e6 Create a local playable beatmap instead 2020-06-22 18:38:41 +09:00
Dean Herbert
8d3ed05848 Update welcome text sprite location 2020-06-22 17:42:54 +09:00
Dean Herbert
e3420dfad6
Merge branch 'master' into fallback-intro 2020-06-22 17:09:08 +09:00
smoogipoo
3ede095b9c Apply refactorings from review 2020-06-22 15:42:55 +09:00
smoogipoo
33fdd7466c Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-22 15:38:48 +09:00
smoogipoo
037bd3b463 Fix possible nullref 2020-06-19 22:48:21 +09:00
smoogipoo
4cb49cd606 Add minimum height to the timing distribution graph 2020-06-19 22:21:34 +09:00
smoogipoo
486b899e8f Rename method 2020-06-19 22:11:29 +09:00
smoogipoo
49bdd89775 Cleanup ReplayPlayer adjustments 2020-06-19 21:54:09 +09:00
smoogipoo
25abdc2903 General cleanups 2020-06-19 21:41:48 +09:00
smoogipoo
8aea8267fb Add some padding 2020-06-19 20:58:05 +09:00
smoogipoo
5ce2c712d3 Fix statistics not being wrapped by containers 2020-06-19 20:53:43 +09:00
smoogipoo
34a8fcfd2f Fix potential off-by-one 2020-06-19 20:53:30 +09:00
smoogipoo
83e6c3efdb Adjust API for returning statistics 2020-06-19 20:31:52 +09:00
smoogipoo
1cbbd6b442 Move timing distribution graph to osu.Game 2020-06-19 20:03:18 +09:00
smoogipoo
a3ff25177a Asyncify statistics load 2020-06-19 19:12:55 +09:00
smoogipoo
55196efe6e Fix panel depth ordering 2020-06-19 18:02:54 +09:00
smoogipoo
ec16b0fc5a Rework score panel tracking to fix visual edge cases 2020-06-19 17:28:35 +09:00
Dean Herbert
290ae37346 Add assertion of only usage game-wide 2020-06-18 23:54:20 +09:00
Dean Herbert
7da56ec7fd Add null check and xmldoc 2020-06-18 23:52:35 +09:00
Dean Herbert
add1265d53 Block screen suspend while gameplay is active 2020-06-18 23:48:00 +09:00
smoogipoo
85a0f78600 Hide statistics panel on first exit 2020-06-18 22:48:52 +09:00
smoogipoo
53f507f51a Fade background 2020-06-18 22:27:10 +09:00
smoogipoo
ecdfcb1955 Display placeholder if no statistics available 2020-06-18 22:21:30 +09:00
smoogipoo
6c8a24260b Add padding 2020-06-18 17:06:05 +09:00
smoogipoo
c31a05977d Re-implement statistics as a click-in panel 2020-06-18 16:50:45 +09:00
smoogipoo
725b2e540b wip 2020-06-17 22:29:00 +09:00
smoogipoo
5e74985eda Add scrolling capability to results screen 2020-06-17 19:28:40 +09:00
Shivam
693a760a19 Use RelativeSizeAxes for width 2020-06-16 15:44:59 +02:00
Shivam
d1086a49a3 Merge branch 'master' of https://github.com/ppy/osu into fallback-intro 2020-06-16 15:11:18 +02:00
smoogipoo
e7687a0927 Temporary placement inside results screen 2020-06-16 17:49:43 +09:00
smoogipoo
a2ddb4edb4 Change interface for creating statistic rows 2020-06-16 17:49:28 +09:00
smoogipoo
9442fc00ac Temporary hack to make replay player populate scores 2020-06-16 17:48:59 +09:00
smoogipoo
89b54be673 Add initial implementation of the statistics panel 2020-06-15 22:45:18 +09:00
Dean Herbert
17a70bf6ee Add test coverage 2020-06-15 20:32:27 +09:00
Dean Herbert
c3c5a99a22 Load imported scores to results screen rather than gameplay 2020-06-15 20:23:35 +09:00
BananeVolante
4e7d60b6ff Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
updated local source
2020-06-15 12:58:47 +02:00
Dan Balasescu
95d828cb1f
Merge pull request #9282 from peppy/fix-editor-timeline-drag-scroll
Fix drag scroll in editor timeline no longer working correctly
2020-06-15 11:47:09 +09:00
Dean Herbert
0d53d0ffc8 Fix back-to-front math 2020-06-15 00:46:20 +09:00
Dean Herbert
abe07b742e Fix drag scroll in editor timeline no longer working correctly 2020-06-14 13:20:58 +09:00
Dean Herbert
7b95c55afb Fix HardwareCorrectionOffsetClock breaking ElapsedTime readings 2020-06-14 11:33:59 +09:00
Shivam
4bfc16b4ce Implement changes from review
Moves seeya back to the introscreen and uses a virtual string to change whenever it's needed and removed remainingTime()
2020-06-13 17:48:15 +02:00
BananeVolante
04c1efe298 resolved issues with inspect code script 2020-06-13 14:33:55 +02:00
BananeVolante
794b8673e2 formated using dotnet format 2020-06-13 10:56:02 +02:00
BananeVolante
8b8f2dfda2 Removed duplicate samplepause.stop() calls, removed test lines
Since restart() always call perform immediate exit when the function lead
to a restart, there is no need to stop the pause sample in restart
2020-06-13 10:31:54 +02:00
BananeVolante
6fd8548f79 no longer crash if the restart sample isn't found 2020-06-13 10:13:41 +02:00
BananeVolante
e8db2cfd6d Merge branch 'master' of https://github.com/ppy/osu
updated local source
2020-06-12 19:31:26 +02:00
BananeVolante
2feaf2c74a added music during pause 2020-06-12 19:17:52 +02:00
Shivam
81c392b841 Change hash to be lowercase and change sample directories 2020-06-12 15:57:23 +02:00
Dean Herbert
c0afe4c880
Merge branch 'master' into fallback-intro 2020-06-12 17:19:11 +09:00
smoogipoo
b7c1cfbe63 Adjust display to avoid overlaps 2020-06-11 15:07:14 +09:00
smoogipoo
7b012f1def Fix test failures 2020-06-11 14:55:49 +09:00
smoogipoo
afa5b995f2 Merge branch 'fix-test-nullref' into timeshift-results-2 2020-06-11 14:05:05 +09:00
smoogipoo
88aed1d504 Merge branch 'master' into update-inspectcode-version 2020-06-09 20:12:39 +09:00
Dan Balasescu
527577d7c3
Merge pull request #9236 from MiraiSubject/logovisualisation-subclass
Move user and skin specific settings for LogoVisualisation to a subclass
2020-06-09 19:16:24 +09:00
smoogipoo
05b1edb9d8 Fix incorrect beatmap showing 2020-06-09 19:01:02 +09:00
smoogipoo
4fd5ff61eb Add loading spinner 2020-06-09 18:53:55 +09:00
smoogipoo
44dd7d65be Fix duplicate scores showing 2020-06-09 18:21:37 +09:00
smoogipoo
7f05c16c9f Merge branch 'master' into timeshift-results-2 2020-06-09 15:59:13 +09:00
Dan Balasescu
1476412eaa
Merge branch 'master' into startup-safety 2020-06-09 13:55:33 +09:00
Dean Herbert
9d68a95f3f
Merge branch 'master' into multi-room-load-spinner 2020-06-09 10:56:56 +09:00
Shivam
a60bb5feac Rename baseclass, add xmldoc & change access to internal 2020-06-08 23:45:40 +02:00
Shivam
0b6ae08c93 Removed unneeded properties 2020-06-08 21:31:03 +02:00
Shivam
d52e3f9386 Removed logovisualisation changes
Now depends on https://github.com/ppy/osu/pull/9236 for accent color changes to apply
2020-06-08 21:26:48 +02:00
Shivam
2a5e960025 Move user and skin specific settings to a subclass 2020-06-08 21:15:51 +02:00
Shivam
e821d787b4 Implement suggested changes
Note: LogoVisualisation is likely going to be needed in a separate PR to conform to the review.
2020-06-08 20:13:02 +02:00
Shivam
229a40e6e3 Code formatting fixed
Somehow slipped through after pushing
2020-06-08 15:39:15 +02:00
Shivam
f80cdeac5c Change transforms to roughly match fallback visually 2020-06-08 15:31:30 +02:00
Dean Herbert
dd61d6ed04 Attempt to reimport intro if a bad state is detected 2020-06-08 14:48:42 +09:00
Dean Herbert
72ada020a2 Don't attempt to use virtual track for intro sequence clock 2020-06-08 13:42:16 +09:00
smoogipoo
bb89114b70 Show a loading spinner on multiplayer lounge loads 2020-06-05 20:52:27 +09:00
smoogipoo
caf94df0d0 Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-05 19:16:05 +09:00
Dean Herbert
5d1770dec8
Merge pull request #9212 from smoogipoo/fix-scorepanel-input
Fix score panel not receiving input in some places
2020-06-05 00:26:02 +09:00
smoogipoo
afcefe01bf Fix score panel not receiving input in some places 2020-06-04 21:48:55 +09:00
smoogipoo
5d7bb8cb4e Change format of date on score panel 2020-06-04 21:33:38 +09:00
Shivam
d002c0c03f Revert piano reverb to a separate sample 2020-06-03 11:39:08 +02:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
smoogipoo
3c07defa1a Push to main multiplayer screen instead 2020-06-03 15:57:01 +09:00
Dan Balasescu
8131137fea
Merge branch 'master' into fix-results-crash 2020-06-03 15:19:30 +09:00
smoogipoo
22f4e9012c Remove temporary code 2020-06-03 12:54:16 +09:00
smoogipoo
13622eff1f Fix response value 2020-06-03 12:54:07 +09:00
Dean Herbert
5740fc2bd0
Merge pull request #9168 from Game4all/fix-ruleset-no-autoplay
Fix crash after using Ctrl+Enter when current ruleset doesn't have an autoplay mod
2020-06-03 12:50:57 +09:00
Shane Woolcock
b174daa94a Remove unused using 2020-06-03 11:58:56 +09:30
Shane Woolcock
96e3c6e8e8 Move check to SoloResultsScreen 2020-06-03 11:36:47 +09:30
Shane Woolcock
90213d079d Include submission status in check 2020-06-03 10:48:27 +09:30
Shane Woolcock
f4f84ede6a Fix results screen crashing for beatmaps with no online ID 2020-06-03 10:43:16 +09:30
Shivam
9cd66dcdef Fix styling error 2020-06-02 21:54:39 +02:00
Shivam
b79773cdb1 Modify LogoVisualisation to allow color changes
Also change the color from blue to dark blue
2020-06-02 21:50:50 +02:00
Shivam
4ebc1d3721 Add original sprite and visualiser
Notes: This is using a modified version of welcome.osz to facilitate the visualiser and the animation of the sprite is not accurate.
2020-06-02 21:06:41 +02:00
Lucas A
275d95082a Fix crash in testing environment. 2020-06-02 16:01:01 +02:00
Dean Herbert
a3e31adbf9
Merge pull request #9146 from peppy/taiko-editor
Implement osu!taiko editor
2020-06-02 21:49:20 +09:00
Lucas A
f63c66396f Apply review suggestions. 2020-06-02 13:32:52 +02:00
Shivam
3d78ec90ac Rename legacy to welcome to match osu-resources 2020-06-02 13:26:37 +02:00
Shivam
574e8444b0
Merge branch 'master' into fallback-intro 2020-06-02 13:15:58 +02:00
Shivam
888b90b426 Rename IntroFallback classes to IntroLegacy
This commit also renames files accordingly with https://github.com/ppy/osu-resources/pull/103
2020-06-02 13:14:50 +02:00
Shivam
19d73af90d Implement basic intro sequence 2020-06-02 12:51:42 +02:00
Shivam
3ae97c9634 Change "Fallback" to "Welcome" visually 2020-06-02 11:25:57 +02:00
Shivam
2aadb9deba Implement welcome and seeya samples 2020-06-02 11:05:18 +02:00
Dean Herbert
b58c22c36e Merge branch 'master' into taiko-editor 2020-06-02 17:22:40 +09:00
smoogipoo
fac96f6ddd Fix match beatmap not updating after re-download 2020-06-02 17:02:01 +09:00
Dean Herbert
64550fe87c
Merge branch 'master' into fix-draining-in-between-break-sections 2020-06-02 16:06:08 +09:00
smoogipoo
17e91695e0 Add checksum validation to the panel download buttons 2020-06-02 14:04:51 +09:00
smoogipoo
68fbe9f4c1 Add checksum validation to the ready/start button 2020-06-02 14:03:50 +09:00
Shivam
578c955658 Add fallback intro screen 2020-06-02 03:48:23 +02:00
Lucas A
e9b09373e7 Fix crashing if selected ruleset doesn't have an autoplay mod. 2020-06-01 17:41:04 +02:00
Dan Balasescu
e8a25fea1a
Merge branch 'master' into results-screen-horizontal-scroll 2020-06-01 17:34:20 +09:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
189ad61daa Merge branch 'master' into taiko-editor 2020-05-31 22:42:34 +09:00
Dean Herbert
f2dadeeeb5 Allow horizontal scroll on results screen when not hovering expanded panel 2020-05-31 13:50:42 +09:00
Dean Herbert
d4b7c81f96
Merge branch 'master' into results-screen-condensed-panel 2020-05-30 23:13:52 +09:00
Dean Herbert
dd7dbfd548 Rename to IHasDuration 2020-05-29 16:45:47 +09:00
Dean Herbert
534dccc0c3 Move sett from EndTime to Duration 2020-05-29 16:45:47 +09:00
Dean Herbert
a2eec5d963 Fix strong bindable changes for DrumRolls 2020-05-29 16:45:47 +09:00
Dean Herbert
e8b43e8e1f Merge branch 'master' into move-setter-to-duration 2020-05-29 16:04:23 +09:00
smoogipoo
a606f41297 Add button to open results 2020-05-28 22:25:00 +09:00
smoogipoo
ee59182989 Implement initial structure for room scores 2020-05-28 22:09:11 +09:00
smoogipoo
013461377e Fix potential nullref 2020-05-28 21:46:02 +09:00
smoogipoo
47d5974f04 Improve results screen behaviour when changing selected score 2020-05-28 21:40:01 +09:00
smoogipoo
ad99d85468 Resolve several positioning errors 2020-05-28 21:29:16 +09:00
smoogipoo
666cbd0f40 Allow selected score to be programmatically changed 2020-05-28 21:09:03 +09:00
smoogipoo
a55ce26130 Allow null score 2020-05-28 20:46:17 +09:00
Dan Balasescu
74ad734270
Merge pull request #9125 from peppy/fix-save-causing-delete
Fix saving in the editor causing the current beatmap to change
2020-05-27 21:40:58 +09:00
Dean Herbert
9928bff664
Merge branch 'master' into results-screen-condensed-panel 2020-05-27 21:19:33 +09:00
Dean Herbert
9a060cfb3a Allow drag selections to occur from outside the playfield 2020-05-27 20:44:15 +09:00
Dean Herbert
f989f1aa00 Change event flow to avoid firing store delete events on update 2020-05-27 16:08:47 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
b8e0a6f127 Move sett from EndTime to Duration 2020-05-27 12:37:44 +09:00
smoogipoo
c07a33b24f Fix ctor accessibility 2020-05-26 17:31:50 +09:00
Dean Herbert
7e1e26de2a Allow HandleMovement by default 2020-05-26 17:04:31 +09:00
smoogipoo
de0b6ec9f1 Create abstract implementation 2020-05-26 17:00:41 +09:00
smoogipoo
c86a003ef9 Adjust transition for smaller sizes 2020-05-26 16:27:41 +09:00
smoogipoo
906a317a3d Reduce casting 2020-05-26 16:26:53 +09:00
smoogipoo
1768cbd131 Format score same as expanded panel 2020-05-26 15:56:56 +09:00
smoogipoo
51e74687f8 Merge branch 'editor-scrolling-playfield-support' of https://github.com/peppy/osu; branch 'results-screen-condensed-panel' of https://github.com/smoogipoo/osu into results-screen-condensed-panel 2020-05-26 15:39:39 +09:00
Dean Herbert
d041de63ce Allow SelectionHandler to provide custom context menu items without local hover check 2020-05-26 13:53:09 +09:00
Dean Herbert
decdc58de5 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-24 12:55:47 +09:00
Dean Herbert
a3a9810344 Merge branch 'master' into editor-clock-cache 2020-05-23 00:44:04 +09:00
Dean Herbert
12d65f305f Simplify and fix incorrect seeking 2020-05-22 22:11:55 +09:00
smoogipoo
d5ea076427 Merge branch 'master' into results-screen-condensed-panel 2020-05-22 20:45:39 +09:00
smoogipoo
80388feac4 Disable scroll user scroll controls in list 2020-05-22 20:39:02 +09:00
smoogipoo
6bcc4c95cc Schedule api callback 2020-05-22 20:19:23 +09:00
Dean Herbert
1486a44b55 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-22 19:51:02 +09:00
Dean Herbert
8b79e14225 Fix remaining test regressions 2020-05-22 19:49:49 +09:00
Dean Herbert
5ea33f4c04 Fix incorrect rounding in DragBar 2020-05-22 19:23:07 +09:00
Dean Herbert
866db629d6 Fix remaining test failures 2020-05-22 18:23:24 +09:00
Dean Herbert
d18eb663b1 Add tweening seek support to EditorClock 2020-05-22 16:47:52 +09:00
Dean Herbert
dd09d7830d Cache and resolve editor clock as EditorClock in all cases 2020-05-22 16:44:06 +09:00
smoogipoo
899b9f8060 Fix incorrect sorting order 2020-05-21 22:26:04 +09:00
smoogipoo
45244683de Fix scrolling (1-frame + maintain scroll position) 2020-05-21 22:07:06 +09:00
smoogipoo
d0f74c2b68 Refactor initial state 2020-05-21 20:48:25 +09:00
smoogipoo
7b82a5d792 Fix score order 2020-05-21 20:48:08 +09:00
smoogipoo
717869225e Rework list to use a scroll container + add spacing 2020-05-21 19:51:36 +09:00
smoogipoo
b6a1d1a2fc Improve transforms between state changes 2020-05-21 18:07:31 +09:00
smoogipoo
700b5e0c73 Adjust design 2020-05-21 17:47:27 +09:00
Dean Herbert
8a47e2431b Move distance snap grid implementation to OsuHitObjectComposer 2020-05-21 17:13:22 +09:00
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
Endrik Tombak
f893d523f5 User setting for always playing first combo break 2020-04-19 12:23:41 +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