1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 11:47:24 +08:00
Commit Graph

14990 Commits

Author SHA1 Message Date
Dean Herbert
143d9d54f9 Add basic scene manager 2018-10-16 18:02:47 +09:00
Dean Herbert
216de3c53d Don't cache manager 2018-10-16 17:34:58 +09:00
smoogipoo
f384c7228e Fix post-merge issues 2018-10-16 17:28:23 +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
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
Dean Herbert
830eda2a9f Fix unused properties 2018-10-16 16:07:59 +09:00
Dean Herbert
dfaff3aaed Fix filename mismatch 2018-10-16 15:45:41 +09:00
HoLLy
eb9199e07a Run database migration unconditionally, remove downwards migration 2018-10-16 08:29:47 +02:00
Dean Herbert
f324072d44 Make map pool layout more correct 2018-10-16 15:25:56 +09:00
Dean Herbert
3a5af47ee8 Populate beatmaps with api information when not present 2018-10-16 15:20:12 +09:00
smoogipoo
41391a6627 Fix beatmap conversion tests failing 2018-10-16 12:01:58 +09:00
smoogipoo
3ad93d5a07 Remove redundant type specifications 2018-10-16 11:40:51 +09:00
smoogipoo
060cc24dba Cleanup slidercurve calculation 2018-10-16 11:11:04 +09:00
smoogipoo
72aaaa4a74 PointSearch -> SearchPoint 2018-10-16 10:29:53 +09:00
smoogipoo
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
smoogipoo
657bd5e371 Add some xmldocs 2018-10-15 12:32:59 +09:00
smoogipoo
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
smoogipoo
26b91c96fb Fix wrong number of ticks on some legacy beatmaps 2018-10-15 12:27:58 +09:00
miterosan
3517d738d8
Merge branch 'master' into Cakefy_osu! 2018-10-14 23:16:41 +02:00
Dean Herbert
61083190d0 Add WIP map pool testcase 2018-10-14 18:09:22 +09:00
Dean Herbert
63fbe4e946 Add map pool beatmaps to groupings 2018-10-14 18:00:28 +09:00
Dean Herbert
0c4ea4beb1 Allow dynamic recompilation of beatmap panel testcase 2018-10-14 05:20:10 +09:00
Dean Herbert
a02caeef64 Add team intro screen
Also adds dates to groups and matches (must be manually populated via json)
2018-10-14 05:19:50 +09:00
Dean Herbert
b17ead22a3 fixup! Fix incorrect access definitions 2018-10-14 03:05:34 +09:00
Dean Herbert
c4b486f1d4 Fix transfer of teams in the case loser and winner progression are equal 2018-10-14 03:04:06 +09:00
Dean Herbert
b1862a863b Fix not being able to decrement scores of matches with no defined progression 2018-10-14 03:03:40 +09:00
Dean Herbert
e136f72c8e Fix incorrect access definitions 2018-10-14 03:03:17 +09:00
Dean Herbert
f5716c3d21 Add ability to change best of, add and delete groupings 2018-10-14 01:03:04 +09:00
Dean Herbert
522f106f74 Add initial version of beatmap card 2018-10-14 00:41:10 +09:00
Dean Herbert
bac7d64437 Improve the completeness of APIBeatmap's transform methods 2018-10-13 23:45:52 +09:00
Dean Herbert
2173f46a46 Add missing licence header 2018-10-13 19:45:59 +09:00
Dean Herbert
a4bb4255b1 Add grouping manager 2018-10-13 07:10:13 +09:00
Dean Herbert
c26d226a75 Make saving the ladder to disk a button-based operation rather than on dispose 2018-10-13 07:09:33 +09:00
HoLLy
710b0a4664 Remove unnecessary PathSanitise call 2018-10-12 15:30:24 +02:00
Dean Herbert
33d4ec876a
Merge pull request #3467 from smoogipoo/fix-catch-scale
Adjust catcher size
2018-10-12 21:43:24 +09:00
HoLLy
bb07630743
Merge branch 'master' into database-standardize-paths 2018-10-12 14:08:25 +02:00
Dean Herbert
ffbc88c1bf
Merge branch 'master' into fix-catch-scale 2018-10-12 20:56:37 +09:00
Dean Herbert
f1ea094d7c
Merge pull request #3466 from smoogipoo/playfield-scaling-rework
Rework playfield scaling/aspect ratio adjustment
2018-10-12 20:42:10 +09:00
Dean Herbert
a314a561d0
Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00
Dean Herbert
3f2957f7e0
Merge pull request #3586 from peppy/update-dependencies
Update nuget dependencies (version mismatches)
2018-10-12 19:32:31 +09:00
Dean Herbert
4606f0d017
Merge branch 'master' into Cakefy_osu! 2018-10-12 19:26:25 +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
ad42f2244d Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer 2018-10-12 19:15:11 +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
50bae8b526
Merge pull request #3513 from smoogipoo/fix-scroll-speeds
Adjust scroll speeds to better match osu!stable
2018-10-12 18:50:26 +09:00
Dean Herbert
77055f6d5c Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-12 18:49:47 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds 2018-10-12 18:25:24 +09:00
Dean Herbert
73622d2efc
Merge pull request #3512 from smoogipoo/fix-sv
Fix scrolling rulesets not accounting for global slider multiplier
2018-10-12 18:24:42 +09:00
Dean Herbert
1de770e093
Merge branch 'master' into fix-sv 2018-10-12 18:13:50 +09:00