1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 07:17:27 +08:00
Commit Graph

12162 Commits

Author SHA1 Message Date
Dean Herbert
0f1af85457
Merge pull request #2531 from smoogipoo/pp-hd-change
Apply HD as speed adjustment
2018-05-12 21:08:12 +09:00
Dean Herbert
36af7feab3
Merge branch 'master' into diffcalc-fixes 2018-05-12 21:01:58 +09:00
smoogipoo
416ed72597 Port osu-performance changes into OsuPerformanceCalculator 2018-05-12 15:46:25 +09:00
Dan Balasescu
67e1dca0f9
Merge pull request #2530 from peppy/update-framework
Update framework with upstream fixes
2018-05-12 11:19:32 +09:00
Dean Herbert
6ebe9f88e7 Update framework with upstream fixes 2018-05-12 11:11:09 +09:00
Dean Herbert
a14531b9a4 Fix crash on startup when adjusting volume before volume control loaded 2018-05-11 22:57:36 +09:00
Dean Herbert
cfa18bdf1f Fix song progress time counters wrapping after an hour
Resolves #2466.
Supersedes and closes #2487.
2018-05-11 22:10:26 +09:00
smoogipoo
a337248999 Fix incorrect count 2018-05-11 22:06:16 +09:00
Dean Herbert
18de235486
Merge pull request #2485 from santerinogelainen/modmouseup
Selecting a mod triggers on release
2018-05-11 21:57:53 +09:00
smoogipoo
224f1a0810 Fix incorrect osu! difficulty calculator combo count 2018-05-11 21:49:16 +09:00
smoogipoo
7e7a5f8964 Fix score accuracy not being populated 2018-05-11 21:49:10 +09:00
smoogipoo
8ca67f63ec Fix score statistics not being read 2018-05-11 21:49:06 +09:00
Dean Herbert
aa5d5ab2a8 Fix readonly field 2018-05-11 21:48:35 +09:00
Dean Herbert
f1fd2ae7be
Merge branch 'master' into modmouseup 2018-05-11 21:41:14 +09:00
Dean Herbert
7cb0d328e6 Make mods screen dynamically testable 2018-05-11 21:40:48 +09:00
Dean Herbert
4fc887b25f Add a pressing effect to make mouse up response feel good 2018-05-11 21:40:36 +09:00
Dean Herbert
ac514c5d20
Merge pull request #2492 from smoogipoo/ruleset-beatmap-statistics
Add mode-specific beatmap statistics
2018-05-11 17:54:15 +09:00
Dean Herbert
c19432dc6d
Merge branch 'master' into ruleset-beatmap-statistics 2018-05-11 17:37:50 +09:00
Dean Herbert
ed7d6f9268
Merge pull request #2518 from DrabWeb/breadcrumb-design-adjustments
BreadcrumbControl design adjustments
2018-05-11 17:37:06 +09:00
Dean Herbert
2afc0c1abd
Merge branch 'master' into breadcrumb-design-adjustments 2018-05-11 17:19:26 +09:00
Dean Herbert
3ddeeadb8b
Merge pull request #2519 from DrabWeb/multiplayer-folder-restructure
Multiplayer folder restructure
2018-05-11 16:31:00 +09:00
smoogipoo
3e7fa45ad1 Fix tests 2018-05-11 16:13:00 +09:00
smoogipoo
97a523584d Make HitWindows not return null by default 2018-05-11 15:52:51 +09:00
smoogipoo
bfad101d17 Standardise naming 2018-05-11 15:42:34 +09:00
smoogipoo
5245d2d426 Add info about when CreateHitWindows is invoked 2018-05-11 15:36:53 +09:00
smoogipoo
0cdd39b8b8 Add todo because TailNote shouldn't hardcore lenience 2018-05-11 15:32:13 +09:00
smoogipoo
8563291796 Add convert mania HitWindows 2018-05-11 15:32:00 +09:00
smoogipoo
c052ee71c1 Add convert osu HitWindows 2018-05-11 15:31:36 +09:00
smoogipoo
9c65d347ba Add convert taiko HitWindows 2018-05-11 15:31:12 +09:00
smoogipoo
faa82f17cc Pass original hitobject HitWindows during conversion 2018-05-11 15:30:50 +09:00
smoogipoo
8216bc311a Restructure HitWindows to allow outside setting 2018-05-11 15:30:26 +09:00
smoogipoo
fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
smoogipoo
816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
smoogipoo
2bab08c437 Fix post-merge errors 2018-05-11 14:08:17 +09:00
smoogipoo
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
DrabWeb
a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
DrabWeb
bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
DrabWeb
2d206d258a Move multiplayer screen components to osu.Game/Screens/Multi/Components 2018-05-10 20:44:24 -03:00
DrabWeb
c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
DrabWeb
ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
Dean Herbert
0afe33d32f
Merge pull request #2491 from smoogipoo/beatmap-conversion-rework
Rework beatmap conversion process to use IBeatmap
2018-05-10 20:08:37 +08:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework 2018-05-10 19:10:07 +08:00
Dean Herbert
7fd38e4780
Merge pull request #2490 from smoogipoo/i-beatmap
Migrate the game to use an IBeatmap interface
2018-05-10 19:07:17 +08:00
Dean Herbert
9e26bcd571 Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap 2018-05-10 19:51:52 +09:00
Dean Herbert
40c1b24b3d Move IBeatmap to its own file 2018-05-10 19:51:40 +09:00
Dean Herbert
ea838f57fc
Merge branch 'master' into exit-hold-confirmation 2018-05-10 18:37:56 +08:00
Dean Herbert
4b3c2466a4 Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons 2018-05-10 19:16:52 +09:00
smoogipoo
df604c40cc Keep shortcut padding even when there is no shortut 2018-05-10 18:49:33 +09:00
smoogipoo
c03ab9014f Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
2018-05-10 18:48:48 +09:00
Dean Herbert
2bb671cf9e
Merge pull request #2516 from peppy/update-framework
Update framework
2018-05-10 17:18:39 +08:00