Dean Herbert
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
Dean Herbert
8a5e25ce4b
Simplify waveform construction
2017-10-12 19:19:42 +09:00
smoogipoo
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
Huo Yaoyuan
cf7f3411fc
Ignore filename case in BeatmapManager. Fixes #1295 .
2017-10-11 15:01:02 +08:00
smoogipoo
b8d2a04fe1
Only split beatmap lines twice
2017-10-10 19:24:24 +09:00
smoogipoo
ad344eb719
Use IsNullOrWhiteSpace instead of trimming
2017-10-10 19:21:38 +09:00
smoogipoo
29c2a29798
Fix trimming too early in OsuLegacyDecoder crashing storyboards
2017-10-09 18:47:12 +09:00
smoogipoo
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df
Update in-line with framework
2017-10-09 17:18:11 +09:00
Bang Sunghwan
bd9f2db477
Trim line
2017-10-08 17:30:21 +09:00
Bang Sunghwan
6c5c734ff1
Trim end of line
...
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
smoogipoo
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
EVAST9919
aafead5057
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-03 01:34:42 +03:00
Dean Herbert
12a9cbad56
Allow Beatmap to populate some metadata defaults if they aren't provided via BetamapInfo
2017-10-02 21:54:26 +08:00
EVAST9919
3cd6319ffa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-27 00:32:38 +03:00
Dan Balasescu
b8b54e95a5
Merge branch 'master' into editor-timing-timeline
2017-09-26 15:54:01 +09:00
smoogipoo
d86e81f07c
Better expression to avoid invalid values
2017-09-25 18:00:52 +09:00
smoogipoo
d787c740fa
Fix bookmarks not working
...
We should be dealing with the array in every situation, with the exception of the database.
2017-09-25 17:46:51 +09:00
Jorolf
72141935e8
make pagination work and remove duplication in RanksSection
2017-09-21 22:07:23 +02:00
DrabWeb
cb4818e84e
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-21 14:25:34 -03:00
smoogipooo
6a9572db6c
Merge branch 'master' into editor-timing-timeline
...
# Conflicts:
# osu-framework
2017-09-20 16:19:08 +09:00
EVAST9919
1b0ab414fa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-19 17:23:10 +03:00
smoogipooo
67d3861226
Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
...
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
Dean Herbert
3000323727
Give WorkingBeatmap's Metadata a non-null default
2017-09-19 21:41:18 +09:00
Dean Herbert
4b0eee2bcc
Merge remote-tracking branch 'upstream/master' into merge-projects
2017-09-19 20:43:20 +09:00
Dean Herbert
c41ca10715
Allow files missing on disk to be restored on beatmap import
...
Previously, in the rare case the database became out of sync with the disk store, it was impossible to feasibly repair a beatmap. Now reimporting checks each file exists on disk and adds it back if it doesn't.
2017-09-19 18:35:52 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Damnae
5a76ed4000
Fix LegacyFilesystemReader Filenames property.
2017-09-18 10:14:29 +02:00
ColdVolcano
8944d0f705
make it only look for files instead of directories
2017-09-16 18:44:32 -05:00
ColdVolcano
47b62803d8
Account for all files instead of just the main directory ones
2017-09-15 15:47:56 -05:00
EVAST9919
740e766201
BreakOverlay and LetterboxOverlay implementation
2017-09-15 19:39:55 +03:00
Dean Herbert
02fa9eeb3b
Merge branch 'master' into online-beatmap-set-overlay
2017-09-14 16:52:44 +09:00
Dean Herbert
33d33a49ae
Merge branch 'master' into storyboards
2017-09-14 16:06:19 +09:00
Dean Herbert
b1145272d1
Update code to support new inspectcode analysis rules
2017-09-14 12:58:32 +09:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Damnae
bab3ef0669
Rename storyboard classes.
2017-09-13 11:22:24 +02:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
DrabWeb
ba90fc87d0
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-12 23:41:57 -03:00
DrabWeb
97e5a0d4a3
CI fixes.
2017-09-12 23:41:10 -03:00
Dean Herbert
1de1b882e3
Fix BeatmapInfo's comparator when not being sourced from database
2017-09-13 10:36:58 +09:00
DrabWeb
08b5d4e16c
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-12 21:26:06 -03:00
Damnae
58e65397b0
Add support for storyboards using numerical values.
2017-09-12 10:13:55 +02:00
Dean Herbert
5b9d906ad5
Improve beatmap track disposal logic
...
- [ ] Depends on https://github.com/ppy/osu-framework/pull/1035
2017-09-12 16:56:46 +09:00
Damnae
47cd1d486b
Merge branch 'master' into storyboards
2017-09-11 12:29:19 +02:00
Damnae
9eaa1cb5cd
Fix sprites not being visible when all their commands are inside loops.
2017-09-11 12:06:00 +02:00
Dean Herbert
18ad0956b4
Merge branch 'master' into maybefix
2017-09-11 18:23:00 +09:00
DrabWeb
4be8899fb2
Move Length to BeatmapOnlineInfo.
2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0
Details and more data displaying.
2017-09-11 02:48:48 -03:00
DrabWeb
e61ab72c0d
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-11 01:24:52 -03:00
Damnae
bc01d9a1b0
Animate Additive / FlipH and FlipV.
2017-09-09 15:41:56 +02:00
