1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Commit Graph

7368 Commits

Author SHA1 Message Date
smoogipooo
af07d5cc51 Update framework. 2017-09-11 03:37:13 +09:00
Damnae
59d9dc5ee7 Ignore storyboard sprites with invalid positions. 2017-09-10 20:08:56 +02:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +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
Damnae
bc01d9a1b0 Animate Additive / FlipH and FlipV. 2017-09-09 15:41:56 +02:00
Damnae
8d55cb7f92 Improve command sorting. 2017-09-09 11:00:58 +02: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
Damnae
12de737084 Merge branch 'master' into storyboards
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2017-09-08 21:46:34 +02:00
Damnae
57e53ff03a Fix diff-specific storyboard content being lost after loading. 2017-09-08 21:36:30 +02:00
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
Damnae
4ab243d885 CI fixes. 2017-09-08 21:23:24 +02:00
Damnae
e8ab853f6f Make storyboard loops work. 2017-09-08 21:07:40 +02:00
Damnae
e4a2ad5eb5 Fix storyboard sprite flipping. 2017-09-08 20:39:17 +02:00
Dean Herbert
386147cc77 Merge branch 'master' into channelselection-minimum-size 2017-09-09 02:51:47 +09:00
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
15dd8d9071 Mind the minimum size of the channel selection overlay 2017-09-08 18:21:42 +02:00
Damnae
3f2598543c Fix CommandLoop start and end time. 2017-09-08 18:03:04 +02: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
Damnae
e63fb5720c Make CI happy. 2017-09-08 13:04:53 +02:00
Damnae
6cde687d87 Fix V commands parsing. 2017-09-08 12:36:13 +02:00
MrTheMake
0b1403683b Moved OnlineScore inside GetScoresRequest.cs 2017-09-08 12:21:35 +02:00
MrTheMake
526ee107b8 Use a method to apply a beatmap, its ruleset and the mods. 2017-09-08 12:17:16 +02:00
Damnae
e02b481c69 An attempt at implementing storyboard loops. 2017-09-08 12:11:57 +02:00
Damnae
13322b4293 Improve compatibility with older storyboards. 2017-09-08 12:09:45 +02:00
Dean Herbert
a528173943 Ensure that WorkingBeatmap's Beatmap is never null
Also ensures some extra fields inside Beatmap have non-null defaults.
2017-09-08 19:05:14 +09:00
Dean Herbert
80c35801a6 Hide all overlays when home button is pressed 2017-09-08 16:18:57 +09:00
Damnae
e547416193 Storyboards implementation. 2017-09-08 09:08:52 +02:00
MrTheMake
01553fc9ef Moved all online related score parsing to its class 2017-09-08 02:46:54 +02:00
DrabWeb
55e8bdfb05 CI fixes. 2017-09-07 15:38:23 -03:00
DrabWeb
109531b66c Cleanup, remove unneeded files. 2017-09-07 15:21:18 -03:00