iiSaLMaN
|
66d8440167
|
Move non-bank samples logic to LegacySkin
|
2019-08-22 12:50:47 +03:00 |
|
Dean Herbert
|
82209aed82
|
Merge branch 'master' into humanizer-fallback
|
2019-08-22 17:58:40 +09:00 |
|
Shane Woolcock
|
f19b5ba570
|
Merge branch 'master' into fix-decoding-loop
|
2019-08-22 17:02:13 +09:30 |
|
Dean Herbert
|
db1ff6d211
|
Fix video decoding loop running permanently in the background
|
2019-08-22 13:48:27 +09:00 |
|
Dean Herbert
|
4f98361da3
|
One more offset removed
|
2019-08-21 22:22:03 +09:00 |
|
Dean Herbert
|
acc07c1d65
|
Remove mod icon offset
|
2019-08-21 22:18:29 +09:00 |
|
Dean Herbert
|
7bf430afd5
|
Add padding back to difficulty icons on carousel
|
2019-08-21 21:16:06 +09:00 |
|
iiSaLMaN
|
87f3184fcc
|
Try retrieving samples without bank names
Fallback for spinner bonus samples
|
2019-08-21 15:14:33 +03:00 |
|
Dean Herbert
|
6797f92b96
|
Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0
|
2019-08-21 20:15:23 +09:00 |
|
Andrei Zavatski
|
727a6abaf7
|
Simplify caching
|
2019-08-21 12:16:30 +03:00 |
|
dependabot-preview[bot]
|
fb8d8f9438
|
Bump SharpCompress from 0.23.0 to 0.24.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-21 08:27:56 +00:00 |
|
Dean Herbert
|
28dfe072a5
|
Update one more blending mode change post-master merge
|
2019-08-21 15:11:46 +09:00 |
|
Dean Herbert
|
4186d2566a
|
Remove unnecessary null checks
|
2019-08-21 15:11:33 +09:00 |
|
Dean Herbert
|
745bd58f37
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 15:10:08 +09:00 |
|
Dean Herbert
|
8917f7cc95
|
Merge pull request #5776 from peppy/animated-slider-ball
Add slider ball animation support
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-08-21 15:02:35 +09:00 |
|
Dean Herbert
|
444f2b9387
|
Specify font size in a saner way
|
2019-08-21 15:01:50 +09:00 |
|
Dean Herbert
|
6a48819055
|
Merge branch 'master' into update-framework-blending
|
2019-08-21 14:27:57 +09:00 |
|
Dean Herbert
|
66a2eecb7a
|
Merge remote-tracking branch 'upstream/master' into music-playback-improvements
|
2019-08-21 14:01:11 +09:00 |
|
Dean Herbert
|
724365c6d1
|
Minor tidying
|
2019-08-21 14:01:07 +09:00 |
|
Dean Herbert
|
cca64771dd
|
Add comment about placement of default loading
|
2019-08-21 13:56:49 +09:00 |
|
Dean Herbert
|
aa8b7b60de
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 13:30:24 +09:00 |
|
Dean Herbert
|
62218613da
|
Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending
|
2019-08-21 13:30:19 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Dan Balasescu
|
33083bcf40
|
Merge branch 'master' into animated-slider-ball
|
2019-08-21 13:15:45 +09:00 |
|
Dan Balasescu
|
82fe506f97
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-21 13:03:11 +09:00 |
|
Dan Balasescu
|
758f10b9fd
|
Merge branch 'master' into fix-skin-test-regression
|
2019-08-21 12:45:47 +09:00 |
|
iiSaLMaN
|
439d825dd1
|
Disallow adding bonus judgements' result to statistics
|
2019-08-20 18:39:29 +03:00 |
|
smoogipoo
|
0de219dda4
|
Update with spritetext text builder changes
|
2019-08-20 19:03:57 +09:00 |
|
Lucas A
|
33946f0458
|
Fix CI issues and update comments.
|
2019-08-20 11:18:41 +02:00 |
|
Dean Herbert
|
4bffb0df84
|
Merge branch 'animated-legacy-skins' into animated-slider-ball
|
2019-08-20 18:14:17 +09:00 |
|
Dean Herbert
|
1616b4528d
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-20 17:40:18 +09:00 |
|
Dean Herbert
|
6dd638b327
|
Further improve legibility of texture lookup
|
2019-08-20 17:39:24 +09:00 |
|
Dean Herbert
|
84530b7839
|
Colour the correct layer
|
2019-08-20 15:02:07 +09:00 |
|
Dean Herbert
|
f7ce7c7d99
|
Merge branch 'fix-skin-test-regression' into animated-slider-ball
|
2019-08-20 14:09:53 +09:00 |
|
Dean Herbert
|
3b7cee2d45
|
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
|
2019-08-20 13:50:16 +09:00 |
|
Dean Herbert
|
b5cb59faf2
|
Add default skin sprites and specular/diffuse layer support
|
2019-08-20 13:19:32 +09:00 |
|
Dean Herbert
|
caf8354f50
|
Merge branch 'master' into music-playback-improvements
|
2019-08-20 11:49:39 +09:00 |
|
Desconocidosmh
|
b3556403aa
|
Make GetNextObject() a virtual method
|
2019-08-19 16:18:25 +02:00 |
|
Dean Herbert
|
d0766fa1cd
|
Add slider ball animation support
|
2019-08-19 19:55:47 +09:00 |
|
Dean Herbert
|
539a27a557
|
Refactor texture lookup code
|
2019-08-19 19:23:54 +09:00 |
|
Dean Herbert
|
d02b8d14f7
|
Avoid unnecessary texture retrieval for non-animated sprites
|
2019-08-19 17:47:59 +09:00 |
|
Dean Herbert
|
d224405bc6
|
Rename const and make more available
|
2019-08-19 17:46:05 +09:00 |
|
Dean Herbert
|
4356f2ef9f
|
Add sample usage of looping skinnable
|
2019-08-19 17:45:54 +09:00 |
|
Dean Herbert
|
9ea4921e2b
|
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
Add tooltips to difficulty icons with extra details
|
2019-08-19 17:23:13 +09:00 |
|
Dan Balasescu
|
18ee2f5e99
|
Merge branch 'master' into centre-beatmap-panels
|
2019-08-19 13:27:40 +09:00 |
|
Dean Herbert
|
be51fde292
|
Centre beatmap panels in profile overlay
|
2019-08-19 13:22:32 +09:00 |
|
Dan Balasescu
|
9c069f6f22
|
Merge branch 'master' into unpause-on-selection-change
|
2019-08-19 13:15:46 +09:00 |
|
Dan Balasescu
|
01df3c982a
|
Merge branch 'master' into fix-tooltips-not-displaying
|
2019-08-19 12:51:06 +09:00 |
|
Ganendra Afrasya
|
7143497441
|
Match up tooltip background color with OsuTooltipContainer
|
2019-08-19 10:32:01 +07:00 |
|
Dan Balasescu
|
0f9c47686f
|
Merge branch 'master' into difficulty-icon-tooltip
|
2019-08-19 12:21:23 +09:00 |
|
Dan Balasescu
|
f20085df54
|
Merge branch 'master' into refactor-difficulty-colours
|
2019-08-19 11:39:19 +09:00 |
|
Dean Herbert
|
1f00793891
|
Unpause music when changing selection at song select
|
2019-08-19 11:30:04 +09:00 |
|
Dean Herbert
|
a51fbfa31b
|
Fix osu! default tooltips not displaying
|
2019-08-19 10:46:28 +09:00 |
|
Andrei Zavatski
|
015406f4d2
|
Fix link parser
|
2019-08-18 22:02:59 +03:00 |
|
Lucas A
|
3fcd786198
|
Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control.
|
2019-08-18 19:32:56 +02:00 |
|
Dean Herbert
|
ecc04baf14
|
Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip
|
2019-08-17 15:35:28 +09:00 |
|
Dean Herbert
|
87dc6499fa
|
Fix json decoding being a bit too eager to consume
|
2019-08-17 15:34:02 +09:00 |
|
Dean Herbert
|
097763bb1c
|
Add auto size duration
|
2019-08-17 15:29:39 +09:00 |
|
Dean Herbert
|
50046d5f69
|
Use new tooltip style
|
2019-08-17 15:20:27 +09:00 |
|
Dean Herbert
|
3dc81bdad5
|
Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip
|
2019-08-17 15:19:46 +09:00 |
|
Dean Herbert
|
4fa9abeece
|
Replace DifficultyColouredContainer with a more scalable solution
|
2019-08-17 15:16:24 +09:00 |
|
Dean Herbert
|
f552de6ebc
|
Merge branch 'master' into difficulty-icon-tooltip
|
2019-08-17 13:45:20 +09:00 |
|
Dean Herbert
|
0484caf430
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-16 21:12:59 +09:00 |
|
Dean Herbert
|
8258c4a80a
|
Merge pull request #5734 from smoogipoo/non-frame-stable-editor
Disable frame-stable playback in the editor
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-08-16 21:12:25 +09:00 |
|
Dean Herbert
|
152df9f3d5
|
Remove accidental blank line
|
2019-08-16 20:23:09 +09:00 |
|
Dean Herbert
|
d11b896148
|
Move FrameStablePlayback handling to early return
|
2019-08-16 20:21:00 +09:00 |
|
Dean Herbert
|
58d2268b9e
|
Combine conditionals that provide the same behaviour
|
2019-08-16 19:52:35 +09:00 |
|
Dean Herbert
|
132d51a2cc
|
Update tooltip implementation
|
2019-08-16 19:47:35 +09:00 |
|
Dean Herbert
|
536e7d8757
|
Update framework
|
2019-08-16 19:32:17 +09:00 |
|
Dean Herbert
|
d771c271a3
|
Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds
|
2019-08-16 19:32:01 +09:00 |
|
Dan Balasescu
|
059d90bc42
|
Merge branch 'master' into reduce-hold-to-confirm-delay
|
2019-08-16 14:00:43 +09:00 |
|
Dean Herbert
|
d732d276b1
|
Make activation delay customisable
|
2019-08-16 13:21:41 +09:00 |
|
Dean Herbert
|
b57298406f
|
Fix right click blocking not resetting correctly
|
2019-08-15 19:25:33 +09:00 |
|
Dean Herbert
|
fc05cab050
|
Merge remote-tracking branch 'upstream/master' into fix-song-select-context-menus
|
2019-08-15 18:27:49 +09:00 |
|
Dean Herbert
|
0f4bada21e
|
Fix right click absolute scrolling interfering with context menus
|
2019-08-15 18:27:45 +09:00 |
|
smoogipoo
|
8c67f58e2d
|
Disable frame-stable playback in the editor
|
2019-08-15 18:25:31 +09:00 |
|
Dean Herbert
|
ef5ed915e5
|
Reduce delay for hold-to-confirm controls
|
2019-08-15 17:14:00 +09:00 |
|
Dean Herbert
|
8f63887972
|
Make use of existing null check
|
2019-08-15 14:38:49 +09:00 |
|
Dean Herbert
|
9e13a6aeae
|
Fix newlines being considered in user profile content
|
2019-08-15 14:38:04 +09:00 |
|
Dean Herbert
|
f7a92487ef
|
Fix checkbox sounds playing too often
|
2019-08-15 14:09:30 +09:00 |
|
Dean Herbert
|
e73a9c2748
|
Fix song select context menus displaying off-screen
|
2019-08-15 14:06:29 +09:00 |
|
Dean Herbert
|
f355cff8bc
|
Apply reviews
|
2019-08-15 12:11:54 +09:00 |
|
Dean Herbert
|
7e74953784
|
Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip
|
2019-08-15 11:54:59 +09:00 |
|
dependabot-preview[bot]
|
3379672a43
|
Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-14 12:17:17 +00:00 |
|
smoogipoo
|
3a79a4149a
|
Disable music controls when beatmap is disabled
|
2019-08-14 15:19:21 +09:00 |
|
Dean Herbert
|
52f42ddade
|
Use child instead of children
|
2019-08-14 10:53:47 +09:00 |
|
Dean Herbert
|
b6bc84af2c
|
Fix chat context menus displaying out-of-bounds
|
2019-08-14 10:52:26 +09:00 |
|
Dean Herbert
|
8ce2c876bf
|
Merge branch 'master' into multi-room-update
|
2019-08-13 21:03:03 +09:00 |
|
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 |
|
smoogipoo
|
e356cc8d9e
|
Refactor MatchBeatmapPanel for thread safety
|
2019-08-13 17:57:16 +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 |
|
smoogipoo
|
7c9c9f1ce1
|
Simplify caching
|
2019-08-13 17:38:21 +09:00 |
|
smoogipoo
|
92c2dafa12
|
Tighten accessibility
|
2019-08-13 17:34:16 +09:00 |
|
smoogipoo
|
6b57c9801d
|
Cull some unnecessary whitespace
|
2019-08-13 17:32:43 +09:00 |
|
smoogipoo
|
2b155e5407
|
Merge remote-tracking branch 'origin/master' into multi-room-update
|
2019-08-13 17:03:44 +09: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
|
bc49164cc1
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-13 00:40:20 +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 |
|
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
|
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 |
|
Lucas A
|
d55f9404da
|
Fix CI issues
|
2019-08-10 14:23:37 +02:00 |
|