Dean Herbert
|
dd7020d5a4
|
Merge pull request #2398 from tgi74/rightclickscrolling
Add right click absolute scrolling in song select
|
2018-04-18 19:57:52 +09: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
|
69a91c610d
|
Merge pull request #2366 from tgi74/ctb_hr_mangling
Add HardRock position mangling for CatchTheBeat
|
2018-04-18 16:57:16 +09:00 |
|
Dean Herbert
|
d307b8dc2e
|
Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling
|
2018-04-18 16:46:02 +09:00 |
|
Dean Herbert
|
0a292a6ab4
|
Merge pull request #2415 from smoogipoo/better-test-case
Update OsuTestCase with framework testing changes
|
2018-04-18 15:56:09 +09:00 |
|
smoogipoo
|
560fcfc661
|
Update framework
|
2018-04-18 15:32:21 +09:00 |
|
smoogipoo
|
d5ce618d9b
|
Update with framework changes
|
2018-04-18 15:12:48 +09:00 |
|
Dan Balasescu
|
bc3150776e
|
Merge pull request #2377 from Joehuu/fix-rank-status
Fix qualified category on rank status
|
2018-04-18 14:33:03 +09:00 |
|
Dan Balasescu
|
533b7d907d
|
Merge branch 'master' into fix-rank-status
|
2018-04-18 14:19:53 +09:00 |
|
smoogipoo
|
68a13a5fb5
|
Update framework
|
2018-04-18 14:18:56 +09:00 |
|
Dan Balasescu
|
f8a9d9d4fe
|
Merge pull request #2381 from peppy/app-manifest
Add back app.manifest
|
2018-04-18 14:18:13 +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
|
c32ab7d08c
|
Merge branch 'master' into app-manifest
|
2018-04-18 14:10:03 +09:00 |
|
Dean Herbert
|
919f2acccd
|
Merge pull request #2400 from tgi74/replay_mods
Add support for replay mods
|
2018-04-18 14:09:54 +09:00 |
|
Dan Balasescu
|
33f4f57ee3
|
Merge branch 'master' into replay_mods
|
2018-04-18 14:00:32 +09:00 |
|
Dan Balasescu
|
0e640b432d
|
Merge branch 'master' into app-manifest
|
2018-04-18 13:59:47 +09:00 |
|
Dean Herbert
|
2b83d49862
|
Merge pull request #2408 from smoogipoo/fix-leaderboard-nullref
Fix various leaderboard data races
|
2018-04-18 13:48:14 +09:00 |
|
Dean Herbert
|
64f47daff4
|
Merge branch 'master' into fix-leaderboard-nullref
|
2018-04-18 12:05:13 +09:00 |
|
Dean Herbert
|
188c8ce1e7
|
Remove unnecessary score nulling (already happens in PlaceholderState_Set)
|
2018-04-18 11:58:55 +09:00 |
|
Dean Herbert
|
a27f39a555
|
Add documentation explaining intertwining logic
|
2018-04-18 11:57:06 +09:00 |
|
Dean Herbert
|
f678ce1bf5
|
Merge pull request #2407 from jorolf/profile-badges
Add badges to ProfileHeader
|
2018-04-18 11:53:15 +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 |
|
tgi74000
|
1feba556eb
|
CI: unused directive
|
2018-04-16 14:25:43 +02:00 |
|
tgi74000
|
9b36cf2066
|
Review changes
|
2018-04-16 14:14:40 +02:00 |
|
smoogipoo
|
9af6ef1864
|
Remove extra unneded safety
|
2018-04-16 17:48:49 +09:00 |
|
smoogipoo
|
b9220a1e29
|
Fix leaderboard placeholder sometimes disappearing indefinitely
|
2018-04-16 17:39:55 +09:00 |
|
smoogipoo
|
1b9d54a6ad
|
Fix various data races causing crashes or incorrect leaderboard states
|
2018-04-16 17:39:03 +09: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 |
|
tgi74000
|
3454ec1ca3
|
Set Value instead of BindTo
|
2018-04-15 20:23:57 +02:00 |
|
tgi74000
|
4c08aa3dfb
|
Merge remote-tracking branch 'upstream/master'
|
2018-04-15 20:22:16 +02:00 |
|
Dean Herbert
|
af154e66a2
|
Merge pull request #2402 from FreezyLemon/fix-button-kb-input
Make buttons only accept input when expanded
|
2018-04-16 03:20:31 +09:00 |
|
Dean Herbert
|
c3086531e0
|
Update framework
|
2018-04-16 02:54:24 +09:00 |
|
Dean Herbert
|
9eb04a5fc8
|
Merge branch 'master' into fix-button-kb-input
|
2018-04-16 02:48:51 +09:00 |
|
Dean Herbert
|
0490c523a6
|
Merge pull request #2397 from smoogipoo/instant-hide-screenshot
Hide menu cursor when taking screenshots by default
|
2018-04-16 01:05:49 +09:00 |
|
Dean Herbert
|
2eefe722f3
|
Move cache to a slightly more familiar place and add comment
|
2018-04-16 00:38:32 +09:00 |
|
Dean Herbert
|
96ef564f44
|
Remove unused field
|
2018-04-16 00:25:09 +09:00 |
|
Dean Herbert
|
c095fe1919
|
Update framework
|
2018-04-16 00:21:03 +09:00 |
|
Dean Herbert
|
c9615f837a
|
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
|
2018-04-16 00:20:06 +09:00 |
|
Dean Herbert
|
779d5a578b
|
Merge pull request #2383 from DrabWeb/wave-container
Wave container
|
2018-04-15 21:22:54 +09:00 |
|
Dean Herbert
|
ae77c010e2
|
Merge remote-tracking branch 'upstream/master' into wave-container
|
2018-04-15 21:03:18 +09:00 |
|
Dean Herbert
|
e512e4bacb
|
Merge pull request #2360 from UselessToucan/profile_multiple_audio_previews
Handle multiple song previews playing in different beatmap categories…
|
2018-04-15 16:22:52 +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 |
|