h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 17:33:03 +08:00
Code Issues Releases Wiki Activity
12,899 Commits 3 Branches 661 Tags 357 MiB
0c62726fd7
Commit Graph

12899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
a645a109be
Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
Dean Herbert
35d733fa97
Merge pull request #2730 from ekrctb/fix-ImportBeatmapTest 
Fix ImportBeatmapTest not working on .net core
 2018-06-06 19:08:45 +09:00
Dean Herbert
e65b34336b
Merge branch 'master' into fix-ImportBeatmapTest 2018-06-06 18:56:31 +09:00
ekrctb
94a22fb43d Merge branch 'fix-ImportBeatmapTest' of https://github.com/ekrctb/osu into fix-ImportBeatmapTest 2018-06-06 18:37:04 +09:00
ekrctb
aeeb03ff9c simpler temporary path generation 2018-06-06 18:36:43 +09:00
Dean Herbert
0a97b8ae25 Implement DebugUtils locally 
Has been removed from framework
 2018-06-06 18:33:10 +09:00
smoogipoo
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
Dean Herbert
5a4408e359 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 18:22:22 +09:00
Dean Herbert
9306fec498 Fix missing null checks 2018-06-06 18:21:03 +09:00
Aergwyn
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
Dean Herbert
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
Dean Herbert
9e25e02696 Ensure notifications don't appear during UserTriggered mode 
Closes #2640.
 2018-06-06 15:50:24 +09:00
Dean Herbert
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
DrabWeb
7819be7957 Remove unused using. 2018-06-06 03:28:07 -03:00
DrabWeb
188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
DrabWeb
df4c855aa2 Manage subtitle inside of DownloadButton. 2018-06-06 03:13:37 -03:00
Dean Herbert
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Dean Herbert
3567823759 Reverse order of exposed objects in HitObjectContainer 
Closes #2740.
 2018-06-06 15:03:47 +09:00
Dean Herbert
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
Dean Herbert
d3cd267036 Formatting fixes 2018-06-06 14:20:51 +09:00
smoogipoo
e19ca0c120 Add nomod mod type 2018-06-06 14:08:02 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
Dean Herbert
a5679f7bf5 Improve readability of code 2018-06-06 14:04:20 +09:00
Dean Herbert
f253828d49 Fix regressions 2018-06-06 13:51:51 +09:00
Dean Herbert
1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
Dean Herbert
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
Dean Herbert
26569b434c
Merge branch 'master' into fix-replay-updates 2018-06-06 09:40:46 +09:00
Dean Herbert
a133a8229b
Merge branch 'master' into fix-ImportBeatmapTest 2018-06-06 09:34:19 +09:00
Dean Herbert
ce94f87b1f
Merge pull request #2727 from DrabWeb/score-component-tooltips 
Rewrite ScoreComponentLabel
 2018-06-06 09:32:58 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips 2018-06-06 09:06:22 +09:00
Dean Herbert
21837c64cf
Merge pull request #2698 from Joehuu/source-link-colour 
Remove link colours from beatmap tags
 2018-06-06 08:51:54 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
DrabWeb
80951eae68 Inherit BeatmapSetDownloader from Component. 2018-06-05 18:09:26 -03:00
Dean Herbert
fe35c0220a Update deploy script 2018-06-05 20:33:55 +09:00
Dean Herbert
59277de0df Remove osu.Desktop.Deploy 2018-06-05 19:45:25 +09:00
Dean Herbert
9af9b1c937 Remove framework submodule reference completely 2018-06-05 19:41:37 +09:00
Dean Herbert
115595251d Remove unnecessary reference in osu.Desktop 2018-06-05 15:02:34 +09:00
Dean Herbert
601ef3b6f7 Consume osu.Framework via nuget 2018-06-05 14:14:56 +09:00
Dean Herbert
3b03a25ea5 Fix beatmaps with subfolders importing incorrectly on windows 
Closes #2718.
 2018-06-05 11:36:44 +09:00
DrabWeb
4cf7a64636 Remove unused parameter. 2018-06-04 22:26:52 -03:00
DrabWeb
d8154f8cad Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded. 2018-06-04 21:11:27 -03:00
DrabWeb
61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
DrabWeb
c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
DrabWeb
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb
9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00
DrabWeb
698a42f145 BeatmapSetDownloadButton -> BeatmapSetDownloader 
Allows it to integrate better with existing buttons, like HeaderButton.
 2018-06-04 20:12:43 -03:00
ekrctb
b84441ab87 Fix TestImportOverIPC 2018-06-04 22:25:18 +09:00