1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 08:52:54 +08:00
Commit Graph

560 Commits

Author SHA1 Message Date
smoogipoo
2f1063c5c0 Refactor into separate files + add xmldocs + rename some methods 2017-12-11 21:56:58 +09:00
smoogipoo
c12c241633 Implement hover colours 2017-12-11 21:27:19 +09:00
smoogipoo
25d80a36be Finish up logical implementation of markers 2017-12-11 21:03:34 +09:00
smoogipoo
5147b342dc More refactorings + add markers
Move
2017-12-11 19:07:40 +09:00
smoogipoo
b28306d3c0 Fix incorrect SelectionPoint 2017-12-11 18:08:16 +09:00
smoogipoo
4573cc3322 Refactor into a new DragBox class, representing a single drag 2017-12-11 17:45:03 +09:00
smoogipoo
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
Dean Herbert
77592ed15f
Fix comment formatting 2017-12-11 14:52:15 +09:00
Dean Herbert
d02e1ae896 Update RulesetInfo and add migration 2017-12-10 12:15:55 +09:00
Dean Herbert
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
smoogipoo
5341e79102 Remove SelectionDragger for now 2017-12-08 17:51:15 +09:00
smoogipoo
faa921ba05 Fix up post-merge issues 2017-12-08 17:41:10 +09:00
FreezyLemon
9e3d439f0a Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix 2017-12-08 08:30:02 +01:00
smoogipoo
f41af191ed Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-08 15:13:18 +09:00
Ninjaprawn
9b3e666a07 Added IgnoreTooltip to all classes required 2017-12-08 14:10:23 +11:00
FreezyLemon
43c270ea49 Rolled back the bad earlier implementation 2017-12-07 21:18:51 +01:00
Dean Herbert
c35c8263b9 Merge remote-tracking branch 'upstream/master' into input-revamp 2017-12-07 18:07:26 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
smoogipoo
e573db04d4 Don't serialize HitObject.Kiai 2017-12-07 14:42:36 +09:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
smoogipoo
41b607c165 Dont serialize hitobject sample properties copied from the control point 2017-12-07 03:40:43 +09:00
smoogipoo
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
smoogipoo
a80059032c Remove PlayfieldOverlay 2017-12-02 20:24:10 +09:00
smoogipoo
5a7c4772bd Remove PlayfieldUnderlay for now 2017-12-02 19:53:20 +09:00
Aergwyn
db50ad794e CI adjustments
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26 restructured OsuLegacyDecoder into LegacyDecoder
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
smoogipoo
cf859a6cf2 Make the dragger attach to objects it surrounds
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
smoogipoo
f6591851c3 Implement a selection dragger box 2017-12-01 13:15:58 +09:00
smoogipoo
52ba68e25d Add/fix up license headers 2017-11-30 22:21:02 +09:00
smoogipoo
c0c051aa32 Remove unused parameter for now 2017-11-30 21:58:41 +09:00
smoogipoo
e8cbde3ae1 Add overlay/underlay 2017-11-30 21:56:19 +09:00
smoogipoo
7e34b0f08d Remove SelectionTool, make Select the default tool 2017-11-30 19:53:52 +09:00
smoogipoo
677f3653eb Hide osu! playfield cursor 2017-11-30 19:19:34 +09:00
smoogipoo
efa39f38ca CI fixes 2017-11-30 18:49:08 +09:00
smoogipoo
e5353bb53e Add border to playfield, add shadow to toolbox buttons 2017-11-30 17:38:55 +09:00
smoogipoo
456bbe25f3 Implement toolbox into HitObjectComposer 2017-11-30 16:58:14 +09:00
smoogipoo
fd3049fd65 Merge remote-tracking branch 'origin/master' into editor-composer 2017-11-30 13:47:47 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator 2017-11-29 18:37:07 +09:00
smoogipoo
309eb4edd7 Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
smoogipoo
8c30fd490c Add HitObjectComposer class 2017-11-29 16:22:11 +09:00
FreezyLemon
bc3f11fdb8 Added PlaysSamples property to prevent certain DrawableHitObjects from playing their samples on hit. Also added this to TaikoObjects so their hitsounds won't be played (will be done by the TaikoRulesetContainer) 2017-11-29 06:24:13 +01:00
smoogipoo
1136db1556 Fix mania replays not defining important frames
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
Brayzure
782a739370 Fix Results Screen After Failing Last Note
Fixes a bug where if you failed on the last hitobject, the AllJudged event will have already been invoked.
2017-11-21 23:00:00 -05:00
smoogipoo
f9ad4b6acb Make categoryDifficulties return doubles to improve decimal accuracy 2017-11-21 19:55:09 +09:00
smoogipoo
0f8d4a455a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-21 19:18:06 +09:00
smoogipoo
217554f587 Remove redundant interface 2017-11-21 18:06:24 +09:00
Dan Balasescu
142b74cc47
Merge branch 'master' into sudden-death 2017-11-21 17:32:31 +09:00
smoogipoo
fea56322f0 Fix SD not failing for the first note 2017-11-21 17:28:51 +09:00
smoogipoo
18b9828c49 Merge UpdateFailed and CheckAlternateFailConditions 2017-11-21 17:11:07 +09:00
smoogipoo
1b27ce6198 Cleanup + renaming 2017-11-21 17:09:22 +09:00
Dean Herbert
2610cadd3c CI fixes 2017-11-21 12:11:29 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Brayzure
2b0295ed86 Proper Public Method Case
- onFailCheck to OnFailCheck
2017-11-20 20:49:31 -05:00
Brayzure
6d74fd254c Remove Extraneous Using Statement
- System.Collections.Generic was leftover from a previous attempt
2017-11-20 20:25:14 -05:00
Brayzure
da30d76f9b Implement Score Processor Mod Interface
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
Brayzure
de4d8eb196 Implement Sudden Death and Perfect
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
smoogipoo
433f4f03a1 Actually initialise DifficultyCalculator with mods 2017-11-17 20:19:49 +09:00
smoogipoo
bf44b3d0ef Cleanups 2017-11-17 16:54:50 +09:00
smoogipoo
825aa6570e Fix rebase issues 2017-11-17 14:37:19 +09:00
smoogipoo
1e023f0419 Implement PerformanceCalculator testcase 2017-11-17 14:37:19 +09:00
smoogipoo
ac6213d1fa CI fixes 2017-11-17 14:26:33 +09:00
smoogipoo
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5 Make DifficultyCalculator support mod applications
Fixes https://github.com/ppy/osu/issues/476.
2017-11-17 12:36:07 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dean Herbert
ae6d4aa38d Merge remote-tracking branch 'upstream/master' into fix-replay-clock 2017-11-13 20:03:29 +09:00
smoogipoo
495155874c Make sure that the clock is only updated once per time value 2017-11-13 19:30:57 +09:00
smoogipoo
0cec51110a Fix replay clock always running 1 frame behind
* Fixes swells never completing.
* Fixes forward playback missing notes every now and then.
* Probably more stuff.
2017-11-13 17:55:21 +09:00
smoogipoo
ae8407a3f3 Fix nested hitobject judgements not being removed 2017-11-13 14:00:35 +09:00
smoogipoo
5277c3c164 Set the frame time appropriately to reverse judgements a little better 2017-11-10 22:11:25 +09:00
smoogipoo
66ee9d1631 Update in-line with framework changes 2017-11-09 17:04:04 +09:00
smoogipoo
348083f589 Update with framework state transformation
Removes explicit initial state setting in DrawableOsuHitObjects.
2017-11-09 14:05:05 +09:00
smoogipoo
0620d0bd7a AllJudged does not need to be virtual anymore 2017-11-02 21:56:09 +09:00
smoogipoo
326891f51c Add "Final" to better determine when to stop processing the hitobject 2017-11-02 21:54:28 +09:00
smoogipoo
8ee13ef0ae Properties are unnecessary 2017-11-02 21:33:31 +09:00
smoogipoo
fe00ac7e41 Make DrawableHitObject/ScoreProcessor support rewinding 2017-11-02 21:21:07 +09:00
smoogipoo
f219b7f9fb Fix bonusScore being stored locally instead of incrementally changing 2017-11-02 19:31:30 +09:00
Dean Herbert
90af472717 Cache available rulesets as they are pretty static for now 2017-10-25 22:14:36 +09:00
TocoToucan
5107489cda Remove DatabaseBackedStore Reset functions 2017-10-25 15:12:14 +03:00
TocoToucan
63fe569afa Remove DatabaseBackedStore Prepare functions 2017-10-25 14:53:20 +03:00
Jacob Odgård Tørring
493fe1d621 Makes HasFailed private set and removes alreadyFailed 2017-10-24 08:34:10 +02:00
Jacob Odgård Tørring
9b54e834d9 Implements virtual Failcondition in scoreprocessor and enforces nofail in UpdateFailed 2017-10-22 20:32:59 +02:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
e487b6f82a Standardise context retrieval 2017-10-17 15:50:42 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00
Dean Herbert
66894d11ea Connection -> context 2017-10-17 12:46:29 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Dean Herbert
7049a73490 Remove ValidTypes from databased stored; explicitly expose query methods instead 2017-10-16 14:47:33 +09:00
Dean Herbert
4981630131 Fix formatting regressions 2017-10-16 13:12:51 +09:00
Dean Herbert
8a0b184dd6 Revert "Return back DatabaseBackedStore's query and populate functions"
This reverts commit 7cf5d63cd3.
2017-10-16 12:59:59 +09:00
TocoToucan
7cf5d63cd3 Return back DatabaseBackedStore's query and populate functions 2017-10-15 00:40:41 +03:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
smoogipoo
b83d7cd4df Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
ead88224c5 Move ModIcon tooltip to base implementation 2017-10-13 19:14:43 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
bb6b656ec6 Fix code review issues 2017-10-12 22:27:22 +09:00
Dean Herbert
1a88ffe862 Merge remote-tracking branch 'upstream/master' into catch-improvements 2017-10-11 19:10:18 +09:00
TocoToucan
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00
Dean Herbert
03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
TocoToucan
ef417c6388 Small DB-related refactoring 2017-10-09 23:30:32 +03:00
Dean Herbert
d5892cf54e Add a bool to specify whether judgements should be visible for certain DrawableHitObjects 2017-10-09 20:17:05 +09:00
TocoToucan
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
EVAST9919
aafead5057 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-03 01:34:42 +03:00
Dean Herbert
66afba6219 Allow TestCasePlayer to instantiate only one ruleset type 2017-10-02 20:48:24 +08:00
EVAST9919
c2f487aa3e Add Rank as a property to the Score Processor 2017-10-02 05:56:38 +03:00
EVAST9919
e7632b6e6f Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-28 14:44:31 +03:00
Dean Herbert
4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08:00
EVAST9919
0615f375e1 Show current grade 2017-09-23 19:52:44 +03:00
Jorolf
5b90f45691 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-09-19 21:26:05 +02:00
Dean Herbert
99b512cce5 Output ruleset assemblies to the game folder rather than adding special logic 2017-09-19 19:27:14 +09:00
Dean Herbert
f2a9e95d56 Fix type resolution in RulesetStore 2017-09-19 17:22:24 +09:00
Dean Herbert
296ebbfc54 Read ruleset assemblies from project folders 2017-09-19 16:07:00 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
98b847b025 Add API retrieval support 2017-09-14 20:08:07 +09:00
Dean Herbert
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09:00
Dean Herbert
b78c516b74 Merge branch 'master' into scoring-revamp 2017-09-13 20:47:14 +09: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
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
smoogipooo
ba3e44cd71 Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo) 2017-09-13 15:17:32 +09: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
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +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
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