1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
Commit Graph

594 Commits

Author SHA1 Message Date
smoogipoo
ab762045d6 Move back to using load(), fix testcase 2018-01-11 16:51:46 +09:00
smoogipoo
d998936e9e Fix testcase errors 2018-01-11 15:50:44 +09:00
smoogipoo
9ae67b519b Optimise nested hitobject position computations 2018-01-11 15:25:15 +09:00
smoogipoo
9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +09:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
3a869edf36 Add a flag to disable user scroll speed adjustments 2018-01-11 12:44:39 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00
smoogipoo
6255aaab68 Per-hitobject lifetime management 2018-01-10 19:17:43 +09:00
smoogipoo
9036ea92eb Run child updates for nested hitobjects when parent hitobjects are masked 2018-01-10 18:29:46 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
Dean Herbert
9d099feadc
Merge branch 'master' into fix-catcher-width 2018-01-10 10:04:10 +09:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
smoogipoo
4ab3b0d76b Implement local scrolling hit object container 2018-01-07 13:24:09 +09:00
smoogipoo
117ab8a26d Split out scrolling algorithm 2018-01-07 13:23:16 +09:00
smoogipoo
98fd4f6ff2 Fix up precision + sizing issues 2018-01-07 11:33:59 +09:00
smoogipoo
7526225282 Use DP for most of the code to avoid unnecessary computations 2018-01-05 20:56:21 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
5d12682e83 Initial implementation of the new (old) mania scrolling calculations 2018-01-05 20:18:18 +09:00
smoogipoo
d2b135d2a8 Give hitobjects lifetimes 2018-01-05 15:48:19 +09:00
smoogipoo
1276e2c71a Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-05 14:58:57 +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
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
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