463 Commits

Author	SHA1	Message	Date
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
Dean Herbert	160ad1924f	Remove unneeded reference	2017-09-12 17:01:40 +09:00
smoogipooo	6a815d343c	Remove unneeded class.	2017-09-12 16:58:06 +09:00
Dan Balasescu	3be9d3c747	Merge branch 'master' into mania-autoplay	2017-09-12 16:44:05 +09:00
smoogipooo	7ad982b540	Fix ordering of license header.	2017-09-12 16:21:32 +09:00
smoogipooo	a22dd80b23	Expire HitExplosions.	2017-09-12 16:20:15 +09:00
smoogipooo	af4cc7aada	Accuracy starts at 100% for mania.	2017-09-12 16:15:04 +09:00
smoogipooo	a7b93822d7	Add initial frame	2017-09-12 16:14:52 +09:00
smoogipooo	a1baefe20e	Add 20ms delay to release frames.	2017-09-12 16:09:53 +09:00
smoogipooo	8737a1b1a5	Implement osu!mania auto replay generation.	2017-09-12 15:52:32 +09:00
smoogipooo	78764082dc	Remove taiko project reference from mania project.	2017-09-12 15:52:02 +09:00
smoogipooo	585e2399bf	Add license headers.	2017-09-12 12:02:56 +09:00
smoogipooo	57ee97e27d	Add lane glows.	2017-09-12 11:39:34 +09:00
smoogipooo	0765027cb5	Move note glow to a separate class + make it match the design a bit more.	2017-09-12 11:14:16 +09:00
smoogipooo	3c98bc065f	Fix osu!mania note masking resulting in miss judgements not occurring.	2017-09-12 09:48:17 +09:00
Dean Herbert	d66fb307dc	Fix wrong licence header	2017-09-11 19:14:37 +09:00
Dean Herbert	cf8912b30d	Merge branch 'master' into mania-judgement-text	2017-09-11 19:04:22 +09:00
smoogipooo	df0a31bf2a	Add judgement text displays to osu!mania	2017-09-11 17:56:02 +09:00
Dean Herbert	7b92bbfa86	Merge branch 'master' into mania-hit-explosions	2017-09-11 17:34:14 +09:00
smoogipooo	54aff432fe	Fix CI error	2017-09-11 15:43:23 +09:00
Dan Balasescu	6ecd530d7b	Add missing license header	2017-09-11 15:24:28 +09:00
smoogipooo	f3c6f6f959	Merge branch 'blending-equations' into mania-holdnote-niceness	2017-09-11 15:09:01 +09:00
smoogipooo	de7d50d384	Better variable + comment naming	2017-09-11 15:08:51 +09:00
smoogipooo	4683319156	Merge remote-tracking branch 'origin/master' into mania-hit-explosions	2017-09-11 14:48:40 +09:00
Dean Herbert	b01233eddc	Fix CI issues	2017-09-11 14:48:01 +09:00
smoogipooo	e8efdcf188	Make tick explosions white and lower scale.	2017-09-11 14:37:34 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
smoogipooo	2c3131d391	Remove green coloration when hit.	2017-09-11 13:56:10 +09:00
smoogipooo	3026675f35	Add explosions.	2017-09-11 13:44:39 +09:00
smoogipooo	10f0d1f20d	Pass down OnJudgement to columns.	2017-09-11 12:57:10 +09:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
smoogipooo	42dc4d9b1c	Rework mania playfield to be more sane with masking/nesting.	2017-09-11 10:46:54 +09:00
smoogipooo	2f72dff779	Update with framework changes.	2017-09-11 08:59:56 +09:00
smoogipooo	2086ed209d	Fix hold note tick input.	2017-09-11 04:51:44 +09:00
smoogipooo	9cd3af11d5	Fix hold note tick position + lifetime.	2017-09-11 04:45:10 +09:00
smoogipooo	79a9612243	Remove now unnecessary comment.	2017-09-11 04:39:04 +09:00
smoogipooo	8bb8999820	More TestCaseManiaHitObjects fixes.	2017-09-11 04:34:30 +09:00
smoogipooo	3b5e847a31	Better updateGlow methods.	2017-09-11 04:29:32 +09:00
smoogipooo	590a34dc28	Add glow to DrawableHoldNote	2017-09-11 04:22:17 +09:00
smoogipooo	73d77637ef	Add glow to DrawableNote	2017-09-11 04:22:05 +09:00
smoogipooo	8797382700	Update body styling of hold notes	2017-09-11 04:21:43 +09:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
smoogipooo	b085208d24	Remove unused code	2017-09-07 16:15:33 +09:00
smoogipooo	ef9b87e8c7	Make column lights not increase in brightness when successfully pressed	2017-09-07 16:15:25 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
smoogipooo	115e5c95af	Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.	2017-08-23 20:50:03 +09:00
Dean Herbert	bdd0a51c6e	Fix left keys setting defaults in incorrect order	2017-08-23 16:10:10 +09:00
smoogipooo	4395ea3850	Add applied suggestions.	2017-08-23 15:37:22 +09:00
smoogipooo	68e7cf854f	Add variant names.	2017-08-23 14:19:14 +09:00
smoogipooo	d8dfcc614a	Make mania work with key bindings	2017-08-23 13:42:16 +09:00
smoogipooo	0e41fc8842	Add mania bindings.	2017-08-23 12:49:50 +09:00
smoogipooo	2f2abf122b	Add exceptions galore.	2017-08-22 16:46:12 +09:00
smoogipooo	e337fbcf4f	Make availableColumns into a ctor argument.	2017-08-22 16:22:40 +09:00
smoogipooo	909cae5861	CI fixes.	2017-08-22 14:21:28 +09:00
smoogipooo	68c7226d12	Fix cherry pick issues.	2017-08-22 14:18:17 +09:00
smoogipooo	9a7c9e9af0	Disable reversing for now - this needs to be re-implemented in a later PR.	2017-08-22 14:17:57 +09:00
smoogipooo	cd3c825bd2	Fix mania playfield not working.	2017-08-22 14:07:46 +09:00
smoogipooo	88151eff3f	Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.	2017-08-22 14:07:39 +09:00
smoogipooo	4eec59f669	Only set the number of availableColumns once, at ManiaRulesetContainer level. ... # Conflicts: # osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2017-08-22 14:07:37 +09:00
Dean Herbert	ea450fecf5	Merge branch 'master' into action-key-counter	2017-08-21 16:25:44 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
MrTheMake	e54f659916	Suggested changes	2017-08-13 22:37:39 +02:00
MrTheMake	81289db33b	CI fix, fixed nullref and removed abstraction of GetAutoplayMod	2017-08-13 20:12:01 +02:00
MrTheMake	d9c26f98c7	Suggested changes	2017-08-13 19:54:07 +02:00
MrTheMake	4c2d7bf343	Parse the mods of a leaderboard's score	2017-08-13 17:41:13 +02:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	7c0e7ebcd0	Give HitRenderer a reference to Ruleset ... Used to get correct bindings for a mode (ActionMappingInputManager).	2017-08-09 13:05:52 +09:00
Dean Herbert	da5f2fc6af	Merge remote-tracking branch 'origin/catch-catcher' into catch	2017-08-09 09:28:50 +09:00
Dan Balasescu	21d44b1e99	Remove correct duplicate code. ... Already present on line 51.	2017-08-09 06:24:08 +09:00
John Neijzen	9e17549d7f	Update HitObjectPatternGenerator.cs	2017-08-08 22:56:27 +08:00
smoogipooo	c5ce86b9f3	Add reversing capability to ScrollingPlayfield.	2017-08-08 12:59:50 +09:00
smoogipooo	12f9793fec	Fix mania bar lines not working.	2017-08-07 17:46:22 +09:00
smoogipooo	f3c05fe232	CI fixes.	2017-08-07 17:34:57 +09:00
smoogipooo	933740664c	SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.	2017-08-07 16:43:54 +09:00
smoogipooo	a3efca9c35	Reduce implementation overhead in actually positioning hitobjects and making them scroll.	2017-08-07 16:02:38 +09:00
smoogipooo	c6447e40f9	Reduce implementation overhead for nested playfields (e.g. playfield + columns).	2017-08-07 14:56:26 +09:00
smoogipooo	b1d25ed388	Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection). ... Also removing a lot of mania code relating to gravity mod for now.	2017-08-04 23:07:08 +09:00
smoogipooo	54503eef71	Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract.	2017-08-04 22:50:29 +09:30
smoogipooo	4a9f3aa70d	Merge remote-tracking branch 'origin/master' into timingchange-improvements	2017-08-04 20:11:24 +09:30
smoogipooo	0f901c99a0	Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.	2017-08-04 20:11:18 +09:30
Huo Yaoyuan	62b3540fd6	Merge branch 'master' into fixes	2017-08-04 13:49:03 +08:00
Huo Yaoyuan	eb9972581e	Provide Autoplay mod in Ruleset.	2017-08-04 00:25:24 +08:00
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Dean Herbert	64f2e2dc32	Use Colour instead of ColourInfo	2017-07-23 13:06:16 +02:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
Thomas Müller	598b3f051e	Address CI concerns and update framework	2017-07-22 11:15:45 +02:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
Dean Herbert	21d07428fe	Fix some test regressions	2017-07-19 15:16:59 +09:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +03:00
Thomas Müller	a5e610a7ba	Update framework and fix compilation ... Most issues were related to BeginLoopedSequence usage and lack of "this." in front of transform helpers.	2017-07-14 19:18:12 +03:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
Thomas Müller	e8ce3e16b0	Address CI concern	2017-07-10 12:52:29 +03:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
Dean Herbert	89c8a34025	Merge branch 'master' into better-drawablehitobject-lifetimes	2017-06-21 20:13:57 +09:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	34ac932fe2	Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.	2017-06-19 10:54:23 +09:00
smoogipooo	28e48eab2b	CI fixes.	2017-06-16 19:30:30 +09:00
smoogipooo	4afe83e74e	Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing. ... This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.	2017-06-16 19:21:54 +09:00
smoogipooo	ea87aca032	We no longer need to pass in the control point.	2017-06-16 13:12:36 +09:00
smoogipooo	874db28478	CI fixes.	2017-06-16 13:09:06 +09:00
smoogipooo	5bac0919f0	Remove gross autoSizingAxes and life time.	2017-06-16 13:00:08 +09:00
smoogipooo	5d7336b235	A bit more cleanup.	2017-06-16 10:06:47 +09:00
smoogipooo	fda220acbc	Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.	2017-06-15 19:34:28 +09:00
Dan Balasescu	6fd37ebc32	Merge branch 'master' into timingchange-rework	2017-06-15 16:23:51 +09:00
Dean Herbert	41d4aee4f5	Update nuget packages ... - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820	2017-06-13 11:50:46 +09:00
smoogipooo	56244e0134	Add small test case to demonstrate usage.	2017-06-12 17:31:24 +09:00
smoogipooo	ba8014bbd9	Cleanups + xmldoc rewordings/improvements.	2017-06-12 15:20:34 +09:00
smoogipooo	419682b740	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework	2017-06-12 13:09:02 +09:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
smoogipooo	de35ea22b1	Make bar lines work again.	2017-06-09 22:03:28 +09:00
smoogipooo	1f56848442	Rewrite the way speed adjustments are applied.	2017-06-09 19:57:03 +09:00
smoogipooo	921350128d	Rename SpeedAdjustment -> MultiplierControlPoint + reworking.	2017-06-09 16:57:17 +09:00
smoogipooo	4b2669e65d	Namespace movement.	2017-06-09 16:20:55 +09:00
smoogipooo	d11002e499	Use new naming structure + VisibleTimeRange bindable.	2017-06-09 16:11:49 +09:00
smoogipooo	cd435f7ec6	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs	2017-06-09 03:37:55 +09:00
smoogipooo	8de6bdf340	Rewrite mania to use the new timing section stuff.	2017-06-09 02:43:48 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
John Neijzen	9b0e1c26a3	Clean Up Code	2017-06-07 19:53:37 +08:00
smoogipooo	8641379424	Not sure how these CI issues were missed.	2017-06-07 19:27:22 +09:00
smoogipooo	1932b58663	g -> gravity + one more xmldoc.	2017-06-07 19:21:31 +09:00
smoogipooo	1017cf54d9	CI fixes.	2017-06-07 19:17:45 +09:00
smoogipooo	6f191193a1	Rename timing changes, simplify + improve columns/dictionary usage.	2017-06-07 19:15:51 +09:00
smoogipooo	7aee8ee547	Make TimeSpan a double again.	2017-06-07 19:08:32 +09:00
Dean Herbert	5f537780cf	Bring framework up-to-date	2017-06-07 15:32:50 +09:00
smoogipooo	5104e65bcd	Make hold notes utilize RelativeChildOffset for tick positionings.	2017-06-06 15:57:30 +09:00
smoogipooo	e3d10fc4d3	Update with more framework changes.	2017-06-06 15:52:35 +09:00
smoogipooo	4307242bb6	Update with framework changes.	2017-06-05 20:06:46 +09:00
smoogipooo	a3299809fe	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs	2017-06-05 10:19:53 +09:00
smoogipooo	d66f114b5b	Properly set starting lifetime for mania hit objects.	2017-06-03 18:18:25 +09:00
smoogipooo	7022c8d496	Move timing change stuff to osu.Game project.	2017-06-02 20:17:44 +09:00
smoogipooo	e5720b9477	CI fixes.	2017-06-02 19:53:30 +09:00
smoogipooo	d6e49b94ec	Add comment.	2017-06-02 19:36:47 +09:00
smoogipooo	c7dcb54d45	Simplify gravity.	2017-06-02 19:34:55 +09:00
smoogipooo	a4cd409835	Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets. ... Also includes commenting improvements/fixes.	2017-06-02 19:27:22 +09:00
smoogipooo	186fecca82	Add missing license headers.	2017-06-02 18:20:14 +09:00
smoogipooo	1d3f5d8649	CI fixes.	2017-06-02 18:19:21 +09:00
smoogipooo	97dd80b874	Make life time set after children are updated (for now).	2017-06-02 18:11:36 +09:00
smoogipooo	5ebe08ed2a	Make default mania playfield timespan 1.5s for now.	2017-06-02 17:45:48 +09:00
smoogipooo	519f5f785b	Add gravity mod icon.	2017-06-02 17:43:24 +09:00
smoogipooo	b46a9dd0ef	Add gravity mod.	2017-06-02 17:33:58 +09:00
smoogipooo	8f6118ffb8	Set lifetime for timing change containers very naively for now.	2017-06-02 16:39:31 +09:00