1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 06:02:55 +08:00
Commit Graph

3786 Commits

Author SHA1 Message Date
smoogipoo
ac0bc53c4b Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
2019-01-31 00:02:05 +09:00
smoogipoo
5e78f51e24 Fix multiplayer crashing when exiting from lounge 2019-01-30 23:56:03 +09:00
smoogipoo
82dc7f39a3 Update licenses 2019-01-29 21:48:35 +09:00
smoogipoo
b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
8118b649d8
Merge branch 'master' into show-mods-on-loader 2019-01-28 14:11:54 +09:00
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level 2019-01-28 13:49:12 +09:00
Jack Scotson
6a2100ddba
Merge branch 'master' into menu-globalaction-select 2019-01-27 19:13:34 +00:00
Scotsoo
c00636d328 Removing whitespace 2019-01-27 19:09:30 +00:00
Scotsoo
29c02fbaa7 Remove redundant space 2019-01-27 18:27:11 +00:00
Scotsoo
07bb278ec0 Considering GlobalActions in GameplatMenuOverlay 2019-01-27 18:19:20 +00:00
LeNitrous
a1ce7e9a95 add ModDisplay on PlayerLoader 2019-01-26 17:14:45 +08:00
Unknown
1fa87521f6 fix restarting with a different track in the same BeatmapSet 2019-01-26 07:29:30 +01:00
Unknown
3d5520d277 correctly loop from preview point in SongSelect 2019-01-26 07:09:01 +01:00
smoogipoo
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
smoogipoo
60cc2314ef Fix ruleset + beatmap being changeable in match 2019-01-25 21:02:30 +09:00
phosphene47
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11:00
smoogipoo
b3403c78da Fix a few potential crashes 2019-01-25 20:47:37 +09:00
smoogipoo
e2891ab1e9 Fix anchors + origins 2019-01-25 20:47:31 +09:00
smoogipoo
95e6785968 Make Multiplayer not an OsuScreen 2019-01-25 20:25:55 +09:00
smoogipoo
e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
Dean Herbert
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
smoogipoo
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +09:00
smoogipoo
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +09:00
Dean Herbert
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
ProgrammaticNajel
593e0b36f5 Add overflow padding in other multiplayer screen components
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
smoogipoo
50a384e19c Fix game not exiting 2019-01-24 20:13:19 +09:00
smoogipoo
28f5c950ec Fix player never completing load 2019-01-24 19:55:42 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
ProgrammaticNajel
9fcefa7d69 Typo fix 2019-01-24 18:18:32 +08:00
ProgrammaticNajel
e4084b7d5d Add overflow padding in other multiplayer screen components
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545 Add overflow padding to account for parallax shifting
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +09:00
chrisny286
76700ad20f Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf replace FadeTo in PlayerLoader
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
4180ca75bc
Fix typo in comment 2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7 use Color4.Black and White + using osuTK.Graphics 2019-01-23 09:08:34 +01:00
chrisny286
5d2b2ecf06 Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a Fix backgrounds being transparent in some scaling modes
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a Formatting fixes 2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
chrisny286
13ba9d64d0 revert empty line 2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07 revert and make VisibilityContainer not AlwaysPresent 2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f add check if replay is loaded before allowseeking can be overwitten 2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb Fix autoplay rewind/skip usable when UI hidden 2019-01-23 01:16:37 +01:00
Dean Herbert
5ea6e8e247 Allow full osu!direct usage regardless of supporter status for now 2019-01-22 14:22:38 +09:00
Dean Herbert
c58fe4f4ff Fix nullref 2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219 Fix replay playback speed not being displayed initially 2019-01-22 11:40:57 +09:00
Dean Herbert
21317806c9 Merge remote-tracking branch 'upstream/master' into nwabear-master 2019-01-22 10:07:35 +09:00
Dean Herbert
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
Dean Herbert
b373d78143 Add slight easing 2019-01-22 09:47:51 +09:00
Dean Herbert
25b5bbcd8f
Merge branch 'master' into score-panel-layout 2019-01-22 09:43:37 +09:00
Christian Kamphausen
86581feb4a
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H 2019-01-22 01:29:58 +01:00
chrisny286
d7d2e2fe44 trimmed whitespace 2019-01-21 19:22:19 +01:00
chrisny286
65fd69c817 Update HUDOverlay.cs
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
chrisny286
fb51578df3 Update PlayerSettingsOverlay.cs
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
ekrctb
e74f0057bd Automatically layout based on score display width 2019-01-21 17:07:56 +09:00
Shane Woolcock
fa6dd8c99e Code sanity 2019-01-20 19:03:06 +10:30
Shane Woolcock
521b11dfcb Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
2019-01-20 18:51:17 +10:30
Dean Herbert
5269ca31be
Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
Dean Herbert
1d40d88f82
Merge branch 'master' into add-room-null-check 2019-01-17 21:34:25 +09:00
Dean Herbert
59f7c5a26e Fix room inspector cover not resetting when no room selected 2019-01-17 18:44:22 +09:00
Dean Herbert
ba9cdf2ce2 Add null check to fix crash on deselecting multiplayer room 2019-01-17 18:17:47 +09:00
Dean Herbert
491537b8ba Add fade duration
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
2019-01-17 18:13:05 +09:00
Dean Herbert
c1f5c0edc9
Merge branch 'master' into hide-multiplayer-match-room-tab 2019-01-17 18:02:17 +09:00
ekrctb
2bc3464802 Hide Room tab when Settings tab is active 2019-01-17 17:27:34 +09:00
ekrctb
f982b6da55 Don't hide 'hold for menu' even hud is hidden 2019-01-17 16:49:04 +09:00
Dean Herbert
99c963c56a
Merge branch 'master' into cancel-request-on-disposal 2019-01-17 15:29:49 +09:00
ekrctb
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning 2019-01-17 14:23:03 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
Dean Herbert
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
Dean Herbert
0bf9e9b86b
Merge branch 'master' into lounge-leaderboard 2019-01-09 10:28:55 +09:00
Microgolf
097062caf7 Addresses requested changes 2019-01-08 17:57:03 +01:00
m2307
42ba690809
Merge branch 'master' into master 2019-01-08 17:53:58 +01:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
Dean Herbert
6ce08312b2
Merge branch 'master' into fix-match-select-crash 2019-01-08 20:29:55 +09:00
smoogipoo
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
smoogipoo
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
smoogipoo
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Dean Herbert
70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Matthias Coenraerds
562c9e56fb Fix naming 2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885 Verify leaderboard scope to be local 2019-01-06 13:37:30 +01:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Matthias Coenraerds
a93c26ccfd Filename does not match contained type 2019-01-04 20:40:07 +01:00
Matthias Coenraerds
3879348ee4 Implement clear scores on beatmap 2019-01-04 20:23:06 +01:00
Dean Herbert
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
Dean Herbert
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
Dean Herbert
2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +09:00
smoogipoo
72482aff8d Whoops 2018-12-28 01:48:13 +09:00
smoogipoo
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
Dean Herbert
12a93af156
Merge pull request #3939 from smoogipoo/fix-multi-mods
Fix plays with mods not submitting
2018-12-27 22:20:10 +09:00
smoogipoo
a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00
Dean Herbert
2d1736e477
Merge pull request #3936 from smoogipoo/fix-multi-mods
Ensure mods are set prior to starting play
2018-12-27 22:04:35 +09:00
smoogipoo
101fdf993e Ensure mods are set prior to starting play 2018-12-27 21:59:43 +09:00
Dean Herbert
5977fc838f Limit available durations for the time being 2018-12-27 21:59:08 +09:00
smoogipoo
50b51a168e Always submit standardised scores 2018-12-27 21:12:32 +09:00
Dean Herbert
31baf0086f Optional idle tracker 2018-12-27 20:17:27 +09:00
Dean Herbert
1ce33cb6da Adjust polling rate based on current screen and idle state 2018-12-27 20:06:07 +09:00
smoogipoo
eaba9e1378 Fix mode icon not being updated for correct ruleset 2018-12-27 18:16:30 +09:00
smoogipoo
9a5630b3d5 Fix working beatmap not being updated 2018-12-27 18:16:30 +09:00
Dean Herbert
d6c53e3851 Cancel old web requests when changing filter modes 2018-12-27 18:09:42 +09:00
smoogipoo
b0e8561ad3 Fix ruleset not changing correctly 2018-12-27 17:48:10 +09:00
smoogipoo
dae710f9a6 Make leaderboard top not fade by default 2018-12-27 17:29:55 +09:00
phosphene47
3c677970cd Add menu background skinning for supporters 2018-12-27 17:25:28 +09:00
smoogipoo
ea1309e768 Fix missing bind 2018-12-27 17:15:43 +09:00
smoogipoo
bd0576537e Forcefully exit multiplayer if API loses connectivity 2018-12-27 17:12:58 +09:00
smoogipoo
f70e60747f Remove option for 1-minute duration 2018-12-27 16:54:14 +09:00
smoogipoo
8e031325dd CI fixes 2018-12-27 16:28:17 +09:00
smoogipoo
50201e602e Combine implementations of status + end date info 2018-12-27 16:19:00 +09:00
Dean Herbert
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4 Add + set ended room status 2018-12-27 13:32:44 +09:00
Dean Herbert
cc1f3d54b0 Fix looping failure 2018-12-26 22:37:09 +09:00
Dean Herbert
f6aa6e6b3c Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip 2018-12-26 22:16:41 +09:00
Dean Herbert
8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +09:00
smoogipoo
e7310a16c7 Fix playlist not updating correcly 2018-12-26 22:14:49 +09:00
Dean Herbert
a1fa914c66 Participants 2018-12-26 21:58:14 +09:00
Dean Herbert
bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
#	osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/IRoomManager.cs
#	osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
#	osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00
smoogipoo
2d19436456 Open -> Push 2018-12-26 21:21:26 +09:00
smoogipoo
152f3b1da3 Add processing overlay to lounge screen 2018-12-26 21:20:53 +09:00
smoogipoo
0c384417f1 Add processing overlay to room creation process 2018-12-26 21:19:02 +09:00
Dean Herbert
26834abd33 Fade and no schedule 2018-12-26 21:18:55 +09:00
smoogipoo
5af29f8384 Reduce code duplication 2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb Add error message when creation fails 2018-12-26 21:18:44 +09:00
smoogipoo
9901b11600 Display room join errors as notifications 2018-12-26 21:18:11 +09:00
Dean Herbert
8386e206c3 Update ParticipantInfo 2018-12-26 20:35:54 +09:00
Dean Herbert
5bd3ab51dd Open -> Push 2018-12-26 20:35:54 +09:00
Dean Herbert
6f0d13e36b Move PartRoom calls 2018-12-26 20:35:54 +09:00
smoogipoo
9d305ba024 Reduce code duplication 2018-12-26 20:33:19 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +09:00
smoogipoo
052ab4763a Display room join errors as notifications 2018-12-26 20:32:36 +09:00
Dean Herbert
7a431ed87f Update ParticipantInfo 2018-12-26 20:31:04 +09:00
Dean Herbert
869081ce9c Open -> Push 2018-12-26 20:21:30 +09:00
Dean Herbert
692f5c289d Move PartRoom calls 2018-12-26 20:12:51 +09:00
Dean Herbert
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
Dean Herbert
532a970c0f Give leaderboard and chat more breathing room 2018-12-26 19:20:54 +09:00
Dean Herbert
0cefd4b21d Improve room padding 2018-12-26 19:14:15 +09:00
Dean Herbert
f442e59620 Icon and beatmap title visual pass 2018-12-26 18:01:53 +09:00
Dean Herbert
c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20 RoomSettingsOverlay -> MatchSettingOverlay 2018-12-26 16:50:50 +09:00
Dean Herbert
6e8c46f00b Fix padding and use grid container for more correctness 2018-12-26 15:23:57 +09:00
Dean Herbert
755c6b9243 Make room settings scroll 2018-12-26 15:03:35 +09:00
Dean Herbert
e9556afe22 Don't use all uppercase (is applied automatically) 2018-12-26 14:26:35 +09:00
Dean Herbert
e4a72c0c64 Fix failing testcase 2018-12-26 13:18:36 +09:00
smoogipoo
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
smoogipoo
2f32c4d4d1 Fix title of match song select 2018-12-25 17:17:51 +09:00
smoogipoo
d4f5a8507c Exit from match screen on escape 2018-12-25 17:14:56 +09:00
smoogipoo
91b83cd4b8 Fix leaderboard being queried on room creation 2018-12-25 13:57:25 +09:00
smoogipoo
23d21a45e5 More automated tests 2018-12-25 11:59:08 +09:00
smoogipoo
626ec85ae8 Remove IHasFilterableChildren from class 2018-12-25 11:58:28 +09:00
smoogipoo
6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +09:00
smoogipoo
f79aa07d02 Fix enddate not being bound to 2018-12-25 11:31:36 +09:00
smoogipoo
e0e75c7339 Fix incorrect room status 2018-12-25 11:24:46 +09:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
smoogipoo
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
Dan Balasescu
e6c197e9aa
Merge branch 'master' into improve-text-search 2018-12-22 16:38:50 +09:00
Dean Herbert
005c6ff40c Add tooltip text to results screen pages 2018-12-22 16:30:06 +09:00
smoogipoo
bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dean Herbert
a35d9178f0 Quick rename 2018-12-22 16:20:29 +09:00
Dean Herbert
e7508cbd5e Fix CI issues 2018-12-22 15:55:10 +09:00
Dean Herbert
e404a0bc20 Clean-ups and renames 2018-12-22 15:51:00 +09:00
smoogipoo
baed0ef3ba Rename variable 2018-12-22 15:46:04 +09:00
smoogipoo
b9ec179713 Split out more requests + responses 2018-12-22 15:45:16 +09:00
smoogipoo
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
smoogipoo
ac0e6f8d42 Fix post-merge issues 2018-12-22 15:35:22 +09:00
smoogipoo
bdb6e03dfb Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
# Conflicts:
#	osu.Game/Online/Leaderboards/Leaderboard.cs
#	osu.Game/Online/Leaderboards/LeaderboardScore.cs
#	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
#	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
Dean Herbert
787e65c3c5 Reduce generic-ness 2018-12-22 15:20:35 +09:00
smoogipoo
3570c35d7f Make RoomScore derive ScoreInfo 2018-12-22 15:17:35 +09:00
smoogipoo
6afd2f7263 Adjust styling of disabled settings 2018-12-22 15:00:35 +09:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
smoogipoo
b82bb0ea28 Mate RoomSettingsOverlay fill height 2018-12-22 14:40:10 +09:00
smoogipoo
09d7dc73dc Allow channel manager and osugame to be null 2018-12-22 14:38:46 +09:00
smoogipoo
dbd391825a Rework+fix TestCaseMultiHeader 2018-12-22 14:30:08 +09:00
smoogipoo
7191233be8 Allow roommanager to be null 2018-12-22 14:14:14 +09:00
smoogipoo
21cfe5a3e6 Decouple header from matchscreen 2018-12-22 14:12:27 +09:00
smoogipoo
c06cf5d379 Decouple match info from match screen 2018-12-22 14:08:00 +09:00
smoogipoo
d93421b796 Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
smoogipoo
f1a9a352fc Cleanup bindable handling 2018-12-22 14:01:06 +09:00
smoogipoo
1cb69c3478 Split requests/responses into separate files 2018-12-22 12:50:37 +09:00
smoogipoo
dd0c04ea36 Move RoomManager to multiplayer screen 2018-12-22 12:45:36 +09:00
smoogipoo
7e9cc4e876 Seed the results screen 2018-12-21 18:37:33 +09:00
smoogipoo
4149734f89 Add room leaderboard to results 2018-12-21 18:22:13 +09:00
smoogipoo
8a2cc64bfa Split results screen to allow for extensibility 2018-12-21 16:34:03 +09:00
smoogipoo
fe6c369e07 Fix incorrect channel 2018-12-21 14:37:05 +09:00
smoogipoo
fa2bc16140 Remove participants, add match chat 2018-12-21 14:01:11 +09:00
smoogipoo
14879acd83 Fix possible nullref 2018-12-21 13:26:50 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
smoogipoo
822225577b Add joining/parting room requests 2018-12-20 20:58:34 +09:00
smoogipoo
9031896484 Fix create room button showing in song select 2018-12-20 20:09:17 +09:00
smoogipoo
6a76e335c7 Linkify everything 2018-12-20 20:03:45 +09:00
smoogipoo
deaf4ab4a1 Cleanup 2018-12-20 18:21:55 +09:00
smoogipoo
8db3ac0a9f Make user links clickable 2018-12-20 18:04:39 +09:00
smoogipoo
1701af61d6 Add host avatar+username to match screen 2018-12-20 18:04:22 +09:00
smoogipoo
2e28f378de Move beatmap + mod info to header 2018-12-20 15:17:33 +09:00
smoogipoo
72016a416b Deselect match if ended 2018-12-20 15:17:08 +09:00
smoogipoo
03546c9d0d Implement primary filter routes 2018-12-20 15:16:46 +09:00
smoogipoo
36f6b4fc3f Hook up participated filter
Very early stages, implementation will change.
2018-12-19 18:02:05 +09:00
smoogipoo
673082445e Rework filtering 2018-12-19 16:56:51 +09:00
smoogipoo
c544a5b9f0 Add end date to the drawable room too 2018-12-19 15:20:23 +09:00
smoogipoo
a8d88dea3b Display time remaining in the room 2018-12-19 13:07:56 +09:00
smoogipoo
2c000a9a1d Disallow starting gameplay if there's not enough time in the room 2018-12-19 10:52:15 +09:00
smoogipoo
1051584f0f Fix room duration not being set 2018-12-19 10:51:54 +09:00
smoogipoo
72d1ba897f Reorder tabs 2018-12-18 18:29:13 +09:00
smoogipoo
4050cb88ea Fix potential nullref 2018-12-18 18:09:54 +09:00
smoogipoo
3cdeeb7ac5 Add forceful set helper methods in OsuGame 2018-12-18 18:09:46 +09:00
smoogipoo
e4e1bde5da Fix playlist events running too early
Screens are async loaded
2018-12-18 17:08:07 +09:00
smoogipoo
aabe6c68f5 Fix looping not working 2018-12-18 17:07:47 +09:00
smoogipoo
2f15d10029 Play track while in the multiplayer lobby 2018-12-18 14:45:35 +09:00
smoogipoo
5a8b255bd8 Directly bypass beatmap/ruleset restrictions 2018-12-18 14:17:20 +09:00
smoogipoo
8d640cdc25 Fix leaderboard not being refreshed when finishing gameplay 2018-12-18 12:56:16 +09:00
smoogipoo
cc68cf2f95 Implement duration 2018-12-17 14:44:54 +09:00
smoogipoo
279891ae08 Change "apply" button to say "create" instead 2018-12-17 13:55:42 +09:00
smoogipoo
84552b5cee Refresh leaderboard when returning to lobby 2018-12-17 11:51:28 +09:00
smoogipoo
bf8aae8d9b Boot player back to lobby if token request fails 2018-12-17 11:51:17 +09:00
smoogipoo
2fd2425cc4 Fix playlist deserialisation for creating rooms 2018-12-17 11:05:03 +09:00
Dean Herbert
eec5afa382 Change inspection and add redundant parenthesis to appease codefactor 2018-12-15 16:37:37 +09:00
Dean Herbert
3892454ecc Improve the way text search works at song select 2018-12-15 16:34:48 +09:00
smoogipoo
983a45c4d8 Fix invalid value 2018-12-14 21:21:02 +09:00
smoogipoo
9726eea0d0 Basic score submission implementation 2018-12-14 21:09:17 +09:00
smoogipoo
e8007ac37f Implement multiplayer room leaderboard 2018-12-14 21:08:55 +09:00
smoogipoo
d9fc7c7d66 Separate out Leaderboard into BeatmapLeaderboard 2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration 2018-12-14 19:45:27 +09:00
smoogipoo
de0fc2a0de Fix beatmap + ruleset being changeable 2018-12-14 17:35:18 +09:00
smoogipoo
5f0069eb83 Fix incorrect ruleset being sent to API 2018-12-14 17:35:05 +09:00
smoogipoo
edefdb18f8 Fix beatmap not having any mods when going into play 2018-12-14 16:16:38 +09:00
smoogipoo
e3ad226075 Use the local beatmap if existing, fixing player not loading objects 2018-12-14 16:11:00 +09:00
smoogipoo
83bf37a302 Enable/disable the view beatmap + ready buttons based on beatmap presence 2018-12-14 15:04:04 +09:00
smoogipoo
3de65238a2 Completely hide the select beatmap button for now 2018-12-14 14:33:50 +09:00
smoogipoo
b83f99d90a Fix up header sizing + styling 2018-12-14 14:30:39 +09:00
smoogipoo
56fd4b95cd Fix mod/beatmap selection not always working 2018-12-14 13:38:27 +09:00
smoogipoo
8e6a85058b Fix playlist-related errors 2018-12-14 12:35:05 +09:00
smoogipoo
91f6b08479 Merge branch 'timeshift-api-integration' 2018-12-13 18:38:22 +09:00
smoogipoo
680a3e2aa4 Update with proper playlist usage 2018-12-13 18:38:03 +09:00
smoogipoo
2aafaf9ce2 Merge branch 'timeshift-api-integration' 2018-12-13 17:07:39 +09:00
smoogipoo
eb0e9c0bb1 Merge branch 'match-mod-display'
# Conflicts:
#	osu.Game/Screens/Multi/Match/Components/Info.cs
#	osu.Game/osu.Game.csproj
2018-12-13 17:07:31 +09:00
smoogipoo
ca87b42758 Merge branch 'timeshift-player'
# Conflicts:
#	osu.Game/Screens/Multi/Multiplayer.cs
2018-12-13 17:06:44 +09:00
smoogipoo
208273f16a Merge branch 'timeshift'
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-13 17:06:20 +09:00
Dean Herbert
71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
smoogipoo
bac4f42eac Fix backgrounds not quite working 2018-12-12 19:34:37 +09:00
smoogipoo
450e4cd223 Hook up API 2018-12-12 19:04:11 +09:00
smoogipoo
9af2b49c01 Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
6123a11b67 Use RoomID for creation 2018-12-12 16:20:11 +09:00
smoogipoo
170955110f Add mods to the match info 2018-12-12 14:38:03 +09:00
smoogipoo
6661b5870f Merge branch 'songselect-mods' into match-mod-display
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 14:13:37 +09:00
smoogipoo
49dd6ae9b0 Move a lot more of PlaySongSelect into SongSelect 2018-12-12 13:21:44 +09:00
smoogipoo
497f431366 Implement RoomManager and RoomsContainer
Reduces logic from LoungeScreen
2018-12-11 19:07:40 +09:00
smoogipoo
bf3f5ab685 Change ready button to "Start" and make it enter player 2018-12-11 17:32:01 +09:00
smoogipoo
1ac615b490 Renamespace 2018-12-10 19:27:25 +09:00
smoogipoo
cd41c45686 Disable select beatmap button after room is created 2018-12-10 19:03:22 +09:00
smoogipoo
3c44f9e4f1 Make select beatmap button into a triangle button 2018-12-10 18:50:52 +09:00
smoogipoo
3f64cfc1c6 Don't add rooms to lounge until they're actually created 2018-12-10 18:35:08 +09:00
smoogipoo
ca544ef3fe Adjust match creation process 2018-12-10 18:25:32 +09:00
smoogipoo
77193eeea4 Move from lobby into match for creation process 2018-12-10 18:00:57 +09:00
smoogipoo
3b688c702c Use graying rather than alpha 2018-12-10 17:06:34 +09:00
smoogipoo
c7970e5425 Cleanup handling of readonly fields 2018-12-10 16:50:00 +09:00
smoogipoo
be3a912d0b Use UnbindFrom() 2018-12-10 13:48:12 +09:00
smoogipoo
352a758f5c Replace 3 occurrences of SpriteText.Current 2018-12-10 13:20:05 +09:00
smoogipoo
feb1adb51d Use bindable propagation rather than properties 2018-12-07 20:18:43 +09:00
smoogipoo
29263d7154 Refactor bindable shenanigans in Match 2018-12-07 16:20:05 +09:00
smoogipoo
d68b4bb8e7 Remove custom action from DrawableRoom 2018-12-07 14:28:43 +09:00
smoogipoo
10b526504a Move ModOverlay to SongSelect 2018-12-06 19:29:18 +09:00
smoogipoo
c02150a19b Make match header not fade when beatmap changes 2018-12-06 18:31:12 +09:00
smoogipoo
42817b98f9 Hide max participants box 2018-12-06 18:16:17 +09:00
Dean Herbert
9689c4fa17
Merge branch 'master' into user-registration 2018-12-06 17:06:43 +09:00
smoogipoo
eadbe4c470 Make beatmap selection work 2018-12-06 12:21:30 +09:00
Dean Herbert
0df9fa1e59 Remove pointless default size specification in OsuLogo 2018-12-06 11:56:16 +09:00
Dean Herbert
94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
smoogipoo
e7d7e00516 Better disabling of various controls 2018-12-05 17:01:14 +09:00
Dean Herbert
4f5028bbc1
Merge branch 'master' into fix-hudoverlay-presence 2018-12-04 22:14:54 +09:00
smoogipoo
ca91dfa091 Make hudoverlay always present 2018-12-04 19:20:32 +09:00
smoogipoo
ec83790734 Add timeshift game type 2018-12-04 18:58:45 +09:00
smoogipoo
c469d12d63 Set room host when the room is refreshed 2018-12-04 18:18:17 +09:00
smoogipoo
a7ac544e12 Add interface for the multiplayer screen short title 2018-12-04 17:43:44 +09:00
smoogipoo
b251129c59 Block going into multiplayer while logged out 2018-12-04 17:43:27 +09:00
smoogipoo
f2a57ce270 Fix room host not being set 2018-12-04 17:23:58 +09:00
smoogipoo
6e5716c3f3 Adjust transition 2018-12-04 15:32:12 +09:00
smoogipoo
a02e025f06 Fix selections not working anymore 2018-12-04 15:26:06 +09:00
smoogipoo
d8739d9dee Fix creating a new room re-using the existing model 2018-12-04 15:25:48 +09:00
smoogipoo
e22cefc27d Immediately select newly-created rooms 2018-12-04 12:49:22 +09:00
Dean Herbert
415349e6ef Add missing return 2018-12-04 12:14:26 +09:00
Dean Herbert
a33865efce Fix home button being cancelled by mod select 2018-12-04 12:06:05 +09:00
Roman Kapustin
c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
smoogipoo
6a28e8c696 Add settings to lounge 2018-12-03 18:30:26 +09:00
smoogipoo
53a54f8634 Renamespace room settings 2018-12-03 17:54:10 +09:00
smoogipoo
20b843e63c Add create tab 2018-12-03 17:50:56 +09:00
smoogipoo
51c16867d5 Remove type conversion from LoungeTab to RoomAvailability 2018-12-03 17:50:39 +09:00
smoogipoo
b1c5b43767 Fix post-rebase errors 2018-11-30 18:46:47 +09:00
smoogipoo
10ed09521c Add leaderboard display for local scores 2018-11-30 18:40:53 +09:00
smoogipoo
795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +09:00
smoogipoo
a6b0e35b2d Fix post-rebase issues 2018-11-30 18:31:54 +09:00
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
smoogipoo
4c1abdcd8c Save score upon map completion 2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
aa7a665317 Merge remote-tracking branch 'upstream/master' into scoredatabase 2018-11-30 17:20:23 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
smoogipoo
bc3fcb87b7 Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Dan Balasescu
e83f6707bf
Merge branch 'master' into editor-keyboard-seek 2018-11-30 15:17:06 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert
ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
Dean Herbert
0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
smoogipoo
a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
5b409a5ae5 Fix missed renames 2018-11-28 17:27:22 +09:00
smoogipoo
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
Dean Herbert
da79292250
Merge branch 'master' into fix_idle_tracker 2018-11-26 17:41:45 +09:00
Dean Herbert
32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
Dean Herbert
626048038c Handle the null case 2018-11-26 16:50:41 +09:00
Dean Herbert
8d65d49126 Use bindable flow for checking idle time 2018-11-26 16:32:59 +09:00
smoogipoo
dea387c31e Fix post-merge issues 2018-11-26 16:29:56 +09:00
smoogipoo
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
smoogipoo
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
Dean Herbert
fe5b043a59
Merge branch 'master' into fix_idle_tracker 2018-11-26 15:24:44 +09:00
smoogipoo
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
Dan Balasescu
b446a73c0c
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
Dean Herbert
1b76e2faf5
Merge branch 'master' into fix-editor-precise-scroll 2018-11-23 09:57:35 +09:00
Dean Herbert
10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
Dean Herbert
a48c26d999 Fix precision scroll events being handled incorrectly by editor 2018-11-22 19:40:44 +09:00
Dean Herbert
6cd69b794d Fix leaderboard accessing drawables in a possibly invalid state 2018-11-22 19:08:46 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin
3c0ce2b615 Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
This reverts commit bcdaee7d39.
2018-11-19 20:48:59 +03:00
smoogipoo
bcdaee7d39 Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
This reverts commit 3e2e2a7000, reversing
changes made to d94801b6c6.
2018-11-19 17:52:31 +09:00
smoogipoo
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
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