1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:47:25 +08:00
Commit Graph

7066 Commits

Author SHA1 Message Date
smoogipooo
4683319156 Merge remote-tracking branch 'origin/master' into mania-hit-explosions 2017-09-11 14:48:40 +09:00
smoogipooo
e8efdcf188 Make tick explosions white and lower scale. 2017-09-11 14:37:34 +09:00
Dan Balasescu
a9ad02c29f Merge pull request #1238 from peppy/fix-autoplay
Fix regression causing autoplay to fail
2017-09-11 14:32:29 +09:00
Dean Herbert
512232c1c8 Fix regression causing autoplay to fail 2017-09-11 14:25:01 +09:00
smoogipooo
2c3131d391 Remove green coloration when hit. 2017-09-11 13:56:10 +09:00
smoogipooo
9e3206fef3 Improve test case a little bit. 2017-09-11 13:55:34 +09:00
smoogipooo
3026675f35 Add explosions. 2017-09-11 13:44:39 +09:00
smoogipooo
0cadee998c Set default AccentColour for hit objects 2017-09-11 13:44:05 +09:00
Dean Herbert
9d6571a1cb Merge pull request #1237 from peppy/update-managedbass-retarget
Update framework and target .NET 4.6.1
2017-09-11 12:57:13 +09:00
smoogipooo
10f0d1f20d Pass down OnJudgement to columns. 2017-09-11 12:57:10 +09:00
Dean Herbert
712c6942a9 Update submodules 2017-09-11 12:52:25 +09:00
Dean Herbert
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
Dean Herbert
81d04ea959 Merge pull request #1222 from DrabWeb/beatmap-details-rewrite
Beatmap details rewrite
2017-09-11 12:36:44 +09:00
Dean Herbert
adba5b5ba6 Merge branch 'master' into beatmap-details-rewrite 2017-09-11 12:30:32 +09:00
Dean Herbert
71fe39244b Merge pull request #1235 from peppy/nullref-fix
Fix nullref when loading MusicController VisualTest after Player VisualTest
2017-09-11 12:23:29 +09:00
Dan Balasescu
24f7b6823e Merge branch 'master' into nullref-fix 2017-09-11 12:13:43 +09:00
Dan Balasescu
01b294e6b5 Merge pull request #1236 from peppy/ci-refixes
Fix newly occurring CI issues
2017-09-11 12:02:34 +09:00
Dean Herbert
3cacee300a Fix a false resharper positive 2017-09-11 11:41:29 +09:00
Dean Herbert
eedfbdc0e8 Add nullref check in KeyCounterCollection's Add method 2017-09-11 11:41:09 +09:00
Dean Herbert
4f6c93aa0f Update framework 2017-09-11 11:34:40 +09:00
Dean Herbert
8d919e42c9 Fix nullref when loading MusicController VisualTest after Player VisualTest 2017-09-11 11:18:53 +09:00
smoogipooo
42dc4d9b1c Rework mania playfield to be more sane with masking/nesting. 2017-09-11 10:46:54 +09:00
Dean Herbert
cb24b5c436 Merge branch 'master' into beatmap-details-rewrite 2017-09-11 10:18:34 +09:00
Dan Balasescu
d42aab96d1 Merge pull request #1234 from peppy/fix-volume-wheel
Fix individual volume controls not being adjustable via wheel
2017-09-11 08:37:00 +09:00
Dean Herbert
f33bd700c5 Fix individual volume controls not being adjustable via wheel
They were blocking each others' input unnecessarily.
2017-09-11 08:27:29 +09:00
Dean Herbert
7d4ca40965 Merge pull request #1219 from naoey/fix-mono-crash
Fix startup crash on mono.
2017-09-10 11:58:58 +09:00
Dean Herbert
0a9ca8a1ff Update framework 2017-09-10 11:53:47 +09:00
Dean Herbert
ea35b69f2f Merge branch 'master' into fix-mono-crash 2017-09-10 11:49:20 +09:00
Dean Herbert
6d33e39c5e Merge branch 'master' into beatmap-details-rewrite 2017-09-10 11:26:00 +09:00
Dean Herbert
f5b3afbe10 Merge pull request #1228 from naoey/direct-upgrades
Direct results maintain download status between switching views
2017-09-09 18:00:11 +09:00
naoey
0c2bad1de4 Get rid of some properties and todos. 2017-09-09 12:44:27 +05:30
naoey
d12a5e927a Rename property. 2017-09-09 11:03:25 +05:30
naoey
e67606e203 Return existing download if it exists. 2017-09-09 10:25:28 +05:30
naoey
5f5dd54f9d Use a List instead of a Dictionary. 2017-09-09 09:56:01 +05:30
naoey
20becbe576 Use the specifically created progress action, add license header. 2017-09-09 01:53:42 +05:30
naoey
5a3814b02e
XMLdoc fixes and a cautionary check. 2017-09-09 01:04:55 +05:30
naoey
0e4973020a
Resharper and test case fixes. 2017-09-09 00:58:54 +05:30
naoey
00306b6e38
Maintain download progress between switching result views.
- Check for existing download requests on creating DirectPanel
- Actually remove downloaded beatmap from results
2017-09-09 00:57:48 +05:30
naoey
31a507372a
Don't show beatmaps that are already added. 2017-09-09 00:57:48 +05:30
naoey
20f93c83d6
Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
Dean Herbert
4dc67ed796 Merge pull request #1226 from MrTheMake/channelsection-initial-appearance
Fix wrong initial topic color of not joined channels in the channel selection
2017-09-09 02:44:36 +09:00
DrabWeb
d95940ed5e CI fixes. 2017-09-08 14:25:41 -03:00
DrabWeb
ce68b6661e Update visual test. 2017-09-08 14:15:28 -03:00
MrTheMake
5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
Dean Herbert
6b3b012960 Merge pull request #1225 from peppy/non-null-beatmap
Ensure that WorkingBeatmap's Beatmap is never null
2017-09-08 23:43:32 +09:00
Dean Herbert
9b790157d8 Merge branch 'master' into non-null-beatmap 2017-09-08 23:33:03 +09:00
Dean Herbert
a769b94aa8 Merge pull request #1223 from peppy/home-hides-overlays
Hide all overlays when home button is pressed
2017-09-08 23:32:50 +09:00
Dean Herbert
7b497c0ecb Update framework 2017-09-08 23:24:47 +09:00
Dan Balasescu
3166394a59 Merge branch 'master' into home-hides-overlays 2017-09-08 23:23:20 +09:00
Dean Herbert
c0d7a257ee Merge pull request #1103 from MrTheMake/leaderboard-scores
Parse and show the mods of online leaderboards' scores
2017-09-08 21:51:51 +09:00