4902 Commits

Author	SHA1	Message	Date
Damnae	5f6b300a3a	Fix visual test crash when BeatmapInfo doesn't have a BeatmapSet.	2017-09-15 15:12:16 +02:00
Damnae	291486a4d1	Only create drawables for storyboard elements that will be visible.	2017-09-15 14:31:59 +02:00
Damnae	757a159516	Display a non-parallax background at the appropriate size when storyboards do not replace it.	2017-09-15 14:31:54 +02:00
Damnae	f5368505ab	Load the storyboard asynchronously if it wasn't loaded with the beatmap.	2017-09-15 11:58:37 +02:00
Damnae	4a15762139	Don't create drawables for hidden storyboards.	2017-09-15 11:58:37 +02:00
Damnae	c8cdf6787e	Better property name.	2017-09-15 11:58:31 +02:00
Damnae	7c3ce7e830	Unbind events affecting the background after gameplay has ended.	2017-09-15 09:16:56 +02:00
Damnae	cb8029af9e	Add a setting to hide storyboards.	2017-09-15 09:16:56 +02:00
Damnae	ddaf28d7f6	Integrate storyboards with gameplay.	2017-09-15 09:16:56 +02:00
Damnae	010a6ec252	Fix player loading.	2017-09-15 09:06:27 +02:00
EVAST9919	e7c9ad245e	Fix icons in main button system jumps on one side for a long time	2017-09-15 09:24:31 +03:00
Dean Herbert	b72921b30e	Ensure an OnlineBeatmapID is present before attempting API requests	2017-09-15 12:44:48 +09:00
Dean Herbert	6ea22cc6c7	Add missing return to PlayerLoader ... was being a bit too eager previously	2017-09-15 08:15:23 +09:00
MrTheMake	1e0ce6dabd	Removed unnecessary casting of KeyBindingRow.FilterTerms	2017-09-14 13:18:50 +02:00
Dan Balasescu	77d2b1e478	Merge branch 'master' into more_context_menus	2017-09-14 19:21:29 +09:00
Dean Herbert	7cd6caacaa	Update to support newer return structure from osu-web API	2017-09-14 18:08:12 +09:00
Dean Herbert	cbed9bc141	Merge branch 'master' into more_context_menus	2017-09-14 17:55:32 +09:00
Dean Herbert	02fa9eeb3b	Merge branch 'master' into online-beatmap-set-overlay	2017-09-14 16:52:44 +09:00
Dean Herbert	33d33a49ae	Merge branch 'master' into storyboards	2017-09-14 16:06:19 +09:00
Dean Herbert	b7c9819680	Add context menus to chat names and user panels	2017-09-14 15:43:47 +09:00
Dean Herbert	396a56ddf4	Remove global OsuContextMenuContainer	2017-09-14 15:41:32 +09:00
Dean Herbert	d330b39db4	Remove max	2017-09-14 13:47:25 +09:00
Dean Herbert	4f09f30b7a	Fix incorrect exception	2017-09-14 13:13:54 +09:00
Dean Herbert	b1145272d1	Update code to support new inspectcode analysis rules	2017-09-14 12:58:32 +09:00
DrabWeb	022e39b843	CI fixes.	2017-09-13 18:31:53 -03:00
DrabWeb	d83cd3ecf9	Make Header and it's components updateable.	2017-09-13 18:25:23 -03:00
DrabWeb	63c50f82eb	Make Info updateable.	2017-09-13 12:37:18 -03:00
DrabWeb	574d7b24ff	Fix some visual issues.	2017-09-13 12:07:31 -03:00
MrTheMake	89b5a6670e	Changed type of IHasFilterTerms.FilterTerms according to framework update	2017-09-13 16:18:02 +02:00
Dean Herbert	b78c516b74	Merge branch 'master' into scoring-revamp	2017-09-13 20:47:14 +09:00
Dean Herbert	fb7740a3ab	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
Damnae	bab3ef0669	Rename storyboard classes.	2017-09-13 11:22:24 +02:00
smoogipooo	5e32d95ad2	Remove Ruleset's CreateScoreProcessor method	2017-09-13 16:37:05 +09:00
smoogipooo	f1130eb899	Add default implementation for ScoreProcessor using Exponential scoring	2017-09-13 16:35:13 +09:00
Dean Herbert	e37a354db0	Merge branch 'master' into fix-sliderhead-depth	2017-09-13 16:19:37 +09:00
smoogipooo	093d82ac45	Set depths from playfield add methods instead of DrawableHitObject	2017-09-13 16:17:01 +09:00
smoogipooo	e146bcacf1	Make BasePortion and ComboPortion constants	2017-09-13 16:13:27 +09:00
smoogipooo	e472518e4f	Standardized is default for now	2017-09-13 15:58:50 +09:00
smoogipooo	d83a2d4dc6	Disable masking optimisations for scrolling hit objects ... Lifetime is very tightly controlled here, so all should be okay.	2017-09-13 15:57:40 +09:00
smoogipooo	05ac23f99a	Remove AffectsAccuracy for now	2017-09-13 15:44:03 +09:00
Dean Herbert	f4f7ae12b3	Merge branch 'master' into channelselection-minimum-size	2017-09-13 15:40:22 +09:00
Dean Herbert	7681d97f10	Fix typo in user profile header ... Replays watched, not replay watched.	2017-09-13 15:21:04 +09:00
smoogipooo	ba3e44cd71	Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)	2017-09-13 15:17:32 +09:00
Dean Herbert	7835269f95	Merge branch 'master' into channelselection-minimum-size	2017-09-13 14:21:44 +09:00
DrabWeb	0a5c963c4b	Remove redundant .this	2017-09-13 00:18:00 -03:00
DrabWeb	9e6f94b818	Make BeatmapPicker buttons more independent.	2017-09-13 00:13:45 -03:00
DrabWeb	0e9dc6fb85	Don't recreate header buttons on beatmap change.	2017-09-12 23:55:48 -03:00
DrabWeb	d36fc13487	Make success rate percent move with the bar.	2017-09-12 23:46:21 -03:00
DrabWeb	ba90fc87d0	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-12 23:41:57 -03:00
DrabWeb	97e5a0d4a3	CI fixes.	2017-09-12 23:41:10 -03:00
Dean Herbert	1de1b882e3	Fix BeatmapInfo's comparator when not being sourced from database	2017-09-13 10:36:58 +09:00
DrabWeb	08b5d4e16c	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-12 21:26:06 -03:00
DrabWeb	680f2e232c	Cleanup.	2017-09-12 21:24:43 -03:00
DrabWeb	d09bcabc8f	Add a background to the overlay.	2017-09-12 21:00:20 -03:00
DrabWeb	a291bd3020	Add second beatmap set to test, fix some visual issues.	2017-09-12 20:55:17 -03:00
DrabWeb	169bfe134b	Fix incorrect BasicStats padding.	2017-09-12 20:24:48 -03:00
MrTheMake	a30bd90641	Merge branch 'channelselection-minimum-size' of https://github.com/MrTheMake/osu into channelselection-minimum-size	2017-09-12 18:48:11 +02:00
MrTheMake	9839a3b937	Smoothly transform the chat height when opening the channel selection	2017-09-12 18:47:21 +02:00
MrTheMake	c78695cfe0	Removed redundant call	2017-09-12 18:26:52 +02:00
smoogipooo	3619f7c1eb	Fix possible NaN accuracy	2017-09-13 00:38:52 +09:00
smoogipooo	7b44ad300f	Remove accurateHits, make Accuracy once again tied to comboScore	2017-09-13 00:33:01 +09:00
smoogipooo	2a45451308	Fix combo duplication.	2017-09-13 00:19:17 +09:00
smoogipooo	7dd79f5a0b	Fix incorrect accuracy calculation	2017-09-13 00:11:56 +09:00
smoogipooo	ba4f81d022	Woops, fix incorrectly deleted line	2017-09-12 23:30:15 +09:00
smoogipooo	4269533bab	Remove remaining AllObjectsJudged in RulesetContainer	2017-09-12 22:29:44 +09:00
smoogipooo	89cb38386c	Set accuracy	2017-09-12 22:28:16 +09:00
smoogipooo	dc9b47559a	Multiply standardised combos by the HighestCombo to make higher combos matter more	2017-09-12 22:28:10 +09:00
smoogipooo	b5f48c2368	Add storeResults as a parameter to Reset ... Whether to store the current state of the ScoreProcessor for future use.	2017-09-12 22:27:27 +09:00
smoogipooo	2e0218f388	Move AllObjectsJudged into ScoreProcessor as AllJudged ... Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.	2017-09-12 22:01:08 +09:00
smoogipooo	cc6bb81a73	Reimplement Exponential scoring with a simpler and more intuitive calculation ... Default for all rulesets for now.	2017-09-12 21:47:09 +09:00
smoogipooo	d0774c7bc6	ComputeTargets -> SimulateAutoplay + improve xmldoc	2017-09-12 21:16:47 +09:00
smoogipooo	3e3618d724	More cleanups	2017-09-12 21:12:57 +09:00
smoogipooo	abab2a4878	Revamp score processing to once more unify scoring methods	2017-09-12 21:05:50 +09:00
smoogipooo	0b94939474	Make Accuracy = 1, Health = 1 the default for ScoreProcessor	2017-09-12 20:53:26 +09:00
smoogipooo	195c2d7a31	Keep track of maximum hits + combo at base ScoreProcessor level	2017-09-12 19:48:17 +09:00
smoogipooo	cba642f781	Reduce nesting, because we don't have partial judgements any more	2017-09-12 19:45:14 +09:00
smoogipooo	c07e831b17	Move HasFailed override to base ScoreProcessor	2017-09-12 19:39:54 +09:00
smoogipooo	3af8345068	Add AffectsAccuracy to Judgement	2017-09-12 19:39:44 +09:00
Dan Balasescu	f4a2ffbeea	Merge branch 'master' into judgement-revamp	2017-09-12 19:13:33 +09:00
smoogipooo	112429051e	Fix XMLDoc CI errors	2017-09-12 19:05:37 +09:00
Dan Balasescu	ee8ec31c6e	Merge branch 'master' into judgement-revamp	2017-09-12 18:57:37 +09:00
smoogipooo	d5bd005c01	Remove unused code for now ... I don't think we'll ever be using this anyway.	2017-09-12 18:52:15 +09:00
smoogipooo	92b3e203e8	judgementOccurred should be passed upwards ... So only one hit object is ever judged in a single frame.	2017-09-12 18:50:30 +09:00
smoogipooo	a38e0062a4	Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement.	2017-09-12 18:49:50 +09:00
Dan Balasescu	d25c382adf	Merge branch 'master' into workingbeatmap-track-disposal	2017-09-12 18:44:52 +09:00
Dean Herbert	86de4fa2e2	Apply CI fixes	2017-09-12 18:36:19 +09:00
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +09:00
Dean Herbert	d7ac02d090	Ensure judgements aren't updated when ArmedState is not idle	2017-09-12 18:00:41 +09:00
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
Dean Herbert	20dae5ee11	Minor refactors	2017-09-12 17:36:46 +09:00
Damnae	58e65397b0	Add support for storyboards using numerical values.	2017-09-12 10:13:55 +02:00
Dean Herbert	5b9d906ad5	Improve beatmap track disposal logic ... - [ ] Depends on https://github.com/ppy/osu-framework/pull/1035	2017-09-12 16:56:46 +09:00
Dan Balasescu	3be9d3c747	Merge branch 'master' into mania-autoplay	2017-09-12 16:44:05 +09:00
smoogipooo	8737a1b1a5	Implement osu!mania auto replay generation.	2017-09-12 15:52:32 +09:00
smoogipooo	d6bf5c38b7	Move Kiai bool to HitObject.	2017-09-12 10:01:07 +09:00
Dean Herbert	7c7849f189	Fix icon states being updated incorrectly when being set too early	2017-09-11 21:40:58 +09:00
Dean Herbert	b38da61ef6	Merge branch 'master' into fix-paused-osu-logo	2017-09-11 19:53:36 +09:00
Damnae	2fb203159f	CI fixes.	2017-09-11 12:39:50 +02:00
Damnae	47cd1d486b	Merge branch 'master' into storyboards	2017-09-11 12:29:19 +02:00
Damnae	cd15cfc864	Use case insensitive paths to find storyboard textures.	2017-09-11 12:06:13 +02:00
Damnae	9eaa1cb5cd	Fix sprites not being visible when all their commands are inside loops.	2017-09-11 12:06:00 +02:00
Shane Woolcock	262aea8b6b	Fix osu! logo triangles going super fast when the track is paused	2017-09-11 19:16:44 +09:30
Dean Herbert	ba4b9e3411	Merge branch 'master' into mania-hit-explosions	2017-09-11 18:32:36 +09:00
Dean Herbert	18ad0956b4	Merge branch 'master' into maybefix	2017-09-11 18:23:00 +09:00
Dean Herbert	7b92bbfa86	Merge branch 'master' into mania-hit-explosions	2017-09-11 17:34:14 +09:00
Dean Herbert	838fcca9c4	Merge branch 'master' into mania-hit-explosions	2017-09-11 15:14:35 +09:00
smoogipooo	f3c6f6f959	Merge branch 'blending-equations' into mania-holdnote-niceness	2017-09-11 15:09:01 +09:00
smoogipooo	58c875bdca	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 15:02:12 +09:00
DrabWeb	4be8899fb2	Move Length to BeatmapOnlineInfo.	2017-09-11 02:55:32 -03:00
DrabWeb	43fa314fe0	Details and more data displaying.	2017-09-11 02:48:48 -03:00
smoogipooo	4683319156	Merge remote-tracking branch 'origin/master' into mania-hit-explosions	2017-09-11 14:48:40 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
Dean Herbert	512232c1c8	Fix regression causing autoplay to fail	2017-09-11 14:25:01 +09:00
smoogipooo	0cadee998c	Set default AccentColour for hit objects	2017-09-11 13:44:05 +09:00
DrabWeb	e61ab72c0d	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-11 01:24:52 -03:00
DrabWeb	54172ac6ad	Move header button and details components to own files.	2017-09-11 01:21:53 -03:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	adba5b5ba6	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 12:30:32 +09:00
Dan Balasescu	24f7b6823e	Merge branch 'master' into nullref-fix	2017-09-11 12:13:43 +09:00
Dean Herbert	eedfbdc0e8	Add nullref check in KeyCounterCollection's Add method	2017-09-11 11:41:09 +09:00
Dean Herbert	8d919e42c9	Fix nullref when loading MusicController VisualTest after Player VisualTest	2017-09-11 11:18:53 +09:00
Dean Herbert	cb24b5c436	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 10:18:34 +09:00
Dean Herbert	f33bd700c5	Fix individual volume controls not being adjustable via wheel ... They were blocking each others' input unnecessarily.	2017-09-11 08:27:29 +09:00
smoogipooo	2086ed209d	Fix hold note tick input.	2017-09-11 04:51:44 +09:00
Damnae	59d9dc5ee7	Ignore storyboard sprites with invalid positions.	2017-09-10 20:08:56 +02:00
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
Dean Herbert	ea35b69f2f	Merge branch 'master' into fix-mono-crash	2017-09-10 11:49:20 +09:00
Dean Herbert	6d33e39c5e	Merge branch 'master' into beatmap-details-rewrite	2017-09-10 11:26:00 +09:00
DrabWeb	aa9dfcc082	BeatmapPicker logic.	2017-09-09 19:05:22 -03:00
DrabWeb	cbd9c07aed	BeatmapPicker design.	2017-09-09 18:19:43 -03:00
Damnae	bc01d9a1b0	Animate Additive / FlipH and FlipV.	2017-09-09 15:41:56 +02:00
Damnae	8d55cb7f92	Improve command sorting.	2017-09-09 11:00:58 +02:00
naoey	0c2bad1de4	Get rid of some properties and todos.	2017-09-09 12:44:27 +05:30
naoey	d12a5e927a	Rename property.	2017-09-09 11:03:25 +05:30
naoey	e67606e203	Return existing download if it exists.	2017-09-09 10:25:28 +05:30
naoey	5f5dd54f9d	Use a List instead of a Dictionary.	2017-09-09 09:56:01 +05:30
DrabWeb	ecd6994d74	Added favourite/download buttons and author info.	2017-09-08 19:17:39 -03:00
DrabWeb	1d3139d3c3	Basic layout.	2017-09-08 18:32:07 -03:00
naoey	20becbe576	Use the specifically created progress action, add license header.	2017-09-09 01:53:42 +05:30
Damnae	12de737084	Merge branch 'master' into storyboards ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2017-09-08 21:46:34 +02:00
Damnae	57e53ff03a	Fix diff-specific storyboard content being lost after loading.	2017-09-08 21:36:30 +02:00
naoey	5a3814b02e	XMLdoc fixes and a cautionary check.	2017-09-09 01:04:55 +05:30
naoey	0e4973020a	Resharper and test case fixes.	2017-09-09 00:58:54 +05:30
naoey	00306b6e38	Maintain download progress between switching result views. ... - Check for existing download requests on creating DirectPanel - Actually remove downloaded beatmap from results	2017-09-09 00:57:48 +05:30
naoey	31a507372a	Don't show beatmaps that are already added.	2017-09-09 00:57:48 +05:30
naoey	20f93c83d6	Make downloads happen in BeatmapManager.	2017-09-09 00:57:40 +05:30
Damnae	4ab243d885	CI fixes.	2017-09-08 21:23:24 +02:00
Damnae	e8ab853f6f	Make storyboard loops work.	2017-09-08 21:07:40 +02:00
Damnae	e4a2ad5eb5	Fix storyboard sprite flipping.	2017-09-08 20:39:17 +02:00
Dean Herbert	386147cc77	Merge branch 'master' into channelselection-minimum-size	2017-09-09 02:51:47 +09:00
DrabWeb	d95940ed5e	CI fixes.	2017-09-08 14:25:41 -03:00
DrabWeb	ce68b6661e	Update visual test.	2017-09-08 14:15:28 -03:00
MrTheMake	15dd8d9071	Mind the minimum size of the channel selection overlay	2017-09-08 18:21:42 +02:00
Damnae	3f2598543c	Fix CommandLoop start and end time.	2017-09-08 18:03:04 +02:00
MrTheMake	5c125737cb	Fix wrong initial topic color of not joined channels in the channel selection	2017-09-08 17:47:23 +02:00
Dean Herbert	9b790157d8	Merge branch 'master' into non-null-beatmap	2017-09-08 23:33:03 +09:00
Dan Balasescu	3166394a59	Merge branch 'master' into home-hides-overlays	2017-09-08 23:23:20 +09:00
Damnae	e63fb5720c	Make CI happy.	2017-09-08 13:04:53 +02:00
Damnae	6cde687d87	Fix V commands parsing.	2017-09-08 12:36:13 +02:00
MrTheMake	0b1403683b	Moved OnlineScore inside GetScoresRequest.cs	2017-09-08 12:21:35 +02:00
MrTheMake	526ee107b8	Use a method to apply a beatmap, its ruleset and the mods.	2017-09-08 12:17:16 +02:00
Damnae	e02b481c69	An attempt at implementing storyboard loops.	2017-09-08 12:11:57 +02:00
Damnae	13322b4293	Improve compatibility with older storyboards.	2017-09-08 12:09:45 +02:00
Dean Herbert	a528173943	Ensure that WorkingBeatmap's Beatmap is never null ... Also ensures some extra fields inside Beatmap have non-null defaults.	2017-09-08 19:05:14 +09:00
Dean Herbert	80c35801a6	Hide all overlays when home button is pressed	2017-09-08 16:18:57 +09:00
Damnae	e547416193	Storyboards implementation.	2017-09-08 09:08:52 +02:00
MrTheMake	01553fc9ef	Moved all online related score parsing to its class	2017-09-08 02:46:54 +02:00
DrabWeb	55e8bdfb05	CI fixes.	2017-09-07 15:38:23 -03:00
DrabWeb	109531b66c	Cleanup, remove unneeded files.	2017-09-07 15:21:18 -03:00
DrabWeb	2153865de5	Adjust fail on missing logic to match original.	2017-09-07 15:09:50 -03:00
DrabWeb	fd2700a5b4	Fix .00 being displayed for star difficulty when the value is 0.	2017-09-07 15:01:31 -03:00
DrabWeb	5e685ff5b1	Rewrite BeatmapDetails to be more modular for future code sharing.	2017-09-07 14:53:53 -03:00
MrTheMake	e71f907f89	CI fix	2017-09-07 18:36:16 +02:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
MrTheMake	709aa1ed3d	Moved all online score related parsing to its own class	2017-09-07 18:20:14 +02:00
Dean Herbert	b9bec6a983	CI fixes	2017-09-07 23:06:35 +09:00
Dean Herbert	b135dc1f18	Merge remote-tracking branch 'upstream/master' into menu-bar	2017-09-07 22:58:41 +09:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
Dean Herbert	41398f57d6	Changes in line with framework	2017-09-07 20:36:32 +09:00
smoogipooo	871ca7520f	Merge remote-tracking branch 'origin/master' into menu-bar	2017-09-07 15:32:01 +09:00
Dean Herbert	af0eaab78c	maybe fix	2017-09-07 01:46:07 +09:00
naoey	69ff4bfa46	Fix startup crash on mono.	2017-09-06 20:04:21 +05:30
Dean Herbert	13c3ef65a8	Merge branch 'master' into fix-mania-input	2017-09-06 23:18:23 +09:00
Dean Herbert	e5308b6247	Method rename	2017-09-06 23:12:32 +09:00
Dean Herbert	da294c9605	Don't use base call when we don't have to	2017-09-06 23:10:08 +09:00
Dean Herbert	4f49a0c183	Simplify action	2017-09-06 22:58:21 +09:00
Dean Herbert	a7fa66b9f9	Fix CI issue	2017-09-06 22:41:03 +09:00
Dean Herbert	940c45b6d1	Fix visual styling and code styling	2017-09-06 21:43:20 +09:00
Dean Herbert	c6fa899b15	Merge remote-tracking branch 'upstream/master' into quit-chat-channels	2017-09-06 21:43:03 +09:00
smoogipooo	06fac913bf	Re-implement EditorMenuBar.	2017-09-06 21:14:29 +09:00
Dean Herbert	e834e0e958	Fix incorrect initialisation order causing mania key bindings to not work	2017-09-06 21:07:57 +09:00
Dean Herbert	4f4b0a1f35	Allow posting to chat in all channels	2017-09-06 20:26:01 +09:00
smoogipooo	df79d8918d	Merge branch 'master' into menu-bar	2017-09-06 18:26:18 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	e85d511645	No more partial judgements.	2017-09-06 17:48:01 +09:00
smoogipooo	63b61ce669	Make TimeOffset internal set.	2017-09-06 17:20:51 +09:00
smoogipooo	f158ce814c	Fix state never getting set.	2017-09-06 17:20:41 +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
Dean Herbert	968c61902a	Merge branch 'master' into new-menus	2017-09-05 23:42:33 +09:00