osu-lazer

mirror of https://github.com/ppy/osu.git synced 2026-05-19 22:20:48 +08:00

Update framework

Thomas Müller · 2017-07-22 11:06:07 +02:00

a4dfe3f1fa
Merge branch 'master' of github.com:ppy/osu into prevent-dependency-pollution

Thomas Müller · 2017-07-22 10:56:28 +02:00

95684f7d40
Merge branch 'master' into better-transforms

Thomas Müller · 2017-07-22 10:50:58 +02:00

e36b65bfe0
Merge pull request #1051 from peppy/fix-di-chatline-regression
```
Allow ChatLines to exist without UserProfileOverlay
```
Thomas Müller · 2017-07-22 10:50:41 +02:00

fd4cd5edd1
Minor refactor of TestCaseBeatSyncedContainer

Thomas Müller · 2017-07-22 10:48:15 +02:00

4755529d43
Allow ChatLines to exist without UserProfileOverlay
```
Fixes testcases failing when logged in.
```
Dean Herbert · 2017-07-22 17:18:20 +09:00

7549d3a2c4
Update dependency caching according to framework

Thomas Müller · 2017-07-21 19:03:43 +02:00

e469a114a6
Update framework

Thomas Müller · 2017-07-21 18:23:01 +02:00

0f2bcb2904
Update framework

Thomas Müller · 2017-07-21 17:24:09 +02:00

a7dc8a892b
Better boolean naming

EVAST9919 · 2017-07-21 13:40:09 +03:00

66f816692f
Allow ChatOverlay resize only if it dragged by the tabs area only

EVAST9919 · 2017-07-21 13:37:22 +03:00

270ab5c987
Make BeatmapCarousel inherit from OsuScrollContainer

EVAST9919 · 2017-07-21 13:13:53 +03:00

388fcfb295
Merge branch 'master' of github.com:ppy/osu into better-transforms
```
# Conflicts:
#	osu-framework
```
Thomas Müller · 2017-07-21 11:15:26 +02:00

2cd8f6b30c
Merge pull request #1041 from peppy/fix-carousel-debounce-race
```
Fix carousel filter debounce causing a race condition
```
Dean Herbert · 2017-07-21 17:57:47 +09:00

v2017.721.0 d344452e9b
Merge branch 'master' into fix-carousel-debounce-race

Dean Herbert · 2017-07-21 17:44:04 +09:00

9a33e77d63
Merge pull request #1042 from peppy/fix-selection-changing
```
Fix selection changing on entering song select
```
Dean Herbert · 2017-07-21 17:43:57 +09:00

ae2923f074
Merge branch 'master' into fix-selection-changing

Thomas Müller · 2017-07-21 10:22:11 +02:00

3a086534f8
Merge pull request #1043 from peppy/fix-songprogress-endtime
```
Fix incorrect end time calculation in SongProgressGraph
```
Thomas Müller · 2017-07-21 10:22:01 +02:00

c9cdb9c865
Make method to flush filter requests

Dean Herbert · 2017-07-21 17:20:52 +09:00

12b6b80d5c
Merge branch 'master' into fix-songprogress-endtime

Dean Herbert · 2017-07-21 16:46:41 +09:00

bf254bf5cf
Merge pull request #1040 from MrTheMake/previewtime-seeking
```
Fix double-seek in main menu song playback
```
Dean Herbert · 2017-07-21 15:11:41 +09:00

db35b0ab31
Merge branch 'master' into previewtime-seeking

Dean Herbert · 2017-07-21 15:06:18 +09:00

6bdf6bb675
Fix incorrect end time calculation in SongProgressGraph

Dean Herbert · 2017-07-21 10:10:25 +09:00

f7b64a458a
Fix selection changing on entering song select
```
Conditional was backwards, easy fix.
```
Dean Herbert · 2017-07-21 06:15:44 +09:00

b4dddc98ee

Fix carousel filter debounce causing a race condition

Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.

Dean Herbert · 2017-07-21 05:58:58 +09:00

