Dean Herbert
|
5963f7d914
|
Update comment
|
2019-08-13 19:52:40 +09:00 |
|
Dean Herbert
|
ea18a8dd12
|
Merge branch 'master' into music-controller-hotkeys
|
2019-08-13 19:08:52 +09:00 |
|
dependabot-preview[bot]
|
f2e596de16
|
Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-13 08:54:17 +00:00 |
|
Dan Balasescu
|
77fca7b04a
|
Merge branch 'master' into split-out-music-controller
|
2019-08-13 17:03:15 +09:00 |
|
Dean Herbert
|
4948e7d31c
|
Merge branch 'master' into split-out-music-controller
|
2019-08-13 16:43:56 +09:00 |
|
Dan Balasescu
|
f6e1df8952
|
Merge branch 'master' into triangles
|
2019-08-13 16:34:08 +09:00 |
|
Dean Herbert
|
6a70849acb
|
Merge branch 'split-out-music-controller' into music-controller-hotkeys
|
2019-08-13 15:08:33 +09:00 |
|
Dean Herbert
|
b942192e00
|
Fix remaining nullref
|
2019-08-13 15:04:04 +09:00 |
|
Dean Herbert
|
81f8b5f325
|
Fix merge issue
|
2019-08-13 14:52:51 +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 |
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Dean Herbert
|
75cb0d093b
|
Use description correctly
Required for localisation
|
2019-08-12 16:10:48 +09:00 |
|
Dean Herbert
|
a83afd00b5
|
Merge branch 'master' into beatmap-scope-selector
|
2019-08-12 15:48:53 +09:00 |
|
Dean Herbert
|
d0f2d22995
|
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim
|
2019-08-12 05:46:15 +09:00 |
|
Dean Herbert
|
ea4a97ebd9
|
Merge branch 'master' into refactor-osd
|
2019-08-12 02:27:02 +09:00 |
|
Dean Herbert
|
9ac4870a21
|
Merge branch 'master' into triangles
|
2019-08-12 02:24:45 +09:00 |
|
Lucas A
|
e4eed83d85
|
Add dual bindings for Jukebox hotkeys
|
2019-08-11 19:14:49 +02:00 |
|
Dean Herbert
|
359261d4a4
|
Fix game not starting if intro music is disabled
|
2019-08-12 02:04:06 +09:00 |
|
Dean Herbert
|
ff4b271f64
|
Add extra quotations around output
|
2019-08-12 01:42:05 +09:00 |
|
Dean Herbert
|
ce62f6b56e
|
ToString should never return null
|
2019-08-12 01:40:11 +09:00 |
|
Unknown
|
cc4ee2df05
|
add ToString() override to Beatmap class
|
2019-08-11 16:41:56 +02:00 |
|
Dean Herbert
|
684c37bf05
|
Rename class to better match usage
|
2019-08-11 16:19:40 +09:00 |
|
Dean Herbert
|
c2e2c1e67e
|
Merge branch 'master' into refactor-osd
|
2019-08-11 13:13:12 +09:00 |
|
Lucas A
|
7825923cb6
|
Use media keys as default bindings for jukebox.
|
2019-08-10 16:33:16 +02:00 |
|
Lucas A
|
fdf76be967
|
Merge branch 'master' into music-controller-hotkeys
|
2019-08-10 16:29:02 +02:00 |
|
Lucas A
|
8c630b4f4c
|
Merge branch 'refactor-osd' into music-controller-hotkeys
|
2019-08-10 16:25:59 +02:00 |
|