1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:02:55 +08:00
Commit Graph

12476 Commits

Author SHA1 Message Date
Dean Herbert
68910745d8
Merge pull request #2702 from DrabWeb/participant-count-default
Default ParticipantCount.Max to null
2018-06-03 03:55:23 +09:00
Dean Herbert
eb135b2e85
Merge branch 'master' into participant-count-default 2018-06-03 03:05:17 +09:00
Dean Herbert
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
FreezyLemon
a0c643fae5 Fix SongProgressInfo timespan formatting 2018-06-02 11:25:49 +02:00
DrabWeb
cc32adf51f Move max text updating into updateMax. 2018-06-01 14:28:24 -03:00
Dean Herbert
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
Dean Herbert
de64e4500f Update framework 2018-06-01 22:20:28 +09:00
Dean Herbert
9b7741b353 Avoid using update for fading logic 2018-06-01 22:19:11 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web 2018-06-01 21:31:18 +09:00
Dean Herbert
e537d8cd6b
Merge pull request #2703 from DrabWeb/room-participants-ienumerable
Change Room.Participants to an IEnumerable
2018-06-01 21:13:25 +09:00
DrabWeb
59762c0393 Change Room.Participants to an IEnumerable. 2018-06-01 06:15:23 -03:00
DrabWeb
8dd36ee1a9 Default Max to null in ParticipantCount. 2018-06-01 06:08:57 -03:00
Dean Herbert
6b48370092
Merge pull request #2669 from DrabWeb/multiplayer-logic-encapsulation
Multiplayer shared logic encapsulation
2018-06-01 15:58:15 +09:00
Dean Herbert
b9c601074d Formatting fixes 2018-06-01 15:45:09 +09:00
Dean Herbert
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation 2018-06-01 15:31:19 +09:00
Dean Herbert
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
Dean Herbert
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover 2018-06-01 15:20:59 +09:00
Dean Herbert
9c906e3121
Merge pull request #2700 from ppy/osu/fix-authorinfo
Match authorinfo with web
2018-06-01 12:23:32 +09:00
Joehu
729f2ec725 Match authorinfo with web 2018-05-31 14:34:47 -07:00
Joehu
1095669a55 Match panel with web 2018-05-31 08:09:19 -07:00
DrabWeb
6781b81336 Cleanup. 2018-05-31 05:48:42 -03:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover 2018-05-31 17:33:31 +09:00
Dean Herbert
9c0eff72b5
Merge pull request #2678 from peppy/long-path-fix
Fix importing long filenames from stable
2018-05-31 15:58:21 +09:00
Dan Balasescu
1147ef61ed
Merge branch 'master' into long-path-fix 2018-05-31 15:32:47 +09:00
Dan Balasescu
824d6ae718
Merge pull request #2682 from peppy/fix-osu-logo-discrepancies
Fix logo animation discrepancies
2018-05-31 15:31:43 +09:00
Dan Balasescu
29f3011f75
Merge branch 'master' into fix-osu-logo-discrepancies 2018-05-31 15:21:44 +09:00
smoogipoo
e48b17fb0d Unindent 2018-05-31 15:17:59 +09:00
Dean Herbert
5b997ff7a7
Merge pull request #2680 from peppy/song-selet-enumerable
Offload database query to task
2018-05-31 14:57:36 +09:00
smoogipoo
4ff803d11d Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies 2018-05-31 14:47:47 +09:00
Dan Balasescu
76567ae98b
Merge branch 'master' into song-selet-enumerable 2018-05-31 14:42:58 +09:00
Dan Balasescu
e7c35d7541
Merge pull request #2679 from peppy/fix-player-life-management
Fix player life management
2018-05-31 14:42:47 +09:00
Dan Balasescu
cd3ca68f03
Merge branch 'master' into song-selet-enumerable 2018-05-31 14:38:04 +09:00
Dan Balasescu
35d8ec8df6
Merge branch 'master' into fix-player-life-management 2018-05-31 14:34:31 +09:00
Dan Balasescu
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
smoogipoo
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
Dan Balasescu
3fc2bfd313
Merge pull request #2665 from peppy/import-fixes
Fix beatmap importing entering a bad state
2018-05-31 13:58:22 +09:00
Dan Balasescu
a9db479b27
Merge branch 'master' into import-fixes 2018-05-31 13:49:12 +09:00
Dean Herbert
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
Dean Herbert
0c94e90043
Merge branch 'master' into score-multiplier-edits 2018-05-31 13:05:14 +09:00
Dan Balasescu
1201fe90fb
Merge pull request #2632 from peppy/catch-sizing-fixes
Fix catch sizing
2018-05-31 12:58:16 +09:00
Dean Herbert
b7511251d9 Remove pointless FillMode specification 2018-05-31 12:50:01 +09:00
Dean Herbert
0f6c623ebb Tidy up some unnecessary lines 2018-05-31 12:44:59 +09:00
Dean Herbert
205aa1a3cd Fetch colour from OsuColour palette 2018-05-31 12:44:11 +09:00
Dean Herbert
319faf12f7 Fix incorrect naming of label 2018-05-31 12:39:56 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
Dan Balasescu
9924ec9606
Merge branch 'master' into catch-sizing-fixes 2018-05-31 12:31:52 +09:00
Dean Herbert
5d103a0088
Merge pull request #2672 from DrabWeb/multiplayer-screen-type
Add Type property to MultiplayerScreen
2018-05-31 11:42:33 +09:00
DrabWeb
ff93a54a64 Default Type to Title, use ToLower for the screen type title. 2018-05-30 23:16:54 -03:00
Dean Herbert
74c52e0a7c
Merge branch 'master' into multiplayer-screen-type 2018-05-31 00:16:43 +09:00
Dean Herbert
0caf15166e Remove unnecessary FinishTransforms 2018-05-30 20:05:31 +09:00