fb2f1224b3

Merge pull request #1035 from peppy/fix-empty-carousel
```
Fix selection not being reset correct when changing between rulesets
```
Thomas Müller · 2017-07-20 21:50:19 +02:00

31ac083408
Merge branch 'master' into fix-empty-carousel

Thomas Müller · 2017-07-20 21:15:58 +02:00

e84d8cc020
Merge pull request #1032 from peppy/fix-beatmap-select-race
```
Fix hitting down and enter at song select causing a hard-crash
```
Thomas Müller · 2017-07-20 21:15:48 +02:00

e98dd62e5c
Merge branch 'master' into fix-empty-carousel

Thomas Müller · 2017-07-20 21:04:45 +02:00

4e33efd41f
Merge branch 'master' into fix-beatmap-select-race

Thomas Müller · 2017-07-20 21:04:40 +02:00

518a7c460e
Merge pull request #1031 from peppy/always-load-storyboard
```
Remove FullyLoaded logic
```
Thomas Müller · 2017-07-20 21:04:24 +02:00

119b4dd04c
Merge branch 'master' into always-load-storyboard

Thomas Müller · 2017-07-20 20:54:16 +02:00

ed6478be8b
Merge pull request #1033 from peppy/fix-working-beatmap-double-load
```
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
```
Thomas Müller · 2017-07-20 20:53:53 +02:00

9dc3987834
Merge branch 'master' into fix-working-beatmap-double-load

Thomas Müller · 2017-07-20 20:35:31 +02:00

e21822cdeb
Merge branch 'master' into fix-empty-carousel

Thomas Müller · 2017-07-20 20:31:06 +02:00

01ff7e8f4b
Small optimization to the main menu intro seeking.

MrTheMake · 2017-07-20 17:15:39 +02:00

22f3e97241
Merge pull request #1022 from jorolf/user-profile-fixes
```
User profile improvements
```
Dean Herbert · 2017-07-20 19:40:26 +09:00

8bc2df8749
Update framework

Dean Herbert · 2017-07-20 19:32:17 +09:00

b25188895b
Merge remote-tracking branch 'upstream/master' into user-profile-fixes

Dean Herbert · 2017-07-20 19:32:00 +09:00

cb3402098a
Merge pull request #1037 from peppy/no-set-exclusive
```
Remove usage of SetExclusive
```
Dean Herbert · 2017-07-20 19:29:28 +09:00

bb167a9f82
Merge remote-tracking branch 'upstream/master' into user-profile-fixes

Dean Herbert · 2017-07-20 19:15:21 +09:00

781d76d094
Merge branch 'master' into no-set-exclusive

Thomas Müller · 2017-07-20 12:11:32 +02:00

8108f3e78d
Merge pull request #1038 from peppy/fix-songselect-footer-light
```
Fix footer button light fading incorrectly
```
Thomas Müller · 2017-07-20 12:10:38 +02:00

a104754e64

Switch to correct ruleset when changing beatmap

This is only really noticeable when using the MusicController to change tracks while at song select.

Dean Herbert · 2017-07-20 19:10:20 +09:00

6e0b7b81f8

Fix footer button light fading incorrectly

Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.

Dean Herbert · 2017-07-20 18:08:51 +09:00

577740d329

Centralise TrackManager.AddItem logic to avoid duplicate adds

Dean Herbert · 2017-07-20 17:46:33 +09:00

3bdd4d7d02
Remove usage of SetExclusive
```
Also immediately disposes WorkingBeatmaps on ValueChanged.
```
Dean Herbert · 2017-07-20 16:45:44 +09:00

67b95926c4
Remove unnecessary count check

Dean Herbert · 2017-07-20 15:34:44 +09:00

4f10256182
Add required null check

Dean Herbert · 2017-07-20 15:16:07 +09:00

61c665f239

Fix selection not being reset correct when changing between rulesets

Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.

Dean Herbert · 2017-07-20 15:12:20 +09:00

a59557f039

1 2 3 4 5 ...

6229 Commits