1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 15:17:28 +08:00
Commit Graph

64 Commits

Author SHA1 Message Date
Aergwyn
7080711cb2 remove unnecessary using 2017-11-30 20:13:10 +01:00
Aergwyn
c16925059c split parsing a beatmap and parsing a storyboard 2017-11-30 19:16:13 +01:00
Aergwyn
016057ab01 readd storyboard to beatmap + minor cleanup 2017-11-30 16:49:53 +01:00
Aergwyn
96f5bd3323 remove Storyboard from Beatmap, add it to WorkingBeatmap 2017-11-29 21:54:04 +01:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09: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
Damnae
bab3ef0669 Rename storyboard classes. 2017-09-13 11:22:24 +02:00
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
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
Damnae
e547416193 Storyboards implementation. 2017-09-08 09:08:52 +02:00
Dean Herbert
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00
smoogipooo
74c23ff6d8 Add base for event parsing code. 2017-05-17 20:46:23 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
smoogipooo
27ddf4b475 Refactor beatmap converters. 2017-04-18 14:31:06 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
Dean Herbert
83b083ce64
Move SQLite connections out of database classes; make abstract Database. 2017-04-17 14:37:52 +09:00
smoogipooo
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
smoogipooo
862c4c408f Add legacy beatmap flag. 2017-03-17 14:24:46 +09:00
smoogipooo
8479880d44 Move SliderVelocityAt into TimingInfo, fix xmldoc. 2017-03-17 13:33:39 +09:00
smoogipooo
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
smoogipooo
d6ccc66b23 Attempt to fix nullref warning. 2017-03-14 17:46:35 +09:00
smoogipooo
7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
smoogipooo
3480dca0ad Remove PlayMode enum requirement. Clean things up a lot. 2017-03-12 14:32:50 +09:00
smoogipooo
b0ea282a06 Fix map would always be converted to itself when actually converting to a different game mode. 2017-03-12 02:26:10 +09:00
smoogipooo
1c7a9e3a07 General fixups. 2017-03-12 01:26:07 +09:00
smoogipooo
77a4a896c9 Cleanups. 2017-03-12 01:08:34 +09:00
smoogipooo
592e05a2c8 Better beatmap conversion model. 2017-03-12 00:34:21 +09:00
Dean Herbert
afdb95f4d5
Fix even more test regressions. 2017-02-27 20:39:04 +09:00
Thomas Müller
f7d985fe18 Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
Dean Herbert
94dd268fd2
Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
Thomas Müller
ef775458dd Fix compilation error introduced in merge conflict resolution. 2017-02-17 21:27:17 +01:00
Thomas Müller
1198705a6f Merge branch 'master' of github.com:ppy/osu into general-fixes
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2017-02-17 21:22:34 +01:00
Shadoxfix
7a45ea58b2 Add comment explaining why the branch is necessary 2017-02-17 18:17:18 +01:00
Shadoxfix
72306e8757 Fix beatmap import crash when the first timingPoint starts later than a slider 2017-02-17 17:36:00 +01:00
Dean Herbert
0b922365bb
Fix nullref due to missing controlPoints. 2017-02-17 15:27:48 +09:00
Damnae
b7fca88b4f Clearer slider Velocity and TickDistance calculations. 2017-02-15 18:55:49 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
9f90b57543 Move BPM calculations to Beatmap. 2017-01-30 16:03:45 +09:00
n4b3l
73532b9172 small code improvements 2016-12-17 19:57:58 +01:00
Thomas Müller
a0131b8b25 Fix slider velocity not being applied. 2016-12-03 14:52:51 +01:00
Dean Herbert
bf63be0602 Add better slider duration calculation using bpm and difficulty information. 2016-11-28 15:31:54 +09:00