94449ed597
Merge branch 'master' into notification-verbosity
2017-12-26 20:48:59 +09:00
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
f5d4ed2a22
add interface to adjust DrawableHitObjects
2017-12-26 11:49:42 +01:00
14162b5d46
Make InputDrum handle all Normals/Claps, hitobjects all others
2017-12-26 14:18:23 +09:00
6f5f4f76e5
Use Logger.Error when exceptions are involved
2017-12-25 18:21:15 +09:00
0fb620a8d3
Make HitObject.Samples non-nullable
2017-12-25 16:41:18 +09:00
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
68d76d4380
Fix taiko strong hits not being handled
2017-12-23 20:58:09 +09:00
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
ff0927e71b
Remove unnecessary newline
2017-12-23 16:23:33 +09:00
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
1fa9dac1bb
Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
2017-12-23 14:20:16 +09:00
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
051a3c4d47
Fix line endings
2017-12-18 21:51:00 +09:00
fabf1bf60a
Make the captured objects not update for now
...
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
5493493f82
FinishCapture -> FinishDrag from Handles
2017-12-18 19:24:41 +09:00
09c51df2bd
Marker* -> Handle
2017-12-18 19:21:26 +09:00
3999940538
DragSelector -> HitObjectSelectionBox
2017-12-18 19:17:26 +09:00
812181190e
Update SelectionLayer.cs
2017-12-18 14:10:14 +09:00
17c58678cf
Update SelectionInfo.cs
2017-12-18 13:59:46 +09:00
71e59bc9e7
Removed the IgnoreTooltip property
2017-12-16 20:16:40 +11:00
66b19b6c97
Expose selected objects from SelectionLayer
2017-12-15 14:48:24 +09:00
b28b86dea9
Use Lazy for threadsafety on playfield
2017-12-14 20:27:51 +09:00
3d51301e03
Add license headers
2017-12-11 22:21:33 +09:00
666dcdbd62
Give HitObjectComposer a SelectionLayer
2017-12-11 22:20:02 +09:00
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
2f1063c5c0
Refactor into separate files + add xmldocs + rename some methods
2017-12-11 21:56:58 +09:00
c12c241633
Implement hover colours
2017-12-11 21:27:19 +09:00
25d80a36be
Finish up logical implementation of markers
2017-12-11 21:03:34 +09:00
5147b342dc
More refactorings + add markers
...
Move
2017-12-11 19:07:40 +09:00
b28306d3c0
Fix incorrect SelectionPoint
2017-12-11 18:08:16 +09:00
4573cc3322
Refactor into a new DragBox class, representing a single drag
2017-12-11 17:45:03 +09:00
7189446943
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-11 16:34:27 +09:00
77592ed15f
Fix comment formatting
2017-12-11 14:52:15 +09:00
d02e1ae896
Update RulesetInfo and add migration
2017-12-10 12:15:55 +09:00
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
5341e79102
Remove SelectionDragger for now
2017-12-08 17:51:15 +09:00
faa921ba05
Fix up post-merge issues
2017-12-08 17:41:10 +09:00
9e3d439f0a
Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix
2017-12-08 08:30:02 +01:00
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
9b3e666a07
Added IgnoreTooltip to all classes required
2017-12-08 14:10:23 +11:00
43c270ea49
Rolled back the bad earlier implementation
2017-12-07 21:18:51 +01:00
c35c8263b9
Merge remote-tracking branch 'upstream/master' into input-revamp
2017-12-07 18:07:26 +09:00
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
e573db04d4
Don't serialize HitObject.Kiai
2017-12-07 14:42:36 +09:00
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
