Commit Graph

14261 Commits

Author SHA1 Message Date
67e1dca0f9 Merge pull request #2530 from peppy/update-framework
Update framework with upstream fixes
2018-05-12 11:19:32 +09:00
6ebe9f88e7 Update framework with upstream fixes 2018-05-12 11:11:09 +09:00
937ff50a5a Remove unused using. 2018-05-11 13:56:27 -03:00
9c8ef0f0aa Merge https://github.com/ppy/osu into screen-breadcrumbs 2018-05-11 13:45:19 -03:00
41de02fc78 Make DrawableRooms select when they are clicked. 2018-05-11 13:43:53 -03:00
518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
a14531b9a4 Fix crash on startup when adjusting volume before volume control loaded 2018-05-11 22:57:36 +09:00
cfa18bdf1f Fix song progress time counters wrapping after an hour
Resolves #2466.
Supersedes and closes #2487.
2018-05-11 22:10:26 +09:00
a337248999 Fix incorrect count 2018-05-11 22:06:16 +09:00
18de235486 Merge pull request #2485 from santerinogelainen/modmouseup
Selecting a mod triggers on release
2018-05-11 21:57:53 +09:00
224f1a0810 Fix incorrect osu! difficulty calculator combo count 2018-05-11 21:49:16 +09:00
7e7a5f8964 Fix score accuracy not being populated 2018-05-11 21:49:10 +09:00
8ca67f63ec Fix score statistics not being read 2018-05-11 21:49:06 +09:00
aa5d5ab2a8 Fix readonly field 2018-05-11 21:48:35 +09:00
f1fd2ae7be Merge branch 'master' into modmouseup 2018-05-11 21:41:14 +09:00
7cb0d328e6 Make mods screen dynamically testable 2018-05-11 21:40:48 +09:00
4fc887b25f Add a pressing effect to make mouse up response feel good 2018-05-11 21:40:36 +09:00
ac514c5d20 Merge pull request #2492 from smoogipoo/ruleset-beatmap-statistics
Add mode-specific beatmap statistics
2018-05-11 17:54:15 +09:00
c19432dc6d Merge branch 'master' into ruleset-beatmap-statistics 2018-05-11 17:37:50 +09:00
ed7d6f9268 Merge pull request #2518 from DrabWeb/breadcrumb-design-adjustments
BreadcrumbControl design adjustments
2018-05-11 17:37:06 +09:00
2afc0c1abd Merge branch 'master' into breadcrumb-design-adjustments 2018-05-11 17:19:26 +09:00
e89ff7e519 Merge branch 'master' of https://github.com/odgaard/osu 2018-05-11 09:57:00 +02:00
c55d47ff10 Converts OnSeek assignment to method group 2018-05-11 09:56:36 +02:00
fa403e4e2a Add test step to test pushing after a previous screen is made current. 2018-05-11 04:49:40 -03:00
37893f9dfe Merge branch 'master' into master 2018-05-11 09:43:07 +02:00
28e8d10d8d Merge branch 'master' of https://github.com/odgaard/osu 2018-05-11 09:42:45 +02:00
17ed5e4839 Moves seek restrictions to Player 2018-05-11 09:41:31 +02:00
a877855fc6 Changes conditionSeek return type to void 2018-05-11 09:39:55 +02:00
3ddeeadb8b Merge pull request #2519 from DrabWeb/multiplayer-folder-restructure
Multiplayer folder restructure
2018-05-11 16:31:00 +09:00
3e7fa45ad1 Fix tests 2018-05-11 16:13:00 +09:00
97a523584d Make HitWindows not return null by default 2018-05-11 15:52:51 +09:00
bfad101d17 Standardise naming 2018-05-11 15:42:34 +09:00
5245d2d426 Add info about when CreateHitWindows is invoked 2018-05-11 15:36:53 +09:00
0cdd39b8b8 Add todo because TailNote shouldn't hardcore lenience 2018-05-11 15:32:13 +09:00
8563291796 Add convert mania HitWindows 2018-05-11 15:32:00 +09:00
c052ee71c1 Add convert osu HitWindows 2018-05-11 15:31:36 +09:00
9c65d347ba Add convert taiko HitWindows 2018-05-11 15:31:12 +09:00
faa82f17cc Pass original hitobject HitWindows during conversion 2018-05-11 15:30:50 +09:00
8216bc311a Restructure HitWindows to allow outside setting 2018-05-11 15:30:26 +09:00
fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
2bab08c437 Fix post-merge errors 2018-05-11 14:08:17 +09:00
73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
a241ff1c05 Cleanup. 2018-05-10 22:50:03 -03:00
ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
d87ac5a1cb Create the drawable hierarchy for DrawableRoom in load. 2018-05-10 22:12:25 -03:00
6f7d0c19ef Remove redundant default value. 2018-05-10 22:02:27 -03:00
a294f187ee Add steps and asserts to TestCaseScreenBreadcrumbs. 2018-05-10 21:52:26 -03:00
b9adeeb063 Add ScreenBreadcrumbControl. 2018-05-10 21:35:26 -03:00
a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00