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

2584 Commits

Author SHA1 Message Date
Dan Balasescu
cd30958086 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 01:25:22 +09:00
Dean Herbert
3e3cde01ef
Fix missing permitNulls. 2017-03-17 21:21:16 +09:00
Dean Herbert
cefb59caa0 Merge pull request #497 from smoogipooo/controlpoint_effects
Add reading of KiaiMode/OmitFirstBarLine from legacy control points.
2017-03-17 21:11:13 +09:00
Dean Herbert
0a03bdc428
Add missing license header. 2017-03-17 20:44:02 +09:00
Dean Herbert
6be80c95ae
Preload song select from main menu. 2017-03-17 20:11:59 +09:00
Dean Herbert
c7fa79b027
Fix nullref. 2017-03-17 20:09:23 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
Dean Herbert
4b97304603
CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
Dean Herbert
dc28f8c79e
Remove all external access to BeatmapGroup. 2017-03-17 19:12:15 +09:00
Dean Herbert
3401759665
Don't batch imports for now. 2017-03-17 18:57:24 +09:00
Dean Herbert
ba73968303
Load whole panel background in async. 2017-03-17 18:28:21 +09:00
Dean Herbert
2abcdbf4df
Fix potentially incorrect states being applied to panels on first display. 2017-03-17 14:56:12 +09:00
smoogipooo
a06c195e1f Add reading of KiaiMode/OmitFirstBarLine from legacy control points. 2017-03-17 13:23:39 +09:00
Dean Herbert
163a21a7bf Merge pull request #495 from smoogipooo/better_hitobject_defaults
Better hitobject defaults
2017-03-17 12:23:44 +09:00
Dean Herbert
cd98af29c4
Only calculate difficulties on import for now. 2017-03-17 11:53:13 +09:00
Dean Herbert
9c664e5b05
Reorganise song select methods to allow for more flexibility. 2017-03-17 11:52:54 +09:00
Dean Herbert
5474710c13 Merge branch 'master' into better_hitobject_defaults 2017-03-17 02:51:15 +09:00
Dean Herbert
049af04a92 Merge pull request #492 from smoogipooo/scoreprocessor_computation
Scoreprocessor computation
2017-03-17 02:50:54 +09:00
smoogipooo
88dfdf3f85 Add xmldoc. 2017-03-17 02:22:52 +09:00
smoogipooo
9a4af8f194 GetScore -> CreateScore. 2017-03-17 02:03:12 +09:00
smoogipooo
d5ec7f15d4 score -> ScoreProcessor. 2017-03-17 02:00:58 +09:00
smoogipooo
fe11f328e6 Cleanups. 2017-03-17 02:00:06 +09:00
smoogipooo
2394e7ff78 Make CheckFailed not actually trigger internal things, and make private. 2017-03-17 01:36:30 +09:00
smoogipooo
52c1cd407c Minor re-ordering to make Playfield OnJudgement be called before ScoreProcessor's. 2017-03-17 01:26:12 +09:00
smoogipooo
33124d2849 Stale -> default. 2017-03-17 01:21:59 +09:00
Dean Herbert
61e7d427f7 Merge branch 'master' into scoreprocessor_computation 2017-03-17 01:04:07 +09:00
Dean Herbert
847f96de94 Merge pull request #491 from smoogipooo/scoreprocessor_failing_improvements
Scoreprocessor failing improvements
2017-03-17 01:03:35 +09:00
Dean Herbert
ea642e5ef4 Merge branch 'master' into scoreprocessor_failing_improvements 2017-03-17 00:52:30 +09:00
Dan Balasescu
e2f521220a Merge pull request #496 from peppy/tab-control-documentation
Update TabControl in line with framework changes.
2017-03-17 00:51:01 +09:00
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
smoogipooo
faacac331d Fix post-rebase issues. 2017-03-17 00:38:40 +09:00
smoogipooo
9f6f581b64 Pass through method instead of instantiating object. 2017-03-17 00:36:10 +09:00
smoogipooo
0c47638820 Better hit object defaults setting. 2017-03-17 00:36:09 +09:00
smoogipooo
b13340c3c8 Move CheckFailed outside of Schedule(). 2017-03-17 00:30:23 +09:00
Dean Herbert
296a3cd1e9 Merge pull request #494 from smoogipooo/beatmap_timinginfo
Replace List<ControlPoint> with TimingInfo in Beatmap.
2017-03-16 23:30:14 +09:00
smoogipooo
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
smoogipooo
28e006eeb9 Move MapDifficultyRange into BaseDifficulty. 2017-03-16 23:17:27 +09:00
Dean Herbert
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
Dean Herbert
c8bd86fabd Merge pull request #490 from smoogipooo/generic_scoreprocessor
Generic scoreprocessor
2017-03-16 23:08:00 +09:00
Dean Herbert
271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
Dean Herbert
3d1556c7f2 Merge pull request #455 from 2yangk23/master
Add FilterControl implementation
2017-03-16 22:41:47 +09:00
Dean Herbert
c07cba7f88
Update framework. 2017-03-16 22:19:47 +09:00
Dean Herbert
8cd1353d74
Fix serious input regression. 2017-03-16 22:09:35 +09:00
Dean Herbert
2cf6ed423e
Disallow duplicate active changes. 2017-03-16 21:33:08 +09:00
Dean Herbert
84b080a060
Make transition logic a bit more sane. 2017-03-16 21:26:03 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
Dean Herbert
64825c32c5
Add margin to testcase to better see edges. 2017-03-16 21:16:30 +09:00
Dean Herbert
3b77fcd5d5
Update framework. 2017-03-16 19:15:18 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00