2952 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	f4f5715906	Resharper.	2017-03-18 18:37:48 +09:00
smoogipooo	77bdfe880a	Fix post-merge errors.	2017-03-18 18:34:45 +09:00
smoogipooo	aa565274de	Merge branch 'legacy_beatmap_flag' into taiko_conversion ... Conflicts: osu.Game/Beatmaps/Legacy/IIsLegacy.cs	2017-03-18 18:34:00 +09:00
smoogipooo	26b0bb02d8	Remove IIsLegacy, expose LegacyBeatmap without a public constructor.	2017-03-18 18:32:54 +09:00
DrabWeb	0bc8ed9c9e	Use Colour for non-faded scores	2017-03-18 01:56:19 -03:00
DrabWeb	e78069af12	Parenthesis	2017-03-18 01:48:29 -03:00
DrabWeb	b9d5ab5d8c	Only calculate fade for fading leaderboard scores	2017-03-18 01:44:05 -03:00
Dean Herbert	33d70b9bbc	Update framework.	2017-03-18 13:23:58 +09:00
DrabWeb	fbb8e79f1a	Move ctor above methods	2017-03-17 19:45:51 -03:00
DrabWeb	137611ecf3	Use LeaderboardScore height for fade	2017-03-17 19:07:45 -03:00
DrabWeb	82c02fa1fc	Formatting	2017-03-17 18:29:55 -03:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
DrabWeb	27ab8e2e86	Merge	2017-03-17 18:21:35 -03:00
DrabWeb	0834b5b794	Made requested changes	2017-03-17 18:16:59 -03:00
Jorolf	8568e1536c	Separated menu and gameplay cursor size	2017-03-17 18:40:03 +01:00
Dan Balasescu	124efe8126	Merge pull request #504 from peppy/song-select-loading-reoptimisation ... Song select performance / code cleanup.	2017-03-18 02:19:02 +09:00
Dan Balasescu	e529f5e439	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 02:12:56 +09:00
smoogipooo	bcaf12e3d9	Rename Criteria -> CreateCriteria and make into method.	2017-03-18 02:11:14 +09:00
Dan Balasescu	af55bc4a12	Merge pull request #505 from peppy/menu-cursor ... Add menu cursor.	2017-03-18 02:09:10 +09:00
smoogipooo	77067b7e64	Re-style.	2017-03-18 02:04:23 +09:00
Dan Balasescu	1fda7ee33e	Merge branch 'master' into menu-cursor	2017-03-18 01:51:41 +09:00
Dan Balasescu	cd30958086	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 01:25:22 +09:00
smoogipooo	dde2ac7f4a	Make TextAwesome have a shadow.	2017-03-17 22:03:47 +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	317dc94b4c	Adjust appearance.	2017-03-17 21:09:31 +09:00
Dean Herbert	ba67e63ffa	Update resources.	2017-03-17 20:53:20 +09:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	7110ab8e17	Stop cursor moving when paused.	2017-03-17 20:45:27 +09:00
Dean Herbert	292de44a0b	WIP menu cursor.	2017-03-17 20:45:27 +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
smoogipooo	2a9e8f4ed6	Fix license headers.	2017-03-17 19:54:36 +09:00
smoogipooo	605f733cf9	Add back the bash conversion factor.	2017-03-17 19:52:24 +09:00
smoogipooo	7f7e8047d4	Don't convert originally taiko hitobjects.	2017-03-17 19:51:56 +09:00
smoogipooo	e3afa9bf71	Fix post-merge errors.	2017-03-17 19:25:55 +09:00
smoogipooo	39c2703fef	Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable	2017-03-17 19:24:57 +09:00
smoogipooo	5136064cb3	Revert "Make DrawableTaikoHitObject generic." ... This reverts commit 0e4ed829f2.	2017-03-17 19:23:18 +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
smoogipooo	a2d07acb4b	Fix post-merge errors.	2017-03-17 18:59:21 +09:00
smoogipooo	91775b33e3	Merge branch 'taiko_bash_base' into taiko_bash_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-17 18:58:48 +09:00
Dean Herbert	3401759665	Don't batch imports for now.	2017-03-17 18:57:24 +09:00
smoogipooo	e2673a94bf	Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable	2017-03-17 18:57:17 +09:00
smoogipooo	0e4ed829f2	Make DrawableTaikoHitObject generic.	2017-03-17 18:55:54 +09:00
smoogipooo	891bd011c6	Add basic DrawableBash (no graphics yet, just input).	2017-03-17 18:54:44 +09:00
smoogipooo	e37def94f8	Merge branch 'taiko_judgement_scoring' into taiko_bash_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-17 18:51:56 +09:00
Dean Herbert	ba73968303	Load whole panel background in async.	2017-03-17 18:28:21 +09:00