Commit Graph

9223 Commits

Author SHA1 Message Date
6eb7a030d0 Fix placement container not being refreshed upon placement 2018-10-17 18:11:44 +09:00
d36ac59ca2 Reduce complexity of creating edit ruleset containers 2018-10-17 18:06:00 +09:00
969477dadd Remove placement events, make everything pass top-down 2018-10-17 17:43:16 +09:00
62635c5ab8 Add container to handle placement mask 2018-10-17 16:17:49 +09:00
4ea4ec0d25 Move placement handling events to a higher level 2018-10-17 15:46:30 +09:00
08e3fe1def Add PlacementStarted event, rename placement methods 2018-10-17 14:37:45 +09:00
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
a314a561d0 Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
ad42f2244d Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer 2018-10-12 19:15:11 +09:00
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
1de770e093 Merge branch 'master' into fix-sv 2018-10-12 18:13:50 +09:00
f7c887cf79 Merge branch 'master' into debounce-seeks 2018-10-12 17:50:39 +09:00
8e66f9a85d Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-12 17:35:33 +09:00
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
c52a292935 Update framework 2018-10-12 16:10:32 +09:00
d6043a6cd3 Merge remote-tracking branch 'upstream/master' into smooth-path 2018-10-12 16:03:36 +09:00
5d26c1b771 Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
Various performance improvements around hitobjects
2018-10-11 22:16:48 +09:00
d282d16e1c Use SortedList again 2018-10-11 20:49:12 +09:00
0c4403ef16 Don't apply version offset during diff calc 2018-10-11 13:53:49 +09:00
7137c01352 Merge pull request #3549 from plankp/result-no-gamemode-switch
Stop ruleset selector from propagating positional input
2018-10-10 20:15:30 +09:00
2babdc079c Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
3fad1c42bb Merge branch 'master' into result-no-gamemode-switch 2018-10-10 20:03:58 +09:00
2181f34f74 Merge branch 'master' into result-no-gamemode-switch 2018-10-10 06:43:01 -04:00
1b6f37f3eb Merge branch 'master' into wiggle-repeat-points 2018-10-10 19:42:10 +09:00
ed0dcb2e73 Add comment explaining why 2018-10-10 19:41:40 +09:00
d28b9860ff Don't use "beatmapset" terminology 2018-10-10 19:26:35 +09:00
841b2e8692 Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
b56d09c83b Set hitobject placement time manually 2018-10-10 15:32:59 +09:00
f53bb81723 Remove unnecessary lambda allocation 2018-10-10 14:58:54 +09:00
417ebaeb85 Reduce hitobject size by removing lazy 2018-10-10 13:03:18 +09:00
1125075b37 Use list with post-sort for nested hitobjects 2018-10-10 13:02:27 +09:00
a91dda1a89 Merge branch 'master' into result-no-gamemode-switch 2018-10-09 13:04:53 -04:00
ae79c3832e Add base. for safety 2018-10-09 11:05:15 -04:00
06ea174f34 Merge branch 'master' into fix-sv 2018-10-09 18:00:34 +09:00
6d24bde72b Fix beatmap details not displaying 2018-10-09 17:39:27 +09:00
ccb6723711 Debounce music controller seeks 2018-10-09 16:50:29 +09:00
a171ed3500 Fix joined channels not appearing as joined in the channel list 2018-10-09 16:12:20 +09:00
9facf707be Add diffcalc beatmap decoder 2018-10-09 11:49:24 +09:00
b7499fa956 Allow TimingControlPoint to be overridden 2018-10-09 11:34:38 +09:00
8873fa3fca Merge branch 'master' into result-no-gamemode-switch 2018-10-08 14:10:51 -04:00
aedb6e3bb7 Remove dedundant this qualifier 2018-10-06 08:12:29 -04:00
6b236e3f2a Handle non positional input only when opened 2018-10-06 08:06:26 -04:00
ca9cbf1aea Fix rulsets being completed unselectable 2018-10-06 07:51:56 -04:00
8b27741cb0 Do not propagate positional input to subtree 2018-10-05 11:37:44 -04:00
8264dd49de Update bindable only if enabled 2018-10-05 07:13:18 -04:00
f7ebd063c3 Make user profile graph use a smooth path 2018-10-05 15:45:53 +09:00
794501cc5a Fix incorrect result of ternary 2018-10-05 12:06:24 +09:00
40c17cfa5a Remove ugly if-statement 2018-10-05 11:55:59 +09:00
cb1703c6e2 Fix colours with alpha components not being parsed 2018-10-05 11:19:01 +09:00