smoogipoo
1276e2c71a
Merge branch 'master' into scrolling-hitobjects-rewrite
2018-01-05 14:58:57 +09:00
smoogipoo
af86220dcc
Merge remote-tracking branch 'origin/master' into update-branch
2018-01-05 12:08:50 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup
2018-01-05 10:18:15 +09:00
smoogipoo
5eb2dc3d64
Cleanup some possible CI errors
...
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
smoogipoo
add68ff068
Fix swells not stopping at the hit position
2018-01-04 21:45:29 +09:00
smoogipoo
585df22c88
Add a way to calculate length of IHasEndTime objects
2018-01-04 20:56:18 +09:00
smoogipoo
a7aab21a29
Re-namespace files
2018-01-04 19:22:15 +09:00
smoogipoo
e0c921ff5c
Split out ScrollingHitObjectContainer into new file
2018-01-04 19:20:43 +09:00
smoogipoo
651e24e3cc
Implement proper scrolling directions
2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4
Initial game-wide replacement of scrolling playfields
2018-01-04 18:50:17 +09:00
smoogipoo
0c5ab98965
Make MultiplierControlPoint's StartTime variable
2018-01-04 18:35:33 +09:00
smoogipoo
2b79ad879f
Add a way to access alive hitobjects
2018-01-04 16:37:48 +09:00
Dean Herbert
c8ec27c4de
Remove redundant prefix
2018-01-04 16:31:41 +09:00
Dean Herbert
152b846cff
Fix incorrect scaling of hitobjects in catch
2018-01-04 16:29:53 +09:00
smoogipoo
697efba5e2
Replace .OfType with .Cast
2018-01-04 15:55:35 +09:00
smoogipoo
6d253fd33c
Add a way to adjust the conversion process with mods
2018-01-03 19:06:20 +09:00
Dean Herbert
b8fa33459a
Merge branch 'master' into disable-unimplemented-mods
2018-01-03 13:39:29 +09:00
Felix Ang
3e6f0c198c
Remove tab
2018-01-02 18:02:04 +01:00
Felix Ang
dccc134efa
Don't allow auto to fail
2018-01-02 17:53:29 +01:00
Dean Herbert
c0dd812a4c
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
2018-01-02 15:33:08 +09:00
Dean Herbert
f419518887
Make comment xmldoc
2018-01-02 15:33:00 +09:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Dean Herbert
d9a80dae5d
Male NoFail use an applicable interface
2017-12-31 04:10:29 +09:00
Dean Herbert
fea4e1ff68
Add a base interface for applicable mods
2017-12-31 04:09:51 +09:00
Aergwyn
138d78309f
add HitCount enum and replace string usage with enum
2017-12-30 18:07:30 +01:00
smoogipoo
714d93dd92
Merge remote-tracking branch 'origin/master'
2017-12-30 16:17:14 +09:00
Dean Herbert
a0966305d4
Remove unnecessary new event
2017-12-30 14:46:44 +09:00
Aergwyn
f547c7986d
created option to override values before UpdateState is called
2017-12-29 17:50:55 +01:00
Dean Herbert
27cb445c24
Always recrusively apply custom sequence to nested hitobjects
2017-12-29 17:48:05 +09:00
Aergwyn
dbcf87267d
Merge branch 'master' into standard-hd-support
2017-12-27 21:26:39 +01:00
Dean Herbert
18eb74d38c
Merge branch 'master' into sliderbouncers-fix
2017-12-28 00:13:04 +09:00
smoogipoo
6dfc596319
Post-merge fixes
2017-12-27 20:59:26 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
Dean Herbert
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 20:40:16 +09:00
smoogipoo
b87e6c8b2a
Add a method to get ruleset by name
2017-12-27 17:33:34 +09:00
Aergwyn
4c2554595e
implement hidden (mostly)
...
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity
2017-12-26 20:48:59 +09:00
smoogipoo
9690591593
Make taiko use namespaced hitsounds
...
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
Aergwyn
f5d4ed2a22
add interface to adjust DrawableHitObjects
2017-12-26 11:49:42 +01:00
smoogipoo
14162b5d46
Make InputDrum handle all Normals/Claps, hitobjects all others
2017-12-26 14:18:23 +09:00
Dean Herbert
6f5f4f76e5
Use Logger.Error when exceptions are involved
2017-12-25 18:21:15 +09:00
smoogipoo
0fb620a8d3
Make HitObject.Samples non-nullable
2017-12-25 16:41:18 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
smoogipoo
68d76d4380
Fix taiko strong hits not being handled
2017-12-23 20:58:09 +09:00
Dean Herbert
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
Dean Herbert
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
ff0927e71b
Remove unnecessary newline
2017-12-23 16:23:33 +09:00
Dean Herbert
46865bbacd
Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
...
# Conflicts:
# osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
Dean Herbert
1fa9dac1bb
Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
2017-12-23 14:20:16 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
smoogipoo
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
Dean Herbert
051a3c4d47
Fix line endings
2017-12-18 21:51:00 +09:00
smoogipoo
fabf1bf60a
Make the captured objects not update for now
...
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
smoogipoo
5493493f82
FinishCapture -> FinishDrag from Handles
2017-12-18 19:24:41 +09:00
smoogipoo
09c51df2bd
Marker* -> Handle
2017-12-18 19:21:26 +09:00
smoogipoo
3999940538
DragSelector -> HitObjectSelectionBox
2017-12-18 19:17:26 +09:00
Dan Balasescu
812181190e
Update SelectionLayer.cs
2017-12-18 14:10:14 +09:00
Dan Balasescu
17c58678cf
Update SelectionInfo.cs
2017-12-18 13:59:46 +09:00
Ninjaprawn
71e59bc9e7
Removed the IgnoreTooltip property
2017-12-16 20:16:40 +11:00
smoogipoo
66b19b6c97
Expose selected objects from SelectionLayer
2017-12-15 14:48:24 +09:00
smoogipoo
b28b86dea9
Use Lazy for threadsafety on playfield
2017-12-14 20:27:51 +09:00
smoogipoo
3d51301e03
Add license headers
2017-12-11 22:21:33 +09:00
smoogipoo
666dcdbd62
Give HitObjectComposer a SelectionLayer
2017-12-11 22:20:02 +09:00
smoogipoo
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
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
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +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
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +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
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +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
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09: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
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
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
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
7b92bbfa86
Merge branch 'master' into mania-hit-explosions
2017-09-11 17:34:14 +09:00
smoogipooo
f3c6f6f959
Merge branch 'blending-equations' into mania-holdnote-niceness
2017-09-11 15:09:01 +09: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
smoogipooo
2086ed209d
Fix hold note tick input.
2017-09-11 04:51:44 +09: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
MrTheMake
01553fc9ef
Moved all online related score parsing to its class
2017-09-08 02:46:54 +02: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
5822a6cc96
Merge branch 'master' into ranks-section
2017-09-07 15:11:07 +09:00
Dean Herbert
e834e0e958
Fix incorrect initialisation order causing mania key bindings to not work
2017-09-06 21:07:57 +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
d7d0e96e6b
Merge branch 'master' into ranks-section
2017-09-01 18:46:53 +09:00
Dean Herbert
2b667cf789
Fix typos
2017-08-24 20:32:55 +09:00
Dean Herbert
c9f90efb8a
Add more checks and remove direct cast
2017-08-24 20:31:57 +09:00
Dean Herbert
f0635af40d
Add documentation and regions to RulesetInputManager
2017-08-24 15:51:31 +09:00
Dean Herbert
a7a7e0323f
Update autoplay and replay handling to result in actions, not keys
2017-08-24 15:36:42 +09:00
Dean Herbert
189988236b
Move PlayerInputManager logic inside RulesetInputManager
2017-08-24 15:23:17 +09:00
smoogipooo
115e5c95af
Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
2017-08-23 20:50:03 +09:00
Dean Herbert
1f04995a73
Merge branch 'master' into hardrock-flipping
2017-08-23 17:00:41 +09:00
smoogipooo
8ddc13e394
Fix replays not loading.
2017-08-23 16:48:13 +09:00
smoogipooo
7639e096d8
No longer flip legacy replay mouse positions.
2017-08-23 15:30:17 +09:00
smoogipooo
68e7cf854f
Add variant names.
2017-08-23 14:19:14 +09:00
smoogipooo
84dd1283de
Fix nullref.
2017-08-23 13:39:51 +09:00
smoogipooo
be96fb32b3
Make RulesetContainer load KeyBindingInputManager in load()
2017-08-23 12:47:47 +09:00
Dean Herbert
ef2d9ffede
Fix redundant initialiser
2017-08-22 23:43:10 +09:00
Dean Herbert
6f8e85c2e1
Merge branch 'master' into fix_taiko_sizing
2017-08-22 23:19:41 +09:00
Dean Herbert
83bd430f89
Merge branch 'master' into fix-speed-adjustments
2017-08-22 23:07:42 +09:00
smoogipooo
f8576d44b1
Add some more xmldoc.
2017-08-22 21:08:27 +09:00
smoogipooo
d080a7e970
Determine size of ScrollingContainer a bit better to avoid taiko weirdness
2017-08-22 20:53:19 +09:00
smoogipooo
db27551709
Make hit objects put in ScrollingContainers strictly ordered by start time
...
This won't change anything as is since all hit objects are given a depth at the moment.
2017-08-22 20:51:20 +09:00
jorolf
3025fcdb25
Merge branch 'master' into ranks-section
2017-08-22 13:19:03 +02:00
Dean Herbert
9f52ecbb8a
Merge branch 'master' into mania-key-conversion
2017-08-22 20:08:39 +09:00
smoogipooo
322dfe0250
Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
2017-08-22 19:17:26 +09:00
smoogipooo
ad63cbf455
Fix default comparator being inverted.
2017-08-22 18:54:41 +09:00
smoogipooo
1964bc72e5
Should be FirstOrDefault for hit objects occuriung before the first control point.
2017-08-22 18:39:09 +09:00
smoogipooo
e5d985838f
Set ScrollingAxes and RelativeChildOffset a bit more safely.
2017-08-22 18:37:49 +09:00
smoogipooo
137964b792
Fix hit objects not getting added to the correct speed adjustment container.
2017-08-22 18:37:10 +09:00
smoogipooo
b46a51fd8b
Make the speed adjustment containers ordered decreasingly by their control point start time.
2017-08-22 18:36:32 +09:00
smoogipooo
0189f01402
Explicitly store defaultSpeedAdjustment, and make it un-removable
2017-08-22 16:15:50 +09:00
smoogipooo
5a3c0de7ad
Fix further incorrect comparison.
2017-08-22 16:10:58 +09:00
smoogipooo
a737f5fe0d
CI fixes.
2017-08-22 16:06:25 +09:00
smoogipooo
d20ea97e7f
Add NUnit test for ScrollingHitObjectContainer
...
Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.
2017-08-22 16:06:19 +09:00
smoogipooo
c3cfad4eb5
Add RemoveSpeedAdjustment
2017-08-22 16:06:14 +09:00
smoogipooo
4fc77be624
Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
2017-08-22 16:06:09 +09:00
smoogipooo
6f662d721c
Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
2017-08-22 16:06:04 +09:00
smoogipooo
b7b8d8b764
Let's not construct scrolling containers in load() for now
...
This isn't utilized at the moment, and we should be avoiding this here in the first place.
2017-08-22 16:05:59 +09:00
smoogipooo
5fcd94880d
Fix incorrect inequality with multiple speed adjustments at the same start time.
2017-08-22 16:05:53 +09:00
smoogipooo
68c7226d12
Fix cherry pick issues.
2017-08-22 14:18:17 +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
smoogipooo
964982e2e6
Remove now unneeded ApplyBeatmap.
2017-08-22 14:05:28 +09:00
Dean Herbert
250fb33fbc
Merge branch 'master' into ranks-section
2017-08-22 12:46:28 +09:00
Dean Herbert
881eecb528
Merge branch 'master' into master
2017-08-22 12:35:36 +09:00
Dean Herbert
7903f49d27
Merge branch 'master' into action-key-counter
2017-08-21 17:47:19 +09:00
Dean Herbert
52dadad1e1
Merge branch 'master' into fix-taiko-barlines
2017-08-21 16:46:25 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
smoogipooo
6e0d2182cb
CI.
2017-08-21 16:24:16 +09:00
smoogipooo
5d13efa76d
Remove the concept of "queued hit objects", add a default speed adjustment.
2017-08-21 16:17:00 +09:00
smoogipooo
7a5708ce92
Further support for null judgements.
2017-08-21 15:35:16 +09:00
Dean Herbert
a63923a497
Remove type check for now
2017-08-21 12:50:48 +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
f831832c59
CI fix
2017-08-19 00:13:06 +02:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Dean Herbert
bc7621607a
Merge upstream/master in.
2017-08-18 22:20:45 +09:00
smoogipooo
90885a31ae
Round 2 of CI fixes.
2017-08-18 15:09:54 +09:00
smoogipooo
a47b6526a2
Fix CI issues.
2017-08-18 14:40:36 +09:00
Dan Balasescu
68303accef
Merge branch 'master' into make-rulesetinfo-iequatable
2017-08-18 14:28:42 +09:00
tgi74000
dc31a0f0ac
Merged ppy/master
2017-08-17 13:01:42 +02:00
MrTheMake
586a652b08
Changed Mods to be a property
2017-08-17 12:24:22 +02:00
MrTheMake
105048500a
Made modString private and moved the beatmap assignment inside GetScoresRequest
2017-08-15 15:30:53 +02:00
MrTheMake
2c287e1348
CI and comment fix
2017-08-15 12:27:51 +02:00
MrTheMake
21ced32297
Formatted and commented the GetAllMods() function
2017-08-15 12:03:43 +02:00
MrTheMake
e908a3675e
Formatted the GetAllMods() function
2017-08-14 18:24:54 +02:00
MrTheMake
5ed717ef86
Shortened GetAllMods() using LINQ
2017-08-14 15:16:22 +02:00
MrTheMake
920710e7d0
Assign a score's beatmap and cleanup to the Score class
2017-08-14 13:30:54 +02:00
Dean Herbert
7c9d6c9c83
Initial refactoring of key binding logic
2017-08-14 20:19:25 +09:00
MrTheMake
e54f659916
Suggested changes
2017-08-13 22:37:39 +02:00
MrTheMake
2f89fc432b
Removed unused function
2017-08-13 20:28:30 +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
997d0c9053
CI fix
2017-08-13 17:45:46 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Shane Woolcock
d19c8f56be
Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire
2017-08-13 15:03:01 +09:30
MillhioreF
e42c279229
More generic catching for broken hitobject strings
2017-08-10 01:50:20 -05:00
MillhioreF
c16dbc05aa
Add new error for malformed (too many variables) hit objects during import
2017-08-09 23:41:22 -05:00
jorolf
934c2a1dc8
Merge branch 'master' into ranks-section
2017-08-09 18:47:25 +02:00
smoogipooo
d83c218e08
Remove various scrolling container optimisations (removing when not alive).
2017-08-09 16:19:09 +09:00
tgi74000
b00d1cd077
Merged ppy:master
2017-08-09 08:49:29 +02:00
Dean Herbert
976cff9af6
Merge remote-tracking branch 'upstream/master' into catch
...
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
smoogipooo
2715324a76
Fix possible incorrect reversing behavior for horizontal playfields.
2017-08-09 14:50:52 +09:00
smoogipooo
f70c00423a
Missed one.
2017-08-09 14:25:49 +09:00
smoogipooo
346aebebc0
Fix origins not being set correctly when reverting from reversed playfield.
2017-08-09 14:24:48 +09:00
smoogipooo
a20753abc6
Applied suggested changes.
2017-08-09 14:24:47 +09:00
smoogipooo
431a9649a4
Remove unused using.
2017-08-09 13:38:12 +09: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
smoogipooo
1c5584f068
Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.
...
Because they're removed from the container when they're not alive, and any further adding methods fail.
2017-08-09 12:45:50 +09:00
smoogipooo
dfb47b571a
Make HitRenderer's Playfield public so it can be used in testing.
2017-08-09 12:24:38 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Jorolf
7d7cfe5d92
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-08-08 23:13:25 +02:00
tgi74000
3d4db427ff
Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility
2017-08-08 17:17:53 +02:00
smoogipooo
cae21869d0
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍 .
2017-08-08 17:37:11 +09:00
smoogipooo
25202b522d
Fix not setting Origin + Anchors properly when reversing.
2017-08-08 14:10:26 +09:00
smoogipooo
e54abe8d0a
Fix not removing queued hit objects.
2017-08-08 13:23:46 +09:00
Dean Herbert
a95aa90adc
Allow DrawableHitObjects to be removed from a Playfield
...
(cherry picked from commit 3926238be9
2017-08-08 13:02:51 +09:00
Dean Herbert
ee7bb1b4f5
Don't set RelativePositionAxes when setting ScrollingAxes
...
(cherry picked from commit debe13629f
2017-08-08 13:02:23 +09:00
smoogipooo
c5ce86b9f3
Add reversing capability to ScrollingPlayfield.
2017-08-08 12:59:50 +09:00
smoogipooo
bd2ef4dc6b
Line endings + license headers.
2017-08-07 18:03:44 +09:00
smoogipooo
62ee613da3
Merge remote-tracking branch 'origin/master' into timingchange-improvements
2017-08-07 17:35:53 +09:00
smoogipooo
f3c05fe232
CI fixes.
2017-08-07 17:34:57 +09:00
smoogipooo
9c0a0b1e2c
Rewrite/add comments.
2017-08-07 17:27:50 +09:00
smoogipooo
933740664c
SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.
2017-08-07 16:43:54 +09:00
smoogipooo
fc252f8888
Remove exception (this is set in SpeedAdjustmentContainer).
2017-08-07 16:24:51 +09:00
smoogipooo
a3efca9c35
Reduce implementation overhead in actually positioning hitobjects and making them scroll.
2017-08-07 16:02:38 +09:00
smoogipooo
068dfcb19a
Default CreateSpeedAdjustmentContainer implementation.
2017-08-07 15:22:31 +09:00
smoogipooo
c6447e40f9
Reduce implementation overhead for nested playfields (e.g. playfield + columns).
2017-08-07 14:56:26 +09:00
smoogipooo
376f99c1e3
Make VisibleTimeRange transform work again.
2017-08-07 14:32:55 +09:00
smoogipooo
e1dfe364b2
Fix lifetime performance regression.
2017-08-07 14:07:49 +09:00
Dean Herbert
eb190d83bd
Adjust CS multiplier to match stable
2017-08-07 10:43:33 +09:00
Dean Herbert
6f93aa6131
Fix incomplete comment
2017-08-07 09:01:47 +09:00
Dean Herbert
e75f438c29
Add difficulty application mods
...
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e
Implement NoFail mod
2017-08-07 08:54:54 +09:00
Dean Herbert
3416925233
Fix alignment of icons on mod buttons
2017-08-07 08:54:53 +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
3b1166d1e6
Optimise file lookups and other database operations
...
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Jorolf
4720a47363
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-07-29 00:45:14 +02:00
Jorolf
0fc36065f4
replace Play with Score
2017-07-29 00:31:52 +02:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +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
Dean Herbert
fc28617099
Merge remote-tracking branch 'upstream/master' into ruleset-settings
2017-07-13 15:35:53 +09:00
Dean Herbert
e1e7cb7178
Remove unnecessary using statements
2017-07-12 12:55:52 +09:00
Jorolf
f7c9e449d4
add ruleset settings
2017-07-11 20:25:24 +02:00
Thomas Müller
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
Thomas Müller
22a987f6cc
Update test cases to new framework and fix old crashes
2017-07-07 15:05:55 +03:00
Dean Herbert
2f8e6f20a6
Fix CI issues
2017-07-05 13:46:53 -07:00
Thomas Müller
2d7eefa6fe
Update Cached usage according to framework
2017-07-02 13:00:02 +03:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
smoogipooo
3389c8a4dc
CI fixes.
2017-06-21 20:17:15 +09:00
smoogipooo
34ac932fe2
Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.
2017-06-19 10:54:23 +09:00
smoogipooo
38f2bd47c5
Even saner default.
2017-06-16 20:00:16 +09:00
smoogipooo
9fea187788
A bit more commenting.
2017-06-16 19:58:43 +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
Dan Balasescu
6bfb716cc6
CI fixes.
...
Update SpeedAdjustmentCollection.cs
2017-06-16 11:48:14 +09:00
smoogipooo
41c6140435
We don't need to use Cached just yet.
...
This was here to support dynamic re-ordering of hit objects and speed adjustment containers, however there needs to be more work done to TimingControlPoints/MultiplierControlPoints in general before this is possible.
2017-06-16 10:53:02 +09:00
smoogipooo
5d7336b235
A bit more cleanup.
2017-06-16 10:06:47 +09:00
smoogipooo
ff84a11c37
We don't need this to be protected anymore.
2017-06-16 09:54:16 +09:00
smoogipooo
03b2b254ba
Make SpeedAdjustmentCollection support unordered adds of speed adjustments and hit objects.
2017-06-16 09:38:06 +09:00
smoogipooo
fda220acbc
Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.
2017-06-15 19:34:28 +09:00
smoogipooo
aa830e435a
Add comment.
2017-06-15 16:15:41 +09:00
Dean Herbert
32226f90db
Enforce exception better
2017-06-15 14:53:39 +09:00
Dean Herbert
585e7ba312
Add a check to make sure all hitobjects use relativepositionaxes
2017-06-15 14:42:25 +09:00
Dean Herbert
63ca8a428d
Add xmldoc to MultiplierControlPoint
2017-06-15 14:20:54 +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
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
Dean Herbert
3e3e64eb39
More xmldoc
2017-06-09 14:21:48 +09:00
smoogipooo
ed145e9bc9
Update framework.
2017-06-09 03:40:04 +09:00
smoogipooo
a9c3234eb5
More cleanup + xmldoc changes.
2017-06-09 03:36:15 +09:00
smoogipooo
1231d5d35e
More renaming + fixes.
2017-06-09 02:42:17 +09:00
smoogipooo
7d921f92b1
Split out RelativeCoordinateAutoSizingContainer into HitObjectCollection, beginning major rework/refactoring.
2017-06-09 01:32:19 +09:00
smoogipooo
55f238f6a9
Remove IHasTimeSpan, add rename to TimingSection.
2017-06-08 23:40:24 +09:00
smoogipooo
8641379424
Not sure how these CI issues were missed.
2017-06-07 19:27:22 +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
smoogipooo
e3d10fc4d3
Update with more framework changes.
2017-06-06 15:52:35 +09:00
smoogipooo
d2ced2ea79
Update with framework changes.
2017-06-05 20:16:37 +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
52bb2df69b
Change to fa_question for now, pending flyte redesign.
2017-06-05 09:40:22 +09:00
smoogipooo
e414e44428
Drastically improve mania gameplay loading time.
2017-06-03 18:18:58 +09:00
smoogipooo
7022c8d496
Move timing change stuff to osu.Game project.
2017-06-02 20:17:44 +09:00
Shawdooow
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
smoogipooo
c137ee822c
Give velocity a sane default value.
2017-05-29 12:19:51 +09:00
smoogipooo
231b1ae610
We don't need a curve.
2017-05-29 12:19:38 +09:00
smoogipooo
6101fe98e1
Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.
2017-05-29 12:10:29 +09:00
smoogipooo
cd1da469c7
Cleanup + actually fix possible nullrefs.
2017-05-29 11:14:37 +09:00
smoogipooo
9e5a53aae7
Fix possible nullrefs.
2017-05-29 10:53:55 +09:00
smoogipooo
3ec41a313b
Add base DrawableHitObject + HitObjectStartTimeComparer.
2017-05-26 18:48:18 +09:00
smoogipooo
c2d3b6c05a
Remove late initialization of head + tail, keep them updated with start time and end time.
2017-05-26 15:53:49 +09:00
smoogipooo
836bf930a0
More cleanups.
2017-05-23 15:29:38 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
67cf64062a
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
2017-05-19 16:02:40 +09:00
smoogipooo
9565bb9572
Fix hold notes - remove glow for now.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
smoogipooo
17466a662c
Add hold note conversion.
2017-05-17 13:09:07 +09:00
Huo Yaoyuan
d213706d07
Use DateTimeOffset.
2017-05-16 21:14:50 +08:00
Dean Herbert
6fd95e0c52
Fix post-merge breakage
2017-05-11 17:16:01 +09:00
Dean Herbert
bc54b3c85f
Merge branch 'master' into mania-notes
2017-05-11 17:13:29 +09:00
Dean Herbert
b0e522345c
Combine DrawableHitObject classes into one
2017-05-11 17:07:46 +09:00
smoogipooo
a762f820c6
Fix possible nullrefs.
2017-05-11 14:50:18 +09:00
smoogipooo
2d2d1beddd
More concrete method to determine if all hit objects have been judged.
...
Covers the case where nested hit objects are involved.
2017-05-11 14:48:08 +09:00
smoogipooo
6445bea864
Make Playfield.HitObjects internal to playfields.
...
Because not all playfields will be using this.
2017-05-11 14:44:11 +09:00
smoogipooo
ea76eff1e1
Merge remote-tracking branch 'origin/master' into mania-notes
2017-05-09 19:31:35 +09:00
Dean Herbert
ab1768ef80
Merge branch 'master' into tidy-up
2017-05-09 10:27:29 +09:00
smoogipooo
e3b01e7b8c
Merge branch 'master' into mania-notes
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-05-08 12:12:40 +09:00
Dean Herbert
10910cfcef
Make field readonly.
2017-05-08 11:47:06 +09:00
Dean Herbert
2f4fad9d41
Refactor colour selection.
2017-05-08 11:33:22 +09:00
Huo Yaoyuan
4f8549f220
Standardise usages of exceptions.
2017-05-07 00:38:17 +08:00
Dean Herbert
4b385ded26
Tidy up ModIcon.
2017-05-05 13:22:10 +09:00
Dean Herbert
c9ba1ac4f6
Adjust namespaces.
...
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
Dean Herbert
6298b3effd
Refactor ModSection and ModIcon to avoid null mods.
2017-05-05 12:16:41 +09:00
EVAST9919
66c858030a
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
2017-05-04 17:35:41 +03:00
EVAST9919
475eb6fe5f
Cleanup
2017-05-04 17:29:52 +03:00
smoogipooo
956a7288fb
Add basic DrawableNote.
2017-05-03 20:12:27 +09:00
EVAST9919
9e35eb8d97
Fixes
2017-05-03 13:53:45 +03:00
smoogipooo
06e014708a
Defer virtual method to load().
2017-05-03 15:57:15 +09:00
EVAST9919
e7a8619f01
ModIcon refactor
2017-05-03 09:48:10 +03:00
EVAST9919
898d9495ff
line fix
2017-05-03 08:27:47 +03:00
smoogipooo
1fa42b26e8
Make base DrawableHitObject<TJudgement> uninheritable.
2017-05-03 14:02:23 +09:00
EVAST9919
37c3133981
Fixes
2017-05-02 22:46:18 +03:00
EVAST9919
7e1efcc20b
Added ModsContainer
2017-05-02 22:34:07 +03:00
EVAST9919
00a8dbbacf
Added ModType for each mode
2017-05-02 21:36:55 +03:00
Thomas Tan
9c6c017411
Merge branch 'master' into autoreplay-refactor-squashed
2017-04-29 17:47:38 +08:00
Dean Herbert
f202aee2a9
Fix input not being propagated to the playfield when outside its bounds.
2017-04-29 16:59:23 +09:00
Thomas Tan
d742092d9d
CI fixes
2017-04-29 02:30:34 +08:00
Thomas Tan
27632434c6
Add license header
2017-04-29 02:23:07 +08:00
Thomas Tan
9b8b88601f
Create "AutoGenerator" base class and interface.
2017-04-29 02:08:48 +08:00
Dean Herbert
c5afb4b2a0
Merge remote-tracking branch 'upstream/master' into replay-playback-accuracy
2017-04-26 19:53:30 +09:00
Dan Balasescu
22be765323
Update HitObject.cs
2017-04-26 14:45:30 +09:00
smoogipooo
28f7e0cdba
Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.
2017-04-26 14:12:21 +09:00
Dean Herbert
e003d9fc3c
Add basic replay frame accurate "seeking".
...
Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.
2017-04-25 22:59:58 +09:00
Dean Herbert
a475f1f237
Remove redundant qualifier.
2017-04-24 14:16:51 +09:00
Dan Balasescu
6fb8676215
Merge branch 'master' into nodal-hit-sounds
2017-04-22 22:11:19 +09:00
smoogipooo
2af9bf1423
Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.
2017-04-22 21:33:11 +09:00
smoogipooo
ec04ceaece
Fix off-by-one on repeatCount.
2017-04-22 20:53:55 +09:00
smoogipooo
1bb0b96ddc
Make IHasCurve not depend on a SliderCurve object.
2017-04-22 20:43:20 +09:00
Dean Herbert
caf3d311cd
Merge remote-tracking branch 'upstream/master' into speed-adjust-mods
2017-04-21 20:55:20 +09:00
smoogipooo
d7477955ac
CI fixes.
2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8
Remove CurvedHitObject to make RepeatSamples not tied to curve.
2017-04-21 20:40:11 +09:00
smoogipooo
b8f9a2be6e
Whoops fix xmldoc.
2017-04-21 20:40:05 +09:00
smoogipooo
748f13501a
Remove HeadSamples and TailSamples, combine into RepeatSamples.
2017-04-21 20:04:40 +09:00
smoogipooo
382e656e9f
CI fixes.
2017-04-21 19:51:23 +09:00
Dan Balasescu
6c8bd4dfe4
More trimming.
2017-04-21 19:41:46 +09:00
smoogipooo
47f9b2d55b
Trim whitespace.
2017-04-21 19:38:04 +09:00
smoogipooo
b8c10aa595
Improve xmldoc.
2017-04-21 19:37:16 +09:00
smoogipooo
cae4c7c6e5
Combine construction and assignment.
2017-04-21 19:12:16 +09:00
smoogipooo
a999c42d8a
Split slider samples into head + tail + repeats + body (the original HitObject.Samples).
2017-04-21 18:49:49 +09:00
Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support.
2017-04-21 17:33:37 +09:00
smoogipooo
a7afde02bf
Oops, apparently normal hit sound should always be added.
2017-04-21 16:27:35 +09:00
smoogipooo
ca824de91c
Implement RepeatSamples in IHasRepeats.
2017-04-21 16:18:34 +09:00
smoogipooo
b4a4597366
Transform legacy HitObjectParsers to give repeat slider sounds, instead of all sounds.
2017-04-21 16:18:11 +09:00
smoogipooo
83f1f9d7e5
Add ability to parse per-repeat sounds.
2017-04-21 14:38:46 +09:00
smoogipooo
bd7341c5a1
Restructure reading normal/add/volume members into class to make code a bit more readable/usable.
2017-04-21 14:36:28 +09:00
Dean Herbert
2d53ad4c0a
Remove xmldoc-only using usage.
2017-04-21 14:01:58 +09:00
smoogipooo
ac9f0ccb48
Fix hit normals always being played, regardless of sound type.
2017-04-21 13:59:55 +09:00
Dean Herbert
6e3125e115
Merge pull request #656 from smoogipooo/taiko-fixes
...
Taiko fixes
2017-04-20 20:10:29 +09:00
Dean Herbert
3342a97b20
Remove using.
2017-04-20 19:52:32 +09:00
smoogipooo
7df35e1197
Bind to method instead of exposing ScoreProcessor to HealthDisplay.
2017-04-20 19:45:15 +09:00
Dean Herbert
008ca07b16
Update score to read statistics from server.
...
Also brings some naming up-to-date.
2017-04-20 18:54:35 +09:00
smoogipooo
f50e43fc4b
CI fixes.
2017-04-20 18:02:09 +09:00
smoogipooo
6e3018f36d
Add a glow fade based on density of hits.
2017-04-20 17:11:58 +09:00
smoogipooo
e92e08f86d
Make StandardHealthDisplay glow extrude beyond the end of the bar.
2017-04-20 17:11:31 +09:00
smoogipooo
61090d918c
Temporary for taiko lagging on auto replays due to inImportantSection.
...
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
2017-04-20 15:26:42 +09:00
Dean Herbert
1707c2458e
Update exception name.
2017-04-20 12:11:03 +09:00
Dean Herbert
873599b359
Fix conversion regression.
2017-04-20 11:36:50 +09:00
Dean Herbert
2a422ca5fa
Remove ScoreStatistic.
2017-04-20 11:26:02 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation.
2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary).
2017-04-20 11:03:11 +09:00
Dean Herbert
3e65cab9b7
Move replay creation logic to ScoreDatabase.
2017-04-20 10:25:07 +09:00
Dean Herbert
3e48a57e9a
Merge branch 'master' into score-statistics
2017-04-19 20:36:14 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!).
2017-04-19 16:29:27 +09:00
Dean Herbert
662544e04f
Merge branch 'master' into results-screen
...
# Conflicts:
# osu.Game/Rulesets/Replays/Replay.cs
2017-04-19 16:25:31 +09:00
Dean Herbert
83fa143e17
Bring API request structure up-to-date.
2017-04-19 16:05:06 +09:00
Dean Herbert
cef6a014d5
Add a simulated key-up delay to auto replays.
...
Fixes key counter display looking odd.
2017-04-18 22:31:52 +09:00
Dean Herbert
49f4981f1c
Fix CI issues.
2017-04-18 22:28:16 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play.
2017-04-18 22:22:14 +09:00
Dean Herbert
15d62a0c76
Add temporary ScoreRank assignment.
2017-04-18 22:22:14 +09:00
Dean Herbert
66865c50ad
Remove explicit RelativeSize setting.
2017-04-18 18:10:13 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
