1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 16:07:31 +08:00
Commit Graph

2668 Commits

Author SHA1 Message Date
Dean Herbert
c1cdff8505 Add default resolution to avoid crashing 2018-09-07 19:29:51 +09:00
Dean Herbert
bb67f1a361 Merge remote-tracking branch 'upstream/master' into add-skin-import-delete 2018-09-07 18:18:03 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete 2018-09-07 16:48:01 +09:00
Dean Herbert
2c0ba401d5 Add ability to click on imported complete notification to present last import 2018-09-07 16:30:11 +09:00
Dean Herbert
bf0ad723f5 Add default fallback for headless operation 2018-09-07 14:35:38 +09:00
Dean Herbert
f76d00e8ae Simplify null checks 2018-09-07 14:31:38 +09:00
Dean Herbert
8b217ad803
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-09-07 14:25:10 +09:00
Dean Herbert
ab7c0ccd18 Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing 2018-09-06 18:00:54 +09:00
Dean Herbert
1f47714786
Merge pull request #3355 from peppy/fix-toolbar-blip
Fix the toolbar being visible during startup causing a weird offset
2018-09-06 17:35:24 +09:00
Dean Herbert
0cefd89ef7 Change transition to match, looks better 2018-09-06 17:22:51 +09:00
Dean Herbert
a9d4b56aeb
Merge branch 'master' into fix-web-request-schedules 2018-09-06 17:18:09 +09:00
Dean Herbert
016e395787 Fix disposal logic 2018-09-06 17:11:23 +09:00
Dean Herbert
ccd7c1a17d Cancel request on disposal for safety 2018-09-06 17:04:33 +09:00
Dean Herbert
6a668ffe33 Allow PrivateChannelTab to derive from ChannelTab 2018-09-06 17:00:07 +09:00
Dean Herbert
119f81b86e Fix disposal issues in ChatOverlay testcase 2018-09-06 15:56:04 +09:00
smoogipoo
d5acc96efa Apply changes in line with osu!framework changes 2018-09-05 14:59:37 +09:00
Joehu
77455e4463 Fix direct list play button disappearing after preview/switch 2018-09-04 19:44:49 -07:00
Dean Herbert
581da108fc Rewrite to not suck 2018-09-05 11:32:38 +09:00
Dean Herbert
46b6601cbf Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode 2018-09-05 10:47:34 +09:00
Dean Herbert
da3eb18784 Fix the toolbar being visible during startup causing a weird offset 2018-09-05 10:46:19 +09:00
Dean Herbert
923acfbeaf Fix some web requests being run after disposal of their owner 2018-09-05 10:26:54 +09:00
Dean Herbert
ce92c8d2eb
Merge branch 'master' into Private_Messages 2018-09-05 02:40:02 +09:00
Dean Herbert
5efa9c7652 Fix items in skin settings not always being removed corrrectly 2018-09-03 11:51:03 +09:00
Dean Herbert
144e80dff6 Add "import all skins from stable" option (and mass delete) 2018-09-03 10:10:04 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
Dean Herbert
37bae8c840 Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework 2018-08-30 14:58:25 +09:00
smoogipoo
327bc708d7 Fix DirectOverlay performing webrequests on startup 2018-08-30 14:41:09 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages 2018-08-24 17:26:33 +09:00
Dean Herbert
9f3f07df2e Fix notifications appearing too early in load process 2018-08-23 11:21:56 +09:00
smoogipoo
ce367bcc42 Fix invalid GC latency mode being set 2018-08-22 12:02:14 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button 2018-08-21 19:15:20 +09:00
smoogipoo
aa3f6337a2 Add comment 2018-08-15 09:14:07 +09:00
smoogipoo
f69bc23ab8 Overflow mod select to account for parallax 2018-08-14 17:26:25 +09:00
smoogipoo
2a5b9f79ff Indent 2018-08-08 15:49:27 +09:00
smoogipoo
ee0cefdd5b Merge remote-tracking branch 'origin/master' into direct-list-view 2018-08-08 15:48:34 +09:00
Dean Herbert
4cb7063801 Add automated testing of mod preservation/removal 2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c Fix mod selection not restoring when re-entering song select 2018-08-07 14:49:44 +09:00
Dean Herbert
6d6fea47ab Reduce animations of osu!direct list mode
The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.
2018-08-05 14:36:09 +09:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages 2018-08-04 00:33:46 +02:00
Dean Herbert
fc8526d8ba
Merge branch 'master' into scroll-chat-on-message 2018-08-03 20:09:54 +09:00
Dean Herbert
b4ef3dd4dd Add LocalMessage 2018-08-03 20:03:43 +09:00
Dean Herbert
4c57e629ff Use private implementation 2018-08-03 19:32:34 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections 2018-08-03 18:48:31 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button 2018-08-02 20:25:45 +09:00
Dean Herbert
70ee7e4afd Scroll chat to end of buffer when posting a new message 2018-08-02 08:00:14 +09:00
smoogipoo
b9814b64ed Move default button implementation from TriangleButton to OsuButton 2018-08-01 17:02:38 +09:00
Shane Woolcock
47533f83c3 Update TabControl subclasses to use AddInternal 2018-07-31 20:52:11 +09:30
Dean Herbert
582bc58715 Remove unused colour propagation 2018-07-31 18:05:14 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
bcc23f10c5
Merge branch 'master' into disable-download-button 2018-07-31 17:03:41 +09:00
smoogipoo
ec31028f14 Add tooltip 2018-07-31 14:50:57 +09:00
smoogipoo
70338e087a Disable beatmap download button if not supporter 2018-07-31 14:41:31 +09:00
miterosan
b1e9a4fd24 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-07-29 23:28:34 +02:00
miterosan
8c0bcb8e3c Fix drawable crash and lload the inital messages of newly joined channels 2018-07-29 21:40:43 +02:00
miterosan
95cb21299a Remove chatTabControl and transfer the logic into ChannelTabControl. 2018-07-29 21:18:37 +02:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas 2018-07-28 12:44:34 +09:00
smoogipoo
464333cf0b Merge remote-tracking branch 'origin/master' 2018-07-26 21:28:31 +09:00
Dean Herbert
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +02:00
Dean Herbert
da730269a9 Formatting and ctor usage for required parameters 2018-07-24 15:25:47 +02:00
Dean Herbert
53f556de9a Trim whitespace 2018-07-24 15:10:55 +02:00
Dean Herbert
5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
2018-07-24 11:37:43 +02:00
miterosan
42df0c974f Rename UserChannel to private channel. 2018-07-24 05:17:57 +02:00
miterosan
9bc225e14b rename user to private 2018-07-24 05:14:47 +02:00
miterosan
e769c15d28 Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs 2018-07-24 05:14:33 +02:00
miterosan
3df1842e1c Fix that in some timing specific cases the fetched channels are not getting an visual representation.
Sadly there is not a nice way of fixing this.
2018-07-24 04:58:40 +02:00
miterosan
55f0cbf63e Finding peace with the UI thread.
There is the issue that in some cases that the ui thread blocked.
2018-07-24 04:56:34 +02:00
miterosan
2726d91594 Remove unessary usings 2018-07-23 16:05:39 +02:00
miterosan
344ec40a27 Readd usings I removed with my merge 2018-07-23 15:48:48 +02:00
miterosan
9f43e0c900 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
#	osu.Game/Overlays/Chat/ChatTabControl.cs
#	osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +09:00
Dean Herbert
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width 2018-07-17 16:36:05 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter 2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b Change default to being important 2018-07-16 13:00:21 +09:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state 2018-07-16 03:17:26 +09:00
Dean Herbert
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
Dean Herbert
81e5a37d6d Enlist a few more important notifications 2018-07-14 03:31:19 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +09:00
Dean Herbert
d63611a9b3
Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
Dean Herbert
ac4f25c5bc Make notifications less noisy 2018-07-13 21:25:08 +09:00
Dean Herbert
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
Dan Balasescu
3d136ef0f9
Merge branch 'master' into fix-ugly-line 2018-07-13 18:08:55 +09:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
Dean Herbert
09be9c2ed2 Merge remote-tracking branch 'upstream/master' into naoey-download-button-state 2018-07-13 14:52:10 +09:00
Dean Herbert
ac078153ae Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods 2018-07-13 14:20:56 +09:00
Dean Herbert
20b805f9eb
Merge branch 'master' into fix-key-binding-row 2018-07-12 20:06:47 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
ekrctb
55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
Roman Kapustin
8f9bf4bd3e Remove redundant DesktopGameWindow cast 2018-07-10 22:07:32 +03:00
HoutarouOreki
dd20663192 Lesser keyboard steps 2018-07-10 17:28:56 +02:00
smoogipoo
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
smoogipoo
0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
Dean Herbert
7f315d79c2 Fix pixel gap in user profile when scrolling 2018-07-10 13:06:03 +09:00
miterosan
d03367ef9e Fix the start animations of username and the closeButton 2018-07-09 23:12:41 +02:00
miterosan
9f9444d65a Uppercase shear... wtf 2018-07-09 22:59:29 +02:00
miterosan
73a87914f2 Rename uppcase shear width to lowercase shearwidth 2018-07-09 22:52:14 +02:00
miterosan
ad96338af7 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-07-09 22:47:34 +02:00
miterosan
ea597916ca Code cleanups 2018-07-09 22:41:53 +02:00
miterosan
ae093d2619
Merge branch 'master' into Private_Messages 2018-07-09 22:15:36 +02:00
miterosan
72ea3128fa Use the AT (@) symbol for the background 2018-07-09 22:14:47 +02:00
miterosan
290b6e5f1d Fix the crash in the visual testcase 2018-07-09 22:09:27 +02:00
Roman Kapustin
699702f8d0 Use DesktopGameWindow.GetCurrentDisplay method 2018-07-09 21:57:31 +03:00
miterosan
f681ef41ac Rename MAX_HISTORY to MaxHistory, added some logging on failures, use a lamda in ChatOverlay instead of a method pointer. 2018-07-09 20:39:16 +02:00
Roman Kapustin
3dbdfcc1e2 Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-07-09 21:31:46 +03:00
miterosan
d4f9bcdee1 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-07-09 20:14:16 +02:00
miterosan
f22f62ef40 Rename the currentChatChanged to currentChannelContainer, move drawing specific part into from chatoverlay to ChannelSelectionOverlay 2018-07-09 20:13:34 +02:00
miterosan
0c62726fd7 Rename UserTabItem to UserChannelTabItem 2018-07-09 19:48:05 +02:00
miterosan
1589b65494 Move tab related stuff to /tabs, move selection related stuff to /selection, remove channeltabcontrol 2018-07-09 19:42:57 +02:00
miterosan
66378d5847 Remove the highlight from "Start Chat" 2018-07-09 18:58:10 +02:00
miterosan
5e95995429 Rename chat to channel 2018-07-09 18:30:41 +02:00
miterosan
709d134f49 Rename DrawableChat to DrawableChannel 2018-07-09 18:23:40 +02:00
Dean Herbert
974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
Dean Herbert
df67c0498d Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
2018-07-09 17:53:39 +09:00
HoutarouOreki
930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
miterosan
c56a4ea893
Merge branch 'master' into Private_Messages 2018-07-08 19:29:33 +02:00
Dean Herbert
91777b04d8
Merge branch 'master' into download-button-state 2018-07-08 14:15:47 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
Dean Herbert
e5001b84bd Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter 2018-07-05 21:04:19 +09:00
Dean Herbert
625b9ead4c Fix links from profile top scores to beatmaps not working correctly 2018-07-05 21:00:23 +09:00
ekrctb
bbceac6cda Apply renaming of wheel -> scroll 2018-07-05 16:50:04 +09:00
Dean Herbert
e28a610757 Fix mods not correctly resetting when changing ruleset at song select 2018-07-05 13:22:52 +09:00
Jacob Odgård Tørring
2979cb96a6 attemptSeek accesses beatmap Disabled directly 2018-07-04 21:09:28 +02:00
Jacob Odgård Tørring
9248340df8
Merge branch 'master' into master 2018-07-04 20:51:05 +02:00
naoey
6ea6a10def Reduce size of download button in list view to fit hover effect 2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615 Update direct panel download button for new design
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
b33206c212 Fix selecting a button on a dialog causing both that button and exit to animate 2018-07-03 18:35:09 +09:00
miterosan
d791216505
Merge branch 'master' into Private_Messages 2018-07-03 07:58:15 +02:00
Dean Herbert
6c848f135c Add comment about last button invocation 2018-07-02 17:48:16 +09:00
Dan Balasescu
e99c05c85e
Merge branch 'master' into fix-dialog-popups 2018-07-02 17:41:16 +09:00
smoogipoo
9f405b0894 Don't hard-bail if config skin doesn't exist anymore 2018-07-02 16:49:07 +09:00
smoogipoo
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dean Herbert
596787c941 Standardise input handling of popup dialogs 2018-07-02 14:25:12 +09:00
Roman Kapustin
4af45b7518 Do not display resolutions lower than 800x600 2018-06-30 20:06:11 +03:00
miterosan
621f4218a3
Merge branch 'master' into Private_Messages 2018-06-30 16:17:56 +02:00