miterosan
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
Dan Balasescu
|
9f9447d441
|
Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"
This reverts commit 67793845b0.
|
2018-05-02 16:39:00 +09:00 |
|
TocoToucan
|
8de05450c4
|
Cleanup UserProfileOverlay during PopOut
|
2018-04-29 17:53:38 +03:00 |
|
Shane Woolcock
|
84bda7d23f
|
Update framework and ensure the add channel button is not switchable
|
2018-04-24 20:46:44 +09:30 |
|
Dean Herbert
|
eb7fe0b9e2
|
Merge branch 'master' into fix-badge-container
|
2018-04-23 19:13:34 +09:00 |
|
Dean Herbert
|
27437cfbaf
|
Merge branch 'master' into show-beatmap-id
|
2018-04-20 18:05:24 +09:00 |
|
Dean Herbert
|
0b993561d8
|
Fix BadgeContainer being unsable to handle null badges
This fixes a failing test (hidden becaues the test wasn't being run).
- [ ] Merge osu-framework#1530 first.
|
2018-04-20 16:05:34 +09:00 |
|
Dean Herbert
|
a64ed142f0
|
Use a more suiting icon for discord for now
|
2018-04-20 13:51:30 +09:00 |
|
Dean Herbert
|
8649ddc68b
|
Make forum posts a web link
|
2018-04-20 13:01:23 +09:00 |
|
Dean Herbert
|
fe644c6909
|
Merge branch 'master' into profile_web_changes
|
2018-04-20 12:51:30 +09:00 |
|
Dean Herbert
|
8eefd04fcb
|
Don't return overlay to null until it has been completely hidden
|
2018-04-20 12:47:23 +09:00 |
|
Dean Herbert
|
c77f339444
|
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
|
2018-04-20 12:41:38 +09:00 |
|
tgi74000
|
64709da546
|
Update profile header to osu-web changes
|
2018-04-19 14:46:42 +02:00 |
|
Dean Herbert
|
0356e5e6bf
|
Remove unused property
|
2018-04-19 21:00:22 +09:00 |
|
Dean Herbert
|
f7ca6267b1
|
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
|
2018-04-19 20:53:06 +09:00 |
|
miterosan
|
3b68dda23e
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-18 20:55:12 +02:00 |
|
miterosan
|
29e8c70ed7
|
Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
|
2018-04-18 20:46:42 +02:00 |
|
Dean Herbert
|
e395a47112
|
Changes to naming and text
|
2018-04-18 19:47:13 +09:00 |
|
Dean Herbert
|
bd834dd487
|
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
|
2018-04-18 19:46:59 +09:00 |
|
Dean Herbert
|
1728dd6502
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:42:09 +09:00 |
|
Dean Herbert
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
smoogipoo
|
ffbe6f2e37
|
Merge remote-tracking branch 'origin/master' into fix-rank-status
# Conflicts:
# osu.Game/Beatmaps/RankStatus.cs
# osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
# osu.Game/Overlays/Direct/FilterControl.cs
# osu.Game/Overlays/DirectOverlay.cs
|
2018-04-18 14:16:58 +09:00 |
|
Dean Herbert
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09:00 |
|
Dean Herbert
|
a827fb51bc
|
Simplify child definition
|
2018-04-18 11:42:55 +09:00 |
|
jorolf
|
ddd59382e2
|
Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges
|
2018-04-16 19:37:52 +02:00 |
|
jorolf
|
de9f15f620
|
add new test case and fix rotation not working
|
2018-04-16 19:22:11 +02:00 |
|
jorolf
|
046412f962
|
make hover lost transition instant (similar to hover transition)
|
2018-04-16 18:52:09 +02:00 |
|
jorolf
|
2a18b4c3f8
|
add a DRAWABLE_BADGE_SIZE const and center badges
|
2018-04-16 18:51:35 +02:00 |
|
jorolf
|
af0c49cca8
|
badge_size is the actual badge size now
also fixes rotateBadges bug when hover is lost
|
2018-04-16 18:27:18 +02:00 |
|
jorolf
|
af755b4a90
|
Merge branch 'master' into profile-badges
|
2018-04-15 23:50:52 +02:00 |
|
jorolf
|
6ca714d93b
|
add badges to ProfileHeader
|
2018-04-15 23:49:45 +02:00 |
|
Dean Herbert
|
c9615f837a
|
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
|
2018-04-16 00:20:06 +09:00 |
|
Dean Herbert
|
ae77c010e2
|
Merge remote-tracking branch 'upstream/master' into wave-container
|
2018-04-15 21:03:18 +09:00 |
|
Dean Herbert
|
fd54ae3c87
|
Simplify logic
|
2018-04-15 16:12:42 +09:00 |
|
Dean Herbert
|
069d48ac14
|
Remove unused variable
|
2018-04-15 15:29:00 +09:00 |
|
TocoToucan
|
671de4f6c2
|
Resolve merge conflicts
|
2018-04-14 15:11:28 +03:00 |
|
miterosan
|
142e1b8587
|
update the line endings
|
2018-04-14 13:32:48 +02:00 |
|
miterosan
|
5bfb386226
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-14 13:31:03 +02:00 |
|
Dean Herbert
|
a0f9f8d512
|
Update frramework again
|
2018-04-13 21:47:50 +09:00 |
|
smoogipoo
|
733f70cbd5
|
Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
|
2018-04-13 21:13:09 +09:00 |
|
Dean Herbert
|
9f5a52b641
|
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
|
2018-04-13 19:54:15 +09:00 |
|
Dean Herbert
|
81f0649e44
|
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
|
2018-04-13 19:50:44 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
tgi74000
|
e3cd0ef200
|
Add right click scrolling in song select (and its option)
|
2018-04-13 11:09:49 +02:00 |
|
Dean Herbert
|
a1a7e63646
|
Merge branch 'master' into ignored_input_handler
|
2018-04-13 18:05:12 +09:00 |
|
smoogipoo
|
826a8552e5
|
Reword options item to include "screenshot"
|
2018-04-13 17:30:02 +09:00 |
|
miterosan
|
a9f3885d28
|
Remove not needed using
|
2018-04-12 23:29:23 +02:00 |
|
miterosan
|
e39f5a1adf
|
Rename var chatmanager -> channelManager
Apply requested changes
|
2018-04-12 23:19:13 +02:00 |
|
TocoToucan
|
9acea6eab0
|
Order beatmap difficulty icons correctly
|
2018-04-12 19:33:30 +03:00 |
|