Dan Balasescu
|
ae4417bb7c
|
Merge branch 'master' into previous-usernames
|
2019-08-13 14:58:01 +09:00 |
|
Dean Herbert
|
81f8b5f325
|
Fix merge issue
|
2019-08-13 14:52:51 +09:00 |
|
Dean Herbert
|
87c2e87b62
|
Add note to README about ffmpeg requirement on linux (#5695)
Add note to README about ffmpeg requirement on linux
|
2019-08-13 14:49:23 +09:00 |
|
Dean Herbert
|
5898198da6
|
Merge branch 'split-out-music-controller' into music-controller-hotkeys
|
2019-08-13 14:48:14 +09:00 |
|
Dean Herbert
|
2cbdf8c01c
|
Update public methods in line with future usage
|
2019-08-13 14:46:57 +09:00 |
|
Dean Herbert
|
de1ab56a2c
|
Fix potential nullref on disposal
|
2019-08-13 14:45:27 +09:00 |
|
Dean Herbert
|
9aac5efa4e
|
Move logic out of OsuGame
|
2019-08-13 14:42:59 +09:00 |
|
Dean Herbert
|
8d23cda51a
|
Merge branch 'split-out-music-controller' into music-controller-hotkeys
|
2019-08-13 14:33:35 +09:00 |
|
Shane Woolcock
|
99d9b797cc
|
Merge branch 'master' into mobile-ffmpeg
|
2019-08-13 15:03:24 +09:30 |
|
Dean Herbert
|
ad24265730
|
Split visual component out of MusicController
|
2019-08-13 14:30:18 +09:00 |
|
Dan Balasescu
|
9c43021c28
|
Merge branch 'master' into previous-usernames
|
2019-08-13 14:21:44 +09:00 |
|
smoogipoo
|
8d3f2f7645
|
Drop container from name
|
2019-08-13 14:09:10 +09:00 |
|
smoogipoo
|
5681d1097c
|
Move into components namespace
|
2019-08-13 14:07:40 +09:00 |
|
Dean Herbert
|
5dbde38a6b
|
Group key bindings together
|
2019-08-13 12:40:20 +09:00 |
|
Dean Herbert
|
33a119b726
|
Fix double grammar
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
|
2019-08-13 12:35:06 +09:00 |
|
Dean Herbert
|
0c0c405216
|
Add note to README about ffmpeg requirement on linux
|
2019-08-13 12:27:49 +09:00 |
|
Dean Herbert
|
f3380c9372
|
Remove "jukebox" terminology
|
2019-08-13 12:06:57 +09:00 |
|
Dean Herbert
|
6328fd9363
|
Merge remote-tracking branch 'upstream/master' into music-controller-hotkeys
|
2019-08-13 11:57:18 +09:00 |
|
Dean Herbert
|
5b2086fa4c
|
Merge pull request #5267 from Game4all/refactor-osd
Refactor OnScreenDisplay to allow displaying on custom messages
|
2019-08-13 11:47:36 +09:00 |
|
Dean Herbert
|
4ccac60337
|
Merge remote-tracking branch 'upstream/master' into refactor-osd
|
2019-08-13 11:35:54 +09:00 |
|
Dean Herbert
|
5447e7cf22
|
Fix file ordering
|
2019-08-13 11:34:45 +09:00 |
|
Dean Herbert
|
6f38c64354
|
Implement LeaderboardScopeSelector (#5627)
Implement LeaderboardScopeSelector
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-08-13 00:39:27 +09:00 |
|
Dean Herbert
|
433b701df3
|
Make line slightly thicker (to display better at low resolutions)
Also tidies up code.
|
2019-08-13 00:21:52 +09:00 |
|
Dean Herbert
|
a7ae0e6677
|
Merge remote-tracking branch 'upstream/master' into beatmap-scope-selector
|
2019-08-13 00:16:53 +09:00 |
|
Dean Herbert
|
c0f0fbbaa9
|
Rename variable and add xmldoc
|
2019-08-13 00:14:37 +09:00 |
|
Dean Herbert
|
d59966b975
|
Fix mod multiplier not being applied for multiplayer (#5691)
Fix mod multiplier not being applied for multiplayer
|
2019-08-12 23:55:09 +09:00 |
|
iiSaLMaN
|
883102ee5d
|
Move score multiplier logic inside score calculation
|
2019-08-12 16:40:52 +03:00 |
|
Andrei Zavatski
|
9c36cb4af4
|
Use existing AccentColour logic instead of weird BoxColour
|
2019-08-12 14:33:30 +03:00 |
|
Andrei Zavatski
|
ba49a4c2da
|
Use existing PageTabControl for layout
|
2019-08-12 13:16:57 +03:00 |
|
Lucas A
|
5e49d0fb28
|
Fix CI issues
|
2019-08-12 12:11:01 +02:00 |
|
Lucas A
|
6533f114d4
|
Apply review suggestions
|
2019-08-12 12:09:09 +02:00 |
|
Andrei Zavatski
|
fc521ac93b
|
Expose BoxColour property
|
2019-08-12 13:08:15 +03:00 |
|
Andrei Zavatski
|
144d41f143
|
Add ability to not add all the items if enum
|
2019-08-12 12:33:01 +03:00 |
|
Andrei Zavatski
|
2bbac7cdfc
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-scope-selector
|
2019-08-12 12:18:32 +03:00 |
|
Lucas A
|
9c15024014
|
Reword and add missing xmldoc to OnScreenDisplay
|
2019-08-12 10:53:06 +02:00 |
|
Dean Herbert
|
0cb97fe86f
|
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0 (#5688)
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
2019-08-12 17:47:59 +09:00 |
|
dependabot-preview[bot]
|
1bbd0ca54e
|
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.731.1 to 2019.809.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.731.1...2019.809.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-12 08:30:26 +00:00 |
|
Andrei Zavatski
|
982066dfdf
|
Convert to method group
|
2019-08-12 10:38:34 +03:00 |
|
Dean Herbert
|
75cb0d093b
|
Use description correctly
Required for localisation
|
2019-08-12 16:10:48 +09:00 |
|
Andrei Zavatski
|
cb910a6518
|
Replace if/else statement
|
2019-08-12 10:02:45 +03:00 |
|
Andrei Zavatski
|
5b68a2f34a
|
Rename trackManager to previewTrackManager
|
2019-08-12 09:50:49 +03:00 |
|
Dean Herbert
|
a83afd00b5
|
Merge branch 'master' into beatmap-scope-selector
|
2019-08-12 15:48:53 +09:00 |
|
Andrei Zavatski
|
520924b440
|
Don't create a new request if onlineId is null
|
2019-08-12 09:45:21 +03:00 |
|
Andrei Zavatski
|
6095480a54
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update
|
2019-08-12 09:36:15 +03:00 |
|
Dean Herbert
|
84944c51de
|
Implement osu! autopilot mod (#4762)
Implement osu! autopilot mod
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-08-12 15:15:52 +09:00 |
|
Dean Herbert
|
707911acac
|
Tidy up code formatting / variable naming
|
2019-08-12 15:05:27 +09:00 |
|
Dean Herbert
|
45b4fc9201
|
Add xmldoc
|
2019-08-12 15:00:32 +09:00 |
|
Dean Herbert
|
31fe121fe9
|
Merge remote-tracking branch 'RedMindZ/master' into autopilot
|
2019-08-12 14:40:52 +09:00 |
|
Dean Herbert
|
f7f3f4fb4a
|
Merge branch 'master' into master
|
2019-08-12 13:37:09 +09:00 |
|
Dean Herbert
|
7b8e8123f1
|
Fix storyboard not showing when user dim is disabled (#5638)
Fix storyboard not showing when user dim is disabled
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-08-12 11:34:56 +09:00 |
|