1473 Commits

Author	SHA1	Message	Date
smoogipoo	11d58fb7f6	Implement column background and light colours	2020-04-07 16:53:55 +09:00
smoogipoo	9fd73492ca	Implement judgement line colour	2020-04-07 16:53:55 +09:00
smoogipoo	9cfeb60afc	Fix missed speed removal in mania	2020-04-07 16:30:58 +09:00
smoogipoo	3ecb99462f	Make note height scale by minimum column width	2020-04-07 16:07:18 +09:00
smoogipoo	707a6269b3	Fix incorrect key texture lookup	2020-04-06 19:03:37 +09:00
Dean Herbert	cfa2404626	Remove explicit specification of new default	2020-04-06 12:39:49 +09:00
Dean Herbert	3289fa7c66	Merge branch 'master' into better-mania-scrollspeed	2020-04-03 23:25:14 +09:00
Dean Herbert	eacbb20d87	Merge branch 'master' into fix-convert-scroll-speed	2020-04-03 22:47:53 +09:00
Dean Herbert	53c99d137a	Merge branch 'master' into mania-config-lookup-refactor	2020-04-03 22:22:59 +09:00
smoogipoo	23b7cde941	Add milliseconds value alongside	2020-04-03 18:38:04 +09:00
smoogipoo	1ff2cc31d1	Implement more familiar scroll speed options in mania	2020-04-03 18:25:01 +09:00
Dean Herbert	51db361c32	Update usages of Animation and Video in line with framework changes	2020-04-03 16:00:06 +09:00
smoogipoo	b42d1104b7	Fix mania converts scrolling at incorrect speeds	2020-04-03 13:16:01 +09:00
smoogipoo	571748d105	Add some xmldocs + nullable parameter	2020-04-03 12:31:05 +09:00
smoogipoo	1f797207f7	Rework lookups to not require total playfield columns	2020-04-03 12:31:05 +09:00
Dean Herbert	f919a2f267	Merge branch 'master' into mania-hitexplosion-skinning	2020-04-02 23:57:03 +09:00
Dan Balasescu	0f5fd8051c	Merge branch 'master' into mania-hitexplosion-skinning	2020-04-02 23:08:31 +09:00
Dean Herbert	c35dd0153d	Merge branch 'master' into mania-column-line-colour	2020-04-02 23:03:22 +09:00
Dean Herbert	bff58f36e5	Merge pull request #8563 from smoogipoo/expand-mania-vertically ... Expand mania to fit vertical screen bounds	2020-04-02 23:01:56 +09:00
smoogipoo	47e2ff5ce6	Fix incorrect frame length for hit explosions	2020-04-02 22:56:30 +09:00
Dean Herbert	e1a9a76e01	Merge pull request #8564 from smoogipoo/fix-holdnote-texturing ... Fix hold note animation not being reset	2020-04-02 22:42:47 +09:00
Dean Herbert	8f2a3578bd	Merge branch 'master' into mania-hitexplosion-skinning	2020-04-02 21:59:01 +09:00
smoogipoo	62f1bc276d	Add skinning support for column line colour	2020-04-02 18:10:17 +09:00
smoogipoo	9552319732	Fix hold note animation not being reset	2020-04-02 17:09:08 +09:00
smoogipoo	5aa4c4f3cb	Remove corner radius	2020-04-02 16:10:09 +09:00
smoogipoo	7ba533b7a4	Expand mania to fit vertical screen bounds	2020-04-02 16:04:09 +09:00
mcendu	dae738d6a4	add todo entries	2020-04-02 14:58:31 +08:00
smoogipoo	62f6683a20	Remove unnecessary generic	2020-04-02 15:57:50 +09:00
smoogipoo	c8d161e03a	Fix explosion expiry	2020-04-02 15:57:02 +09:00
mcendu	f3b96f8f50	add fallback to normal note image	2020-04-02 14:29:30 +08:00
smoogipoo	de7ee57100	Fix adding null hit explosions	2020-04-02 15:27:31 +09:00
smoogipoo	fa3a449c3b	Implement legacy normal hit explosions	2020-04-02 14:37:29 +09:00
smoogipoo	b375a02cff	Cleanup positioning factor definition	2020-04-02 14:37:29 +09:00
smoogipoo	c8eee8d204	Add structure for legacy hit explosions	2020-04-02 14:37:29 +09:00
smoogipoo	94031b57ea	Split hit explosion positioning from column	2020-04-02 14:37:29 +09:00
Dean Herbert	1446b0782b	Merge branch 'master' into mania-existence-check	2020-04-01 23:11:09 +09:00
Dean Herbert	312f94d810	Merge pull request #8541 from smoogipoo/fix-default-explosion-position ... Fix incorrect explosion position on default skin	2020-04-01 21:46:58 +09:00
Dan Balasescu	33119d38ad	Merge branch 'master' into fix-default-explosion-position	2020-04-01 20:03:23 +09:00
smoogipoo	f4d8defa48	Fix incorrect explosion position on default skin	2020-04-01 20:01:35 +09:00
Dean Herbert	aac7915eab	Merge branch 'master' into fix-column-light-position	2020-04-01 19:46:33 +09:00
smoogipoo	558feade87	Fix ci warnings	2020-04-01 18:19:11 +09:00
smoogipoo	59eac34d82	Fix barlines scrolling at different speeds in legacy skins	2020-04-01 18:00:17 +09:00
smoogipoo	ff2c5b446e	Fix column lights positioned incorrectly	2020-04-01 16:06:09 +09:00
Dean Herbert	9de348235e	Add comment about legacy fallback widths	2020-04-01 15:30:51 +09:00
mcendu	87e5e98cae	use GetAnimation for checking	2020-04-01 14:17:23 +08:00
smoogipoo	2d6d1a8cc6	Implement column width and column spacing	2020-04-01 13:38:03 +09:00
mcendu	716c7fa07a	Add check to detect whether mania is skinned	2020-04-01 11:04:29 +08:00
smoogipoo	bb5fa472dc	Remove null-stage fallback	2020-04-01 11:59:34 +09:00
mcendu	44fcd2613f	Add support for special column	2020-03-31 22:58:04 +08:00
mcendu	c9a81e7f71	Merge branch 'column-type3' into mania-skinning-refactor	2020-03-31 22:33:27 +08:00
mcendu	ff499b7d6b	fix indent	2020-03-31 19:12:02 +08:00
mcendu	df2379fb0e	remove unnecessary using	2020-03-31 18:10:43 +08:00
mcendu	3e0991d350	fix indent	2020-03-31 18:00:56 +08:00
mcendu	d41ff8c4b4	remove Column field from LegacyHitTarget	2020-03-31 17:58:29 +08:00
mcendu	ecc305bb63	extract superclass for all mania skinning elements	2020-03-31 17:54:51 +08:00
mcendu	977e1a3bfe	split shortcut into two methods	2020-03-31 17:48:37 +08:00
mcendu	71fc240aee	make mania skin elements use new method	2020-03-31 17:32:05 +08:00
mcendu	ec3d21e2b7	convert older elements to LegacyManiaColumnElement ... Also added xmldoc for new shorthand method.	2020-03-31 17:18:53 +08:00
mcendu	5179635b2d	add shorthand method for config retrieval	2020-03-31 17:08:05 +08:00
smoogipoo	3cd353d387	Fix possible nullrefs	2020-03-31 16:57:58 +09:00
smoogipoo	1952fcc0ce	Implement mania hold note skinning	2020-03-31 16:42:35 +09:00
smoogipoo	11430d616e	Allow null hitobject	2020-03-31 16:00:08 +09:00
smoogipoo	b805ed6bf1	Flip anchors and origins	2020-03-31 15:59:52 +09:00
smoogipoo	9a37a328b6	Add component overrides for hold note head/tail	2020-03-31 15:39:00 +09:00
smoogipoo	c4f76ffdaf	Implement mania note skinning	2020-03-31 15:29:25 +09:00
smoogipoo	ae668e3e87	Fix post-merge errors	2020-03-31 15:24:13 +09:00
smoogipoo	211a8db4c5	Merge branch 'mania-key-area-skinning' into mania-note-skinning	2020-03-31 15:23:59 +09:00
smoogipoo	538dc0c558	Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning	2020-03-31 15:20:56 +09:00
smoogipoo	1a858c602a	Merge branch 'mania-column-background-skinning' into mania-note-skinning	2020-03-31 15:20:14 +09:00
smoogipoo	16439f7d8e	Fix incorrect fallback index being used	2020-03-31 15:15:49 +09:00
smoogipoo	4b05f7ff27	Merge branch 'mania-skinning-testability' into mania-key-area-skinning	2020-03-31 15:11:32 +09:00
smoogipoo	75e43acb1a	Add a legacy element to help with texture fallbacks	2020-03-31 15:11:08 +09:00
mcendu	2008a7bbec	fix naming	2020-03-31 14:03:11 +08:00
mcendu	3fb044c3b6	rm unnecessary usings	2020-03-31 12:09:04 +08:00
mcendu	323146e4a6	simplify column type check logic	2020-03-31 11:53:17 +08:00
smoogipoo	71387016b2	Add missing judgement line	2020-03-31 12:26:31 +09:00
smoogipoo	02237133cb	Implement mania hit target skinning	2020-03-31 12:17:44 +09:00
smoogipoo	cb1513b374	Add mania key area skinning	2020-03-31 11:23:33 +09:00
smoogipoo	44727eb2b8	Implement column background skinning	2020-03-31 10:57:56 +09:00
smoogipoo	a8f7d7ea42	Add structure for mania configuration lookups	2020-03-30 23:21:40 +09:00
smoogipoo	c3cde7a163	Combine files	2020-03-30 23:21:40 +09:00
smoogipoo	c1789140d5	Prepare skin transformer for mania components	2020-03-30 23:21:40 +09:00
smoogipoo	6ff2273b64	Make column + stage cached	2020-03-30 23:21:40 +09:00
Dean Herbert	f75c082601	Fix osu!mania replays recording incorrectly when key mod applied	2020-03-27 15:50:11 +09:00
Dean Herbert	8a2aac5f83	Rename conversion methods for clarity	2020-03-25 20:21:34 +09:00
Dean Herbert	800e395bc8	Merge branch 'master' into replay-recording	2020-03-25 20:20:59 +09:00
Dean Herbert	388cf5c83a	Fix catch positional data being incorrectly recorded	2020-03-24 15:38:54 +09:00
Dean Herbert	96a849f897	Add remaining replay recorders	2020-03-24 14:55:49 +09:00
Dean Herbert	022465f546	Add encoding and import support	2020-03-24 14:51:52 +09:00
Dean Herbert	546772192c	Add helper method to convert to legacy mods enums	2020-03-24 13:07:51 +09:00
smoogipoo	e3a5be71cc	Implement random mod for taiko	2020-03-23 12:09:30 +09:00
smoogipoo	9f73b2960d	Prevent unnecessary auto-size computations in mania	2020-03-02 20:08:04 +09:00
smoogipoo	da89798765	Merge remote-tracking branch 'origin/master' into layout-rework	2020-02-26 15:06:40 +09:00
smoogipoo	6c28fd21c7	osu-side changes	2020-02-24 20:52:15 +09:00
Dean Herbert	0e29d3c4a2	Correctly expire bar lines in osu!taiko and osu!mania	2020-02-23 13:50:05 +09:00
Dean Herbert	ffc7eaa3f2	Fix hitobjects with unknown lifetimes by enforcing non-null judgement ... We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward CreateJudgement() must be implemented and return a non-null judgement. This fixes BananaShower and JuiceStreams in osu!catch. This also makes HitObject abstract and cleans up convert HitObject implementations.	2020-02-23 13:49:06 +09:00
Dean Herbert	0fe41fd50a	Fix blueprint showing even when mouse outside of container	2020-02-13 09:03:48 +09:00
Dean Herbert	e31d69c749	Add commit status to EndPlacement; call BeginPlacement on initial movement	2020-02-07 18:02:48 +09:00
Dean Herbert	cd6902a312	Make EndTime and RepeatCount settable	2020-02-05 17:52:51 +09:00
Dean Herbert	bd7c137394	Remap osu!mania dual stage key bindings to be more ergonomic	2020-01-26 18:34:43 +09:00
Dean Herbert	289be7a17b	Merge branch 'i-beat-snapping' into timeline-maybe	2020-01-23 15:45:33 +09:00
Dean Herbert	7c62cc3ac3	Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework	2020-01-22 22:57:52 +09:00
smoogipoo	7b2f58eb30	Apply OnRelease method signature refactorings	2020-01-22 13:22:34 +09:00
Dean Herbert	6dd50572d2	Break mania more	2020-01-21 17:37:43 +09:00
Dean Herbert	bd96cf94a6	Begin refactoring SelectionBlueprint to handle non-drawable HitObjects	2020-01-21 12:47:14 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
Dean Herbert	25aff5d96e	Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container	2020-01-20 17:08:59 +09:00
Dean Herbert	d57f55f053	Apply remaining changes required to restore previous functionality	2020-01-15 19:09:49 +09:00
mcendu	5d160376c0	nullable-ize Mod.Icon	2020-01-14 21:22:00 +08:00
mcendu	76c70a7622	Move hit target bar height def to defaulthittarget	2020-01-11 21:19:46 +08:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
smoogipoo	dfa6575f75	Adjust mania HP increase values	2020-01-07 15:24:33 +09:00
mcendu	a897f497a2	remove LaneGlowPiece and GlowPiece	2020-01-04 18:35:37 +08:00
Albie Spriddell	3a903339d6	add playingverb and database migrations	2020-01-03 11:39:15 +00:00
Dean Herbert	ee332e0d42	Split out BlueprintContainer functionality further	2020-01-02 18:21:16 +09:00
mcendu	20c5748342	Use hitTarget in place of stageHint	2019-12-29 23:37:28 +08:00
mcendu	51000765dd	remove override	2019-12-29 23:29:00 +08:00
mcendu	61fb9f5613	Remove class StageHint and usage	2019-12-29 23:18:50 +08:00
mcendu	cdfbe96e9b	Make AccentColour of StageHint virtual	2019-12-29 14:52:51 +08:00
mcendu	5d2b5cc950	correct type of field stageHint	2019-12-28 14:05:46 +08:00
mcendu	bf162f148e	Move mania stage hint to its own class	2019-12-28 13:48:10 +08:00
Dean Herbert	3a5015d013	Merge branch 'master' into fix-hold-note-input	2019-12-27 21:48:38 +09:00
Dean Herbert	aa97487f8e	Merge branch 'master' into hp-drain	2019-12-27 14:58:22 +09:00
Dean Herbert	cfa1dfa1a4	Split out into own method	2019-12-27 11:37:05 +09:00
Dean Herbert	5260eb76d0	Merge remote-tracking branch 'upstream/master' into mania-judgement	2019-12-27 11:17:47 +09:00
Dean Herbert	cac011edc1	Merge branch 'master' into hp-drain	2019-12-26 23:51:12 +09:00
Dean Herbert	32843ffef5	Merge branch 'master' into fix-hold-note-input	2019-12-26 23:50:53 +09:00
mcendu	92dd1ade17	Attempt to implement mania-specific sprites	2019-12-26 21:03:21 +08:00
smoogipoo	d45556eb6a	Remove whitespace	2019-12-26 17:57:16 +09:00
smoogipoo	522847987b	Implement break/gameplay start times	2019-12-26 15:00:58 +09:00
smoogipoo	90cb9d9162	Simplify scoreprocesor/healthprocessor implementations	2019-12-26 14:59:49 +09:00
smoogipoo	7414a6aadd	Merge remote-tracking branch 'huoyaoyuan/master' into health-processor ... # Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Mania/ManiaRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs	2019-12-26 14:56:54 +09:00
Dan Balasescu	9702cc9809	Merge branch 'master' into remove-legacy-id	2019-12-25 21:01:12 +09:00
Dean Herbert	504a55e803	Merge branch 'master' into better-beatmap-conversion	2019-12-25 19:52:06 +09:00
Dean Herbert	0677f746aa	Provide the ruleset to converter classes	2019-12-24 16:02:16 +09:00
Dean Herbert	a324bfbc2c	Remove LegacyID from Ruleset	2019-12-24 13:48:27 +09:00
smoogipoo	63c96d5a83	Fix tail note not properly capping result	2019-12-23 18:49:08 +09:00
smoogipoo	d6fd1007c4	internal -> public	2019-12-23 18:48:14 +09:00
smoogipoo	7ac6f68de8	Rewrite hold note input handling	2019-12-23 17:48:57 +09:00
smoogipoo	42853b5af6	Separate head/tail notes from hold note class	2019-12-23 17:48:57 +09:00
smoogipoo	6e7426a098	Simplify/improve beatmap conversion precheck	2019-12-23 17:44:18 +09:00
unknown	00ef2bd8d3	remove unused usings	2019-12-22 16:57:07 +08:00
unknown	fe73b9f8d3	make HP and OD generic and instantiate CS and AR to modes that need it	2019-12-22 16:45:32 +08:00
unknown	08b477ed52	make ModDifficultyAdjust abstract	2019-12-20 18:30:23 +08:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
Dean Herbert	ea661fce21	Merge branch 'master' into adjustable-map-settings	2019-12-18 18:44:11 +09:00
Dean Herbert	51a01c7006	Merge pull request #7256 from peppy/remove-ruleset-ctor-param ... Remove RulesetInfo parameter from Ruleset constructor	2019-12-18 18:42:42 +09:00
smoogipoo	2a128340d0	Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats	2019-12-18 17:58:37 +09:00
Dean Herbert	6e0802e50c	Remove RulesetInfo parameter from Ruleset constructor	2019-12-18 14:49:09 +09:00
Dean Herbert	e0ce87adca	Move CreateScoreProcessor() to Ruleset (#7244) ... Move CreateScoreProcessor() to Ruleset	2019-12-17 22:15:42 +09:00
Dan Balasescu	fd2785bab3	Merge branch 'master' into fxcop	2019-12-17 20:14:45 +09:00
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	b5db927d93	Merge branch 'master' into cinema-mod	2019-12-17 12:56:06 +09:00
Huo Yaoyuan	c457571da6	Use index and range expressions	2019-12-15 20:17:35 +08:00
unknown	01c036b0b0	implement backing beats for nightcore mods	2019-12-15 16:56:02 +08:00
Huo Yaoyuan	ddb2cfc46d	Use GetEndTime in Taiko and Mania	2019-12-14 18:16:13 +08:00
unknown	002a125b4a	make ModDifficultyAdjust generic	2019-12-12 21:14:26 +08:00
Dean Herbert	37a94988a3	Merge branch 'improve-hud-hiding' into cinema-mod	2019-12-12 16:12:19 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
unknown	b0cf44c3be	fix appveyor issues	2019-12-11 20:12:29 +08:00
unknown	b795532aa5	add difficulty adjustment mods	2019-12-11 19:43:16 +08:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09:00
Albie	a61f8cc2c3	Merge branch 'master' into cinema-mod	2019-12-10 17:06:53 +00:00
Huo Yaoyuan	9ddfdab27a	Remove meaningless Convert calls.	2019-12-03 20:47:00 +08:00
Albie	7864899249	Merge branch 'master' into cinema-mod	2019-11-28 16:42:01 +00:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Albie	09158b6b08	Merge branch 'master' into cinema-mod	2019-11-26 06:57:47 +00:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Albie	0a70ec0b11	Merge branch 'master' into cinema-mod	2019-11-25 07:25:30 +00:00
Berkan Diler	fccdbffa93	Use MathF instead of Math- functions when possible ... MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.	2019-11-25 00:45:42 +01:00
Albie Spriddell	3b9f59cb33	add cinema mod support	2019-11-23 17:34:53 +00:00
Albie Spriddell	20edaf4ba6	add cinema mod support	2019-11-23 17:32:16 +00:00
Huo Yaoyuan	8239c2da61	Refactor to avoid using try-finally as control flow.	2019-11-22 00:12:03 +08:00
Huo Yaoyuan	4cd7d67fe4	Use early return for if-pattern-matching.	2019-11-22 00:02:40 +08:00
Huo Yaoyuan	20f01ff3e9	Revert false positives of 'unused assignment'.	2019-11-21 23:54:38 +08:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Huo Yaoyuan	b5c20fecee	Merge branch 'master' into netstandard2.1	2019-11-19 21:40:12 +08:00
Huo Yaoyuan	608785b99a	Update .Net Standard projects to 2.1	2019-11-18 18:35:58 +08:00
Huo Yaoyuan	53bc2dcab7	Use costum displaying text for inherited references.	2019-11-18 15:29:18 +08:00
Huo Yaoyuan	b04bca7db6	Reference elements in origin definition.	2019-11-17 20:55:40 +08:00
Huo Yaoyuan	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	dcfa98414f	Use ??=.	2019-11-12 19:56:51 +08:00
Huo Yaoyuan	31cc0d13da	Use 'out var'.	2019-11-12 19:55:26 +08:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
Huo Yaoyuan	4b75e0bf6a	Redundant assignment.	2019-11-12 19:53:47 +08:00
Dean Herbert	b37bf4ea01	Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition	2019-11-12 10:44:53 +09:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	fd7bdc03ab	Merge remote-tracking branch 'upstream/master' into infrastructure	2019-11-11 11:11:59 +09:00
Dan Balasescu	1c1a49011b	Merge branch 'master' into infrastructure	2019-11-08 19:10:49 +09:00
smoogipoo	6fc1be64c2	Make hitobject samples a bindable list	2019-11-08 14:04:57 +09:00
smoogipoo	1f9f03dc66	Add temporary fix for null references	2019-11-07 13:36:54 +09:00
smoogipoo	8d42e45fd3	Make holdnote notes update lazily	2019-11-07 13:23:00 +09:00
smoogipoo	8141509a71	Split hold note blueprints into separate file	2019-11-07 12:59:05 +09:00
smoogipoo	2c1bfd62ef	Disallow selections to be moved outside of the playfield	2019-11-06 17:28:04 +09:00
Huo Yaoyuan	bcf8e3a9d4	Remove redundant properties from desktop projects. ... While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.	2019-10-30 22:56:33 +08:00
Huo Yaoyuan	31595159be	Normalize .props	2019-10-30 21:54:14 +08:00