|
|
5844039e04
|
Merge pull request #2664 from Aergwyn/overlay-activation
Fix notifications appearing during gameplay
|
2018-06-06 20:13:59 +09:00 |
|
|
|
a645a109be
|
Merge branch 'master' into overlay-activation
|
2018-06-06 19:18:28 +09:00 |
|
|
|
35d733fa97
|
Merge pull request #2730 from ekrctb/fix-ImportBeatmapTest
Fix ImportBeatmapTest not working on .net core
|
2018-06-06 19:08:45 +09:00 |
|
|
|
e65b34336b
|
Merge branch 'master' into fix-ImportBeatmapTest
|
2018-06-06 18:56:31 +09:00 |
|
|
|
94a22fb43d
|
Merge branch 'fix-ImportBeatmapTest' of https://github.com/ekrctb/osu into fix-ImportBeatmapTest
|
2018-06-06 18:37:04 +09:00 |
|
|
|
aeeb03ff9c
|
simpler temporary path generation
|
2018-06-06 18:36:43 +09:00 |
|
|
|
0a97b8ae25
|
Implement DebugUtils locally
Has been removed from framework
|
2018-06-06 18:33:10 +09:00 |
|
|
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +09:00 |
|
|
|
5a4408e359
|
Merge remote-tracking branch 'upstream/master' into nuget-consumption
|
2018-06-06 18:22:22 +09:00 |
|
|
|
9306fec498
|
Fix missing null checks
|
2018-06-06 18:21:03 +09:00 |
|
|
|
aaaa8a3b7c
|
match Bindable names
|
2018-06-06 09:55:16 +02:00 |
|
|
|
55921efffb
|
Rewrite much state logic
|
2018-06-06 16:17:51 +09:00 |
|
|
|
9e25e02696
|
Ensure notifications don't appear during UserTriggered mode
Closes #2640.
|
2018-06-06 15:50:24 +09:00 |
|
|
|
d1fd09ed47
|
Rename variables
|
2018-06-06 15:49:27 +09:00 |
|
|
|
86be1bef6b
|
Use UserTriggered in Player
|
2018-06-06 15:10:15 +09:00 |
|
|
|
e7fa043226
|
Merge pull request #2201 from Vidalee/osu-hd-setting
Add a setting to increase visibility of the first object in "Hidden" mod
|
2018-06-06 14:41:34 +09:00 |
|
|
|
d3cd267036
|
Formatting fixes
|
2018-06-06 14:20:51 +09:00 |
|
|
|
a5679f7bf5
|
Improve readability of code
|
2018-06-06 14:04:20 +09:00 |
|
|
|
f253828d49
|
Fix regressions
|
2018-06-06 13:51:51 +09:00 |
|
|
|
1dd5bdcf72
|
Move setting to new "mods" section
|
2018-06-06 12:32:59 +09:00 |
|
|
|
ee92986494
|
Merge branch 'master' into osu-hd-setting
|
2018-06-06 12:09:12 +09:00 |
|
|
|
6be382aab6
|
Merge branch 'master' into overlay-activation
|
2018-06-06 10:07:22 +09:00 |
|
|
|
316c928e44
|
Merge pull request #2692 from smoogipoo/fix-replay-updates
Always update children when the ruleset input manager is updated
|
2018-06-06 09:58:07 +09:00 |
|
|
|
26569b434c
|
Merge branch 'master' into fix-replay-updates
|
2018-06-06 09:40:46 +09:00 |
|
|
|
a133a8229b
|
Merge branch 'master' into fix-ImportBeatmapTest
|
2018-06-06 09:34:19 +09:00 |
|
|
|
ce94f87b1f
|
Merge pull request #2727 from DrabWeb/score-component-tooltips
Rewrite ScoreComponentLabel
|
2018-06-06 09:32:58 +09:00 |
|
|
|
d2633a706d
|
Merge branch 'master' into score-component-tooltips
|
2018-06-06 09:06:22 +09:00 |
|
|
|
21837c64cf
|
Merge pull request #2698 from Joehuu/source-link-colour
Remove link colours from beatmap tags
|
2018-06-06 08:51:54 +09:00 |
|
|
|
00c8d2ff11
|
Merge branch 'master' into source-link-colour
|
2018-06-06 08:27:28 +09:00 |
|
|
|
fe35c0220a
|
Update deploy script
|
2018-06-05 20:33:55 +09:00 |
|
|
|
59277de0df
|
Remove osu.Desktop.Deploy
|
2018-06-05 19:45:25 +09:00 |
|
|
|
9af9b1c937
|
Remove framework submodule reference completely
|
2018-06-05 19:41:37 +09:00 |
|
|
|
115595251d
|
Remove unnecessary reference in osu.Desktop
|
2018-06-05 15:02:34 +09:00 |
|
|
|
601ef3b6f7
|
Consume osu.Framework via nuget
|
2018-06-05 14:14:56 +09:00 |
|
|
|
3b03a25ea5
|
Fix beatmaps with subfolders importing incorrectly on windows
Closes #2718.
|
2018-06-05 11:36:44 +09:00 |
|
|
|
b84441ab87
|
Fix TestImportOverIPC
|
2018-06-04 22:25:18 +09:00 |
|
|
|
69e75bfa09
|
Merge pull request #2705 from peppy/fix-beatmap-info-wedge-async
Fix incorrect async logic in BeatmapInfoWedge
|
2018-06-04 20:42:55 +09:00 |
|
|
|
b2cc7b9a5c
|
Merge branch 'master' into fix-beatmap-info-wedge-async
|
2018-06-04 20:29:29 +09:00 |
|
|
|
877bc3ce5c
|
Merge pull request #2683 from peppy/better-loading-logo
Improve feel of initial loading osu! logo
|
2018-06-04 20:29:18 +09:00 |
|
|
|
566470e852
|
Merge branch 'master' into better-loading-logo
|
2018-06-04 20:06:22 +09:00 |
|
|
|
faa305528e
|
Merge pull request #2721 from peppy/handle-web-request-failures
Fix web request failures not being correctly handled at an APIRequest level
|
2018-06-04 20:05:54 +09:00 |
|
|
|
5d45664669
|
Merge branch 'master' into handle-web-request-failures
|
2018-06-04 19:49:12 +09:00 |
|
|
|
6a04e87690
|
Merge pull request #2716 from peppy/hide-flash-gap
Fix menu flashes not extending to the edge of screen during parallax
|
2018-06-04 19:49:08 +09:00 |
|
|
|
f9b6de67b8
|
Merge branch 'master' into hide-flash-gap
|
2018-06-04 19:29:10 +09:00 |
|
|
|
92377b5810
|
Merge pull request #2714 from peppy/netcoreapp2.1
Update framework to .NET Core 2.1
|
2018-06-04 05:43:27 +02:00 |
|
|
|
88b23d4e66
|
Merge branch 'master' into netcoreapp2.1
|
2018-06-04 05:30:25 +02:00 |
|
|
|
7701cac297
|
Merge branch 'master' into overlay-activation
|
2018-06-04 11:37:14 +09:00 |
|
|
|
27ad1c4ee9
|
Merge pull request #2725 from ekrctb/fix-TestCaseBeatmapCarousel
Fix TestCaseBeatmapCarousel occasionally failing
|
2018-06-04 11:24:51 +09:00 |
|
|
|
3ad0735a33
|
Merge branch 'master' into fix-TestCaseBeatmapCarousel
|
2018-06-04 11:16:17 +09:00 |
|
|
|
0f7b23d765
|
Add param explanatory blurb to xmldoc
|
2018-06-04 11:11:07 +09:00 |
|
