Salman Ahmed
|
bc32726f3c
|
Apply renaming suggestions
Co-Authored-By: Dean Herbert <pe@ppy.sh>
|
2019-08-11 23:08:14 +03: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
|
907cf18960
|
Add more detail to log output when beatmap parsing errors occur (#5680)
Add more detail to log output when beatmap parsing errors occur
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-08-12 01:52:21 +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
|
126fd4d24b
|
Merge pull request #5669 from Game4all/overlay-icon-title
Add ScreenTitleIcon class to allow code reuse of overlay header icons
|
2019-08-11 17:05:02 +09: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 |
|
Lucas A
|
8eb3409a64
|
Add missing licence header
|
2019-08-10 14:03:44 +02:00 |
|
Lucas A
|
b0a7177987
|
Add ScreenTitleIcon class, used for displaying custom specific icons on overlays.
|
2019-08-10 13:26:19 +02:00 |
|
Lucas A
|
fc4c0cc2e7
|
Fix visual discrepancies with master
|
2019-08-10 10:52:37 +02:00 |
|
Shane Woolcock
|
fd7df7b05a
|
Merge branch 'master' into mobile-ffmpeg
|
2019-08-10 10:28:18 +09:30 |
|
Dean Herbert
|
59a5df8bca
|
Update framework (with cached changes) (#5666)
Update framework (with cached changes)
|
2019-08-09 23:47:40 +09:00 |
|
Dean Herbert
|
caf13ae52d
|
Update framework
|
2019-08-09 23:29:32 +09:00 |
|
Dan Balasescu
|
9b46a63cae
|
Merge pull request #5664 from peppy/match-stable-metrics
Adjust slider snaking and hitcircle fading to match stable
|
2019-08-09 22:35:07 +09:00 |
|
Shane Woolcock
|
7dd62ae6f3
|
Remove Android BASS libraries
|
2019-08-09 20:48:08 +09:30 |
|
Dean Herbert
|
6264a6a1c9
|
Adjust slider snaking and hitcircle fading to match stable
|
2019-08-09 20:18:02 +09:00 |
|
Dean Herbert
|
8e6a3162ab
|
Update resources
|
2019-08-09 20:05:36 +09:00 |
|
Dean Herbert
|
cb0cd7ed58
|
Add triangles intro
|
2019-08-09 20:05:28 +09:00 |
|
Dean Herbert
|
90b1fe81f3
|
Update cached usage in line with framework changes
|
2019-08-09 19:12:29 +09:00 |
|
Shane Woolcock
|
f68e41f7b9
|
Remove BASS references from osu.Game.Tests.iOS
|
2019-08-09 19:30:31 +09:30 |
|
Shane Woolcock
|
1351bfdd1f
|
Add iOS FFmpeg references
|
2019-08-09 19:21:42 +09:30 |
|
Shane Woolcock
|
b0eb2c6e28
|
Remove iOS BASS libraries and properly reference
|
2019-08-09 19:21:08 +09:30 |
|
smoogipoo
|
5486c77362
|
Remove explicit autosize
|
2019-08-09 15:25:42 +09:00 |
|
Dean Herbert
|
07cf9f319c
|
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0 (#5658)
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
2019-08-09 14:15:36 +09:00 |
|
Dean Herbert
|
2d0a3dee6f
|
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1 (#5659)
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
2019-08-09 13:57:02 +09:00 |
|
dependabot-preview[bot]
|
58e98e53d2
|
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.13...V3.14)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-09 03:58:06 +00:00 |
|
dependabot-preview[bot]
|
ca33efead4
|
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.702.0 to 2019.731.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.702.0...2019.731.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-09 03:58:06 +00:00 |
|
Dean Herbert
|
dbb3b583cf
|
Log error for invalid beatmap/storyboard events instead of thro… (#5611)
Log error for invalid beatmap/storyboard events instead of throwing
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-08-09 12:56:47 +09:00 |
|
Dan Balasescu
|
b849211d2b
|
Merge pull request #5657 from peppy/apply-new-factors
Apply new resharper refactors
|
2019-08-09 12:42:40 +09:00 |
|
Dean Herbert
|
7e9c100c9b
|
Apply new resharper refactors
|
2019-08-09 12:29:33 +09:00 |
|
iiSaLMaN
|
565034e658
|
Remove unnecessary using directive
|
2019-08-08 22:14:51 +03:00 |
|
iiSaLMaN
|
0fcc6c1676
|
Add DimLevel property
|
2019-08-08 22:13:48 +03:00 |
|
Dean Herbert
|
0f5af25def
|
Don't share single scheduler across all model managers (#5647)
Don't share single scheduler across all model managers
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-08-09 00:10:25 +09:00 |
|
Dean Herbert
|
c02d83e72a
|
Merge branch 'master' into fix-async-score-imports
|
2019-08-08 23:34:31 +09:00 |
|
iiSaLMaN
|
a3d90da7d4
|
Remove unnecessary check
|
2019-08-08 17:29:52 +03:00 |
|
iiSaLMaN
|
bedb744a2e
|
Add parentheses
|
2019-08-08 17:11:26 +03:00 |
|
iiSaLMaN
|
88b9942b2a
|
Move EnableUserDim check to defualt value of ShowDimContent
|
2019-08-08 17:07:06 +03:00 |
|
iiSaLMaN
|
537973fc45
|
Add test for disabling user dim on storyboard
|
2019-08-08 15:59:29 +03:00 |
|
Dan Balasescu
|
f6208db972
|
Merge pull request #5646 from peppy/system-user-color
Move system user colour assignment to ensure consistency
|
2019-08-08 19:22:16 +09:00 |
|
Dan Balasescu
|
bb90a273ac
|
Merge branch 'master' into system-user-color
|
2019-08-08 19:02:24 +09:00 |
|
Dan Balasescu
|
a9a5d305c5
|
Merge pull request #5644 from peppy/score-processor-xmldoc
Add mentions linking ScoreProcessor apply/revert methods together
|
2019-08-08 18:28:03 +09:00 |
|