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

852 Commits

Author SHA1 Message Date
smoogipoo
f674fcf2c8 Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
smoogipoo
e14719e440 Mask -> Piece for non-mask components 2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b Adjust namespaces 2018-10-25 18:26:28 +09:00
smoogipoo
8a2a6a3ecb Preserve the beatmap's version 2018-10-23 14:59:21 +09:00
smoogipoo
0e841628b6 Implement hitobject deletion 2018-10-18 16:36:06 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-18 14:01:47 +09:00
smoogipoo
969477dadd Remove placement events, make everything pass top-down 2018-10-17 17:43:16 +09:00
smoogipoo
4ea4ec0d25 Move placement handling events to a higher level 2018-10-17 15:46:30 +09:00
smoogipoo
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
smoogipoo
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
smoogipoo
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
Dean Herbert
a314a561d0
Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00
Dean Herbert
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
Dean Herbert
4a64cb7f85 Remove nuget includes im props 2018-10-12 18:56:18 +09:00
Dean Herbert
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
Dean Herbert
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
smoogipoo
83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +09:00
smoogipoo
cb1703c6e2 Fix colours with alpha components not being parsed 2018-10-05 11:19:01 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
e931aa3d9e Move positional modifications to HitCirclePlacementMask 2018-10-04 13:43:50 +09:00
smoogipoo
10d0e2fef1 Fix up testcase 2018-10-03 14:35:32 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
smoogipoo
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
Dean Herbert
7b57439976 Add proper testing 2018-09-15 16:25:37 +09:00
Dean Herbert
e636cfe79e Fix dynamic compilation not working 2018-09-15 16:24:06 +09:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter 2018-09-05 08:53:02 +09:00
smoogipoo
1a2c3715c7 Fix testcase dodginess 2018-08-24 15:50:39 +09:00
smoogipoo
557a2ee39d Add more comprehensive tests 2018-08-17 10:04:00 +09:00
ekrctb
cf4cb934cf
Merge branch 'master' into fix-combo-colours 2018-08-16 10:45:54 +09:00
Dean Herbert
ed2a642666 Fix info wedge test case failing randomly 2018-08-16 10:05:34 +09:00
smoogipoo
05b5144dac Add parsing test 2018-08-15 13:36:22 +09:00
smoogipoo
e360985d73 Replace variables into the entire line 2018-08-14 18:15:09 +09:00
smoogipoo
78258e2fe2 Prefix some methods with "Test" 2018-08-14 14:19:26 +09:00
smoogipoo
15bd7e4f1f Test that changing ruleset resets mods 2018-08-14 14:18:46 +09:00
Dean Herbert
4cb7063801 Add automated testing of mod preservation/removal 2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c Fix mod selection not restoring when re-entering song select 2018-08-07 14:49:44 +09:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation 2018-08-03 21:50:02 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections 2018-08-03 18:48:31 +09:00
Dean Herbert
b1afcf0e5d Add loading animation to player loader to make it more obvious when loading is complete 2018-08-02 19:47:50 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
49b2d8c355
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 16:41:09 +09:00
smoogipoo
ae8bf34fd1 Fix breadcrumb testcase failures 2018-07-31 13:48:21 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 13:21:14 +09:00
Dean Herbert
338496452d Move testing package references to somewhere appveyor will find them 2018-07-30 15:15:51 +09:00
Dean Herbert
3cf906042e
Merge branch 'master' into remove-net471-target 2018-07-30 11:28:06 +09:00