1406 Commits

Author	SHA1	Message	Date
Dean Herbert	3ccc76e18f	Merge remote-tracking branch 'upstream/master' into cursor-in-playfield	2019-03-08 14:50:46 +09:00
Dean Herbert	551380dd42	Extract slider tick creation so it can be shared with osu!catch	2019-03-08 14:46:26 +09:00
Dan Balasescu	d1c18c52ab	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-08 12:43:57 +09:00
Dan Balasescu	101009c92e	Merge branch 'master' into fix-autoplay-tests	2019-03-08 12:14:40 +09:00
Dean Herbert	340997f505	Rename remaining usage of PathWidth naming convention	2019-03-07 20:21:59 +09:00
Dean Herbert	5ab9f45a8f	Merge branch 'drawnode-changes'	2019-03-07 20:10:42 +09:00
Dean Herbert	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
smoogipoo	e430b8a640	Merge remote-tracking branch 'nekodex/master' into drawnode-changes	2019-03-07 18:15:12 +09:00
David Zhao	b3e046c4d1	Rename PathWidth to PathRadius	2019-03-07 17:39:19 +09:00
Dean Herbert	62716851a1	Revert some unnecessary changes	2019-03-06 17:41:54 +09:00
Dean Herbert	7aa30ca3f6	Change method of cursor creation	2019-03-06 17:41:54 +09:00
Dean Herbert	18826b3a59	Adjust cursor scale for its new surroundings	2019-03-06 17:41:54 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
Dean Herbert	d70b373af9	Merge branch 'master' into mod-wind	2019-03-06 14:04:04 +09:00
tangalbert919	1e6cb3e7d8	Merge remote-tracking branch 'upstream/master' into android	2019-03-05 17:56:13 -06:00
Dean Herbert	fc0b297232	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-05 18:06:24 +09:00
smoogipoo	0322bd8812	Make config nullable, removing testcase code	2019-03-05 14:40:27 +09:00
smoogipoo	78596dfe80	Merge remote-tracking branch 'origin/master' into move-osu-settings ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs	2019-03-05 13:25:03 +09:00
LeNitrous	c271a3a781	remove ruleset specific mods	2019-03-04 17:36:44 +08:00
LeNitrous	ecc2c28a62	mod rule changes	2019-03-03 16:22:00 +08:00
smoogipoo	bf8360636a	Adjust drawnodes to use the new shared data structure	2019-03-01 17:25:15 +09:00
Dean Herbert	2dbf7d122c	Merge branch 'master' into use-pattern-matching	2019-02-28 14:53:07 +09:00
Dean Herbert	e2c6a8bc07	Use pattern matching wherever possible	2019-02-28 14:35:00 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	c8793911a8	Enable more stringent inspectcode style inspections	2019-02-27 21:25:40 +09:00
smoogipoo	c13a5184f3	Add more explanation	2019-02-27 16:35:11 +09:00
smoogipoo	32bf940aa5	Adjust comment for readability	2019-02-27 15:43:20 +09:00
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
smoogipoo	d06f38b3f3	Cleanup	2019-02-25 15:57:07 +09:00
Dean Herbert	7f5780c615	Simplify SliderBall and fix incorrect key up handling ... Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.	2019-02-23 14:38:53 +09:00
Dan Balasescu	5fdd7f9bff	Fix typo in comment ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-23 14:14:34 +09:00
Dean Herbert	3a57ff40cd	Add comment about other cases, rewind handling	2019-02-23 14:14:34 +09:00
Dean Herbert	8e52e2330e	Add extensive commenting	2019-02-23 14:14:34 +09:00
Dean Herbert	1c75ee4e82	Add fixes	2019-02-23 14:14:34 +09:00
Dean Herbert	7566fcf536	Slider press fix	2019-02-23 14:14:34 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
smoogipoo	d61dfe888e	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
Dean Herbert	c96a2ac853	Fix non-conforming filename	2019-02-20 21:08:52 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
smoogipoo	0380293098	Add beatmap argument	2019-02-19 17:58:02 +09:00
smoogipoo	21f9c813b2	Fix mods not being populated	2019-02-19 17:46:18 +09:00
smoogipoo	8459cf6ed0	Missed argument	2019-02-19 17:43:12 +09:00
smoogipoo	f19a52b960	Rename argument	2019-02-19 17:40:35 +09:00
smoogipoo	37f9ac6eca	Populate mods too	2019-02-19 17:39:30 +09:00
smoogipoo	847f7d8658	Adjust with PopulateAttributes() removal	2019-02-19 17:38:33 +09:00
Dean Herbert	9a60f3b0de	Merge branch 'master' into new-diffcalc-osu	2019-02-19 15:56:12 +09:00
Dean Herbert	151388dfad	Merge branch 'master' into diffcalc-merging-2	2019-02-19 15:42:15 +09:00
smoogipoo	ade5763160	Fix post-merge errors	2019-02-19 14:34:02 +09:00
smoogipoo	93b7b51d0a	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
Dan Balasescu	b1bdab8c36	Merge branch 'master' into mod-grow	2019-02-18 16:47:16 +09:00
Dan Balasescu	c9c8cccd68	Merge branch 'master' into use-lifetime-optimization	2019-02-18 15:22:34 +09:00
smoogipoo	659ec267b6	Fix spinners increasing strain	2019-02-18 14:58:33 +09:00
smoogipoo	c930cc5fb5	Fix incorrect OsuDifficultyHitObject instantiation	2019-02-18 14:58:13 +09:00
smoogipoo	fd70269021	Implement new difficulty calculator for Rulesets.Osu	2019-02-18 14:58:03 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
Dean Herbert	42dc7644f2	Merge branch 'master' into diffcalc-testcases	2019-02-17 21:06:42 +09:00
smoogipoo	8becd7ff92	Add a slider-spinner test case	2019-02-15 12:49:48 +09:00
Dean Herbert	810175235d	Fix incorrect application of scaling in some cases ... Isolates different usages of hitcircle scale so they can't ever cause regressions.	2019-02-14 18:47:05 +09:00
Dean Herbert	1b61ec4ef4	First pass clean-up	2019-02-14 18:05:23 +09:00
Dean Herbert	d366370113	Merge branch 'master' into mod-grow	2019-02-14 17:44:45 +09:00
smoogipoo	f50a0be29d	Add osu! difficulty calculator test	2019-02-14 16:22:14 +09:00
tangalbert919	7349a6c527	Merge remote-tracking branch 'upstream/master' into android	2019-02-12 20:41:54 -06:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
Dean Herbert	5b1f111922	Rollback other fallthrough regressions	2019-02-05 18:14:43 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
Dan Balasescu	40e4a3f725	Merge branch 'master' into fix-replay-import-statistics	2019-02-04 15:32:29 +09:00
Kyle Chang	cf91b882c8	Fix slider tail evaluation in osu difficulty calculator ... The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position.	2019-02-03 23:49:05 -05:00
Dean Herbert	2d7c23dd9f	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-02-04 12:15:53 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
tangalbert919	52110e5dc0	Merge remote-tracking branch 'upstream/master' into android	2019-01-31 11:19:03 -06:00
Dean Herbert	cea82708ee	Merge branch 'master' into use-lifetime-optimization	2019-01-31 20:20:40 +09:00
LeNitrous	7e2f4af00d	remove whitespaces	2019-01-31 17:58:09 +08:00
LeNitrous	a8d30f6aee	remove unused using	2019-01-31 17:05:50 +08:00
LeNitrous	902be0d059	add grow mod	2019-01-31 17:03:43 +08:00
smoogipoo	581544e1d6	Fix TD mod not being ranked	2019-01-31 11:59:36 +09:00
smoogipoo	e9ddf232f0	Add touchdevice mod to performance calculation	2019-01-31 11:51:40 +09:00
tangalbert919	80006109a2	Merge remote-tracking branch 'upstream/master' into android	2019-01-29 18:13:43 -06:00
Dean Herbert	8d4232af45	Formatting and minor optimisations	2019-01-29 16:35:20 +09:00
Dean Herbert	18512458e8	Merge branch 'master' into xexxar-angles	2019-01-29 15:59:04 +09:00
ekrctb	504e79b968	Merge branch 'master' into use-lifetime-optimization	2019-01-29 12:15:02 +09:00
Nitrous	ea4e79751e	Merge branch 'master' into mod-wind	2019-01-28 17:48:57 +08:00
Dean Herbert	354a99f5e1	Merge branch 'master' into samah-ios	2019-01-28 15:34:46 +09:00
ProgrammaticNajel	2058604ef3	Typo fix	2019-01-26 23:10:13 +08:00
ProgrammaticNajel	0797f5d644	Update SliderPlacementBlueprint.cs	2019-01-26 22:56:31 +08:00
ProgrammaticNajel	e71b13683a	Add null check	2019-01-26 22:55:33 +08:00
LeNitrous	03e57d0423	fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp	2019-01-26 20:15:19 +08:00
ProgrammaticNajel	e939f75f4b	Transform screen mouse coordinates to local space coordinates.	2019-01-26 18:19:01 +08:00
LeNitrous	73dbf5712d	add license headers	2019-01-26 13:43:27 +08:00
LeNitrous	1427c9f576	trim whitespaces	2019-01-26 13:11:08 +08:00
LeNitrous	c6e26a92ec	add wind up and wind down mods	2019-01-26 12:15:45 +08:00
Unknown	77763fde8b	revert accidentally renamed variables	2019-01-25 11:22:05 +01:00
Unknown	4a916b2dee	replace license headers with new ones	2019-01-25 11:17:48 +01:00
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Unknown	5446c99f22	Merge branch 'master' into move-osu-settings	2019-01-25 10:57:04 +01:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
tangalbert919	e3ce203c68	Merge remote-tracking branch 'upstream/master' into android	2019-01-23 17:45:46 -06:00
Unknown	481f33d17b	add setting to toggle the gameplay cursor trail	2019-01-23 14:27:39 +01:00
Unknown	33b46dc4e8	adjust year in license header to match CFS's expectations	2019-01-23 13:17:29 +01:00
Unknown	cf147083cd	move osu! settings into its ruleset	2019-01-23 13:17:29 +01:00
Unknown	4a9bcf4937	rename OsuConfigManager to GameConfigManager ... also OsuSetting to GameSetting	2019-01-23 13:17:29 +01:00
Shane Woolcock	728c744e4d	Merge branch 'master' into samah-ios	2019-01-23 22:19:49 +10:30
Dean Herbert	8160162cde	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-01-21 20:58:17 +09:00
smoogipoo	baae53d784	Merge branch 'diffcalc-fixes' into xexxar-angles	2019-01-20 22:19:50 +09:00
smoogipoo	3db23898df	Merge remote-tracking branch 'origin/master' into diffcalc-fixes	2019-01-20 13:27:42 +09:00
Shane Woolcock	10b91e18bd	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2019-01-19 18:03:58 +10:30
smoogipoo	a8e9adafdb	Fix final section not being saved	2019-01-17 12:51:49 +09:00
smoogipoo	e44bc57a3d	Fix minDistanceFromEnd using seconds rather than milliseconds ... Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.	2019-01-15 19:18:56 +09:00
smoogipoo	117c514479	Fix lazy slider calculation inaccuracy ... What were we doing... On /b/1221540 stable's repeat points happen 90% through the length of each span! We should use lazer's more accurate calculations.	2019-01-15 19:07:25 +09:00
Shane Woolcock	a6c54a9675	Merge branch 'master' into samah-ios	2019-01-12 00:16:09 +10:30
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Dean Herbert	17bc933db2	Revert unnecessary changes	2019-01-10 19:01:41 +09:00
Dean Herbert	8cd058ed9a	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-10 18:38:20 +09:00
VINXIS	a09615144e	Kill White Space	2019-01-09 01:47:39 -07:00
VINXIS	dfe35f850c	Add rebalances to lazer performance calc	2019-01-09 01:42:48 -07:00
tangalbert919	5835ccc04c	Merge changes up to 2019.108.0	2019-01-08 17:53:57 -06:00
Shane Woolcock	a267a1a085	Merge branch 'master' into samah-ios	2019-01-08 17:09:26 +10:30
Dean Herbert	8edec10e5f	Merge branch 'master' into fix-replay-import-statistics	2019-01-08 11:26:12 +09:00
Dean Herbert	881b10a18f	Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini	2019-01-08 11:01:04 +09:00
Dean Herbert	7eed3ffe75	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 10:02:06 +09:00
Dean Herbert	4cee21f356	Make skinning better	2019-01-07 20:12:39 +09:00
Dean Herbert	ca98caf84b	Merge pull request #4001 from UselessToucan/linq_temp ... Use Find instead of FirstOrDefault	2019-01-07 18:50:59 +09:00
Dean Herbert	8914585021	Fix implementation of conditional cursor expanding	2019-01-07 18:28:26 +09:00
smoogipoo	b57c1af084	Only update stacking if there are hitobjects	2019-01-07 18:15:44 +09:00
smoogipoo	c6c22b352f	More verbose exceptions	2019-01-07 18:13:40 +09:00
Dean Herbert	13b077c83b	Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini	2019-01-07 18:11:17 +09:00
smoogipoo	351ab6e9bd	Shortcut O(n^2) calculation	2019-01-07 18:01:44 +09:00
smoogipoo	1c5ab6a906	Implement stacking by index	2019-01-07 18:00:59 +09:00
Dean Herbert	e73845172c	Merge branch 'master' into fix-replay-import-statistics	2019-01-07 13:44:01 +09:00
tangalbert919	4da5ca02eb	Merge branch 'master' into android	2019-01-06 00:06:56 -06:00
tangalbert919	47268898be	Expose internals for Android test projects	2019-01-06 00:04:25 -06:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
smoogipoo	722210d8bb	Merge remote-tracking branch 'origin/master' into xexxar-angles	2019-01-04 23:52:23 +09:00
smoogipoo	3fa5a33fb1	Inline const	2019-01-03 18:58:07 +09:00
smoogipoo	273b14b19c	Add a maximum length for slider ticks to be generated	2019-01-03 18:51:47 +09:00
smoogipoo	c56d8b75c1	Cache slider's endposition	2019-01-03 17:43:10 +09:00
Dean Herbert	aec3753863	Fix imported replays having excess statistics	2019-01-03 14:01:20 +09:00
Shane Woolcock	32ffcb9865	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-29 20:09:00 +10:30
Shane Woolcock	a83bee9461	Add ruleset visual tests	2018-12-29 20:05:37 +10:30
smoogipoo	5c1280c092	Fix missing hitwindows	2018-12-28 00:14:00 +09:00
Dean Herbert	fb10d15870	Populate statistics for all rulesets' scores	2018-12-27 21:52:09 +09:00
smoogipoo	77e6f4ab92	Rebalance	2018-12-27 18:41:42 +09:00
VINXIS	227c63dd1c	numtotalhits -> totalHits	2018-12-23 22:23:43 -07:00
VINXIS	8020ac26fb	MBMasher's FL change	2018-12-23 22:14:28 -07:00
smoogipoo	5f0ab0ed7f	Update with vinxis' latest code	2018-12-24 12:41:04 +09:00
smoogipoo	c43c15a557	Multiply previous travel distance by 8	2018-12-23 16:28:19 +09:00
smoogipoo	9fcc727e0d	Fix TravelDistance not being calculated	2018-12-23 16:26:23 +09:00
smoogipoo	d9b8df1595	Merge remote-tracking branch 'origin/master' into user-registration	2018-12-22 17:19:28 +09:00
smoogipoo	c848c83d0d	Refactor for readability + performance	2018-12-22 09:56:33 +09:00
Dean Herbert	f0dfc75bb2	Change osu! default keys back to Z/X ... A/S was no better as far as keyboard layout agnostic-ness. And people are confused if we change the defaults. Need to take a step back and reassess.	2018-12-22 09:49:09 +09:00
smoogipoo	8546fedd4f	Implement vinxis/xexxar's adjustments	2018-12-22 09:31:30 +09:00
Poyo	08d7c2df70	Fix extra hard-rock flipping for sliders	2018-12-21 16:08:08 -08:00
smoogipoo	be476c58d7	Adjust with latest rebalancings	2018-12-21 22:52:27 +09:00
smoogipoo	5bd16f9a7c	Add scaling factor	2018-12-21 15:16:00 +09:00
smoogipoo	38441759a7	Use angle projections	2018-12-21 14:52:43 +09:00
smoogipoo	3acbf75beb	Adjust threshold	2018-12-21 13:48:10 +09:00
Dean Herbert	ef9d93ff6b	Remove mod multipliers ... We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.	2018-12-20 19:46:39 +09:00
Dean Herbert	d3368df94d	Simplify changes to RulesetContainer	2018-12-20 19:35:32 +09:00
Dean Herbert	bb850da200	Remove skinnability for now ... Not sure if we want this going forward.	2018-12-20 15:48:45 +09:00
smoogipoo	1c44e19066	Adjust scaling factor	2018-12-19 13:53:47 +09:00
smoogipoo	0fee76c95c	Fix merge error	2018-12-19 13:45:33 +09:00
smoogipoo	1972f1f279	Fix incorrect angle being used (at object vs into object)	2018-12-19 13:45:33 +09:00
smoogipoo	162774ce27	Make angles unsigned	2018-12-19 13:45:33 +09:00
smoogipoo	434d7d1809	Replace piecewise linear function + rebalance	2018-12-19 13:45:33 +09:00
smoogipoo	9ad7970167	Adjust computations to return sane values	2018-12-19 13:45:33 +09:00
smoogipoo	f4eabacd15	Implement angle assessment	2018-12-19 13:45:33 +09:00
smoogipoo	e7da5b0400	Add the [200 .. 300] bpm speed bonus	2018-12-19 13:45:33 +09:00
smoogipoo	00a4d60e89	Make sure distance is clamped to sane values	2018-12-19 13:45:33 +09:00
smoogipoo	47721f7a07	Adjust base value	2018-12-19 13:45:33 +09:00
smoogipoo	d74652a4f7	Replace piecewise linear function	2018-12-19 13:45:33 +09:00
ekrctb	6f8a2e6ff2	Use LifetimeManagementContainer ... This is a significant performance boost for gameplay, especially for long or stroyboard-heavy maps.	2018-12-13 15:23:06 +09:00
Dragicafit	c6c4bcccc3	relocate SkinnableCursor	2018-12-12 11:17:09 +01:00
Dragicafit	4b073aed83	remove spaces	2018-12-11 21:02:12 +01:00
Dragicafit	bfe3b03945	using SkinReloadableDrawable	2018-12-11 18:06:41 +01:00
Dragicafit	fb7d767909	adjust if position	2018-12-11 00:38:03 +01:00
Dragicafit	506f27a92e	cursorExpand is now a bool	2018-12-07 23:52:57 +01:00
Dragicafit	ec3c87dbea	Make Slider's CustumColors skinnable	2018-12-07 22:24:24 +01:00
Dragicafit	0816eaacb8	Make CursorExpand skinnable	2018-12-07 22:22:40 +01:00
Dean Herbert	4f34d42b33	Major code refactors	2018-12-07 21:11:35 +09:00
Dean Herbert	d379d02761	Remove unnecessary base class	2018-12-07 20:12:56 +09:00
WebFreak001	6eff7d9acc	Style fixes	2018-12-06 14:34:10 +01:00
WebFreak001	a14de5bd1b	Remove blinds random NPC	2018-12-06 12:52:39 +01:00
WebFreak001	46b98702e1	make target animation call more obvious	2018-12-06 12:48:11 +01:00
WebFreak001	3cb91979bd	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2	2018-12-06 12:14:48 +01:00
Dean Herbert	1a974f64de	Initial design for user registration dialog	2018-12-05 12:57:26 +09:00
smoogipoo	8eff49bccd	Remove User from Replay	2018-11-30 18:25:14 +09:00
Dean Herbert	d97a15a504	Add IMod and change ShortenedName to Acronym	2018-11-30 17:16:00 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
Dean Herbert	271dcded3c	Merge branch 'master' into scoredatabase	2018-11-30 14:59:58 +09:00