7701cac297
Merge branch 'master' into overlay-activation
2018-06-04 11:37:14 +09:00
27ad1c4ee9
Merge pull request #2725 from ekrctb/fix-TestCaseBeatmapCarousel
...
Fix TestCaseBeatmapCarousel occasionally failing
2018-06-04 11:24:51 +09:00
3ad0735a33
Merge branch 'master' into fix-TestCaseBeatmapCarousel
2018-06-04 11:16:17 +09:00
281299ef0e
Merge pull request #2710 from Joehuu/fix-expand-button-colour
...
Fix initial state of visual settings expand button colour
2018-06-04 02:24:32 +09:00
7ca437aa8e
Merge branch 'master' into fix-expand-button-colour
2018-06-04 02:16:27 +09:00
ed1918cd43
Wait for loading beatmaps
2018-06-03 23:11:45 +09:00
2afe0feb24
remove white space
...
I think
2018-06-03 12:02:43 +02:00
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02:00
707af02097
apply feedback
...
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
0f13acf67e
Use updateExpanded method
2018-06-02 12:52:31 -07:00
68910745d8
Merge pull request #2702 from DrabWeb/participant-count-default
...
Default ParticipantCount.Max to null
2018-06-03 03:55:23 +09:00
eb135b2e85
Merge branch 'master' into participant-count-default
2018-06-03 03:05:17 +09:00
941a1b616c
Merge pull request #2713 from FreezyLemon/fix-songprogress-time-formatting
...
Fix song progress elapsed time rounding up on some cultures
2018-06-03 02:42:34 +09:00
a0c643fae5
Fix SongProgressInfo timespan formatting
2018-06-02 11:25:49 +02:00
8d3de3affb
Use '?:' expression instead
2018-06-01 15:58:05 -07:00
5d1421c0e9
Fix visual settings expand button colour
2018-06-01 15:31:25 -07:00
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
53b11155d1
Merge pull request #2695 from Joehuu/match-panel-with-web
...
Add storyboard icon and fix preview button overlap on direct panels
2018-06-01 22:49:45 +09:00
de64e4500f
Update framework
2018-06-01 22:20:28 +09:00
9b7741b353
Avoid using update for fading logic
2018-06-01 22:19:11 +09:00
ae6f603d16
Merge branch 'master' into match-panel-with-web
2018-06-01 21:31:18 +09:00
e537d8cd6b
Merge pull request #2703 from DrabWeb/room-participants-ienumerable
...
Change Room.Participants to an IEnumerable
2018-06-01 21:13:25 +09:00
59762c0393
Change Room.Participants to an IEnumerable.
2018-06-01 06:15:23 -03:00
8dd36ee1a9
Default Max to null in ParticipantCount.
2018-06-01 06:08:57 -03:00
6b48370092
Merge pull request #2669 from DrabWeb/multiplayer-logic-encapsulation
...
Multiplayer shared logic encapsulation
2018-06-01 15:58:15 +09:00
b9c601074d
Formatting fixes
2018-06-01 15:45:09 +09:00
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation
2018-06-01 15:31:19 +09:00
03cc4e878e
Merge pull request #2667 from DrabWeb/updateable-beatmap-set-cover
...
Centralise beatmap set cover update logic
2018-06-01 15:31:08 +09:00
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover
2018-06-01 15:20:59 +09:00
9c906e3121
Merge pull request #2700 from ppy/osu/fix-authorinfo
...
Match authorinfo with web
2018-06-01 12:23:32 +09:00
729f2ec725
Match authorinfo with web
2018-05-31 14:34:47 -07:00
1095669a55
Match panel with web
2018-05-31 08:09:19 -07:00
6781b81336
Cleanup.
2018-05-31 05:48:42 -03:00
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover
2018-05-31 17:33:31 +09:00
9c0eff72b5
Merge pull request #2678 from peppy/long-path-fix
...
Fix importing long filenames from stable
2018-05-31 15:58:21 +09:00
1147ef61ed
Merge branch 'master' into long-path-fix
2018-05-31 15:32:47 +09:00
824d6ae718
Merge pull request #2682 from peppy/fix-osu-logo-discrepancies
...
Fix logo animation discrepancies
2018-05-31 15:31:43 +09:00
29f3011f75
Merge branch 'master' into fix-osu-logo-discrepancies
2018-05-31 15:21:44 +09:00
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
5b997ff7a7
Merge pull request #2680 from peppy/song-selet-enumerable
...
Offload database query to task
2018-05-31 14:57:36 +09:00
4ff803d11d
Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
2018-05-31 14:47:47 +09:00
76567ae98b
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:42:58 +09:00
e7c35d7541
Merge pull request #2679 from peppy/fix-player-life-management
...
Fix player life management
2018-05-31 14:42:47 +09:00
cd3ca68f03
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:38:04 +09:00
35d8ec8df6
Merge branch 'master' into fix-player-life-management
2018-05-31 14:34:31 +09:00
c1d595677e
Merge pull request #2673 from peppy/fix-beatmap-import-conflicts
...
Fix conflicting Hash and Online IDs on beatmap import
2018-05-31 14:32:47 +09:00
9da7bfd615
Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts
...
# Conflicts:
# osu.Game/Database/ArchiveModelManager.cs
2018-05-31 14:02:52 +09:00
3fc2bfd313
Merge pull request #2665 from peppy/import-fixes
...
Fix beatmap importing entering a bad state
2018-05-31 13:58:22 +09:00
a9db479b27
Merge branch 'master' into import-fixes
2018-05-31 13:49:12 +09:00
db89b92ae2
Merge pull request #2314 from Joehuu/score-multiplier-edits
...
Split score multiplier and unranked label colours
2018-05-31 13:13:37 +09:00
