1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Commit Graph

12141 Commits

Author SHA1 Message Date
smoogipoo
43409127b7 Place break overlay underneath the hud 2018-05-14 15:36:42 +09:00
Dean Herbert
1045199a17
Merge pull request #2538 from smoogipoo/fix-diffcalc-timerates
Fix performance calculation not considering time-adjustment mods
2018-05-14 15:35:22 +09:00
Dean Herbert
39970c831e
Merge branch 'master' into fix-diffcalc-timerates 2018-05-14 15:19:51 +09:00
Dean Herbert
07fc71e077
Merge pull request #2533 from peppy/fix-wedge-nullref
Fix nullref when changing ruleset at main menu
2018-05-14 15:19:35 +09:00
smoogipoo
f5068804d5 Re-enable slider distance overflow
Fixes #2467.
2018-05-14 15:14:29 +09:00
Dean Herbert
345e213eff
Merge branch 'master' into fix-wedge-nullref 2018-05-14 15:08:48 +09:00
Dean Herbert
5c41e7c39c
Merge pull request #2527 from peppy/fix-mousewheel-startup-crash
Fix crash on startup when adjusting volume before volume control loaded
2018-05-14 14:23:08 +09:00
Dean Herbert
ecd8b69e5e
Merge branch 'master' into fix-diffcalc-timerates 2018-05-14 14:22:39 +09:00
smoogipoo
7d027098ec Fix drumroll completions always giving GREAT judgements
Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.
2018-05-14 14:13:07 +09:00
Dan Balasescu
d7cba000ab
Merge branch 'master' into fix-wedge-nullref 2018-05-14 13:36:07 +09:00
Dan Balasescu
4a87bbefa0
Merge pull request #2526 from peppy/fix-song-progress-counters
Fix song progress time counters wrapping after an hour
2018-05-14 13:35:58 +09:00
Dan Balasescu
2e648a90c8
Merge branch 'master' into fix-song-progress-counters 2018-05-14 13:27:50 +09:00
smoogipoo
a81921118d Strip whitespaces 2018-05-14 11:54:11 +09:00
smoogipoo
8c86f170a9 Fix mania testcases 2018-05-14 11:33:23 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
ce6b4cc2d3 Add more attributes to OsuPerformanceCalculator's output 2018-05-14 11:15:37 +09:00
smoogipoo
e1b8a1589b Fix TimeRate not being considered for performance calculation 2018-05-14 11:15:14 +09:00
Dean Herbert
ede4d6dd11
Merge branch 'master' into mapping-del 2018-05-14 10:58:58 +09:00
Dean Herbert
db0470243a Fix nullref when changing ruleset at main menu 2018-05-13 12:55:54 +09:00
Dean Herbert
9515eb4281
Merge pull request #2346 from smoogipoo/joystick
Implement joystick input
2018-05-13 01:50:14 +09:00
Dean Herbert
df43fc6ff8 Update framework 2018-05-13 01:31:17 +09:00
Dean Herbert
a162453e9b Merge remote-tracking branch 'upstream/master' into joystick
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
2018-05-13 00:11:17 +09:00
Dean Herbert
4c55b90fc1
Merge pull request #2525 from smoogipoo/diffcalc-fixes
Fix osu! difficulty/performance calculation failing or giving wrong values
2018-05-12 23:25:42 +09:00
Dean Herbert
f6df704deb
Merge branch 'master' into diffcalc-fixes 2018-05-12 22:16:20 +09:00
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
DrabWeb
9c8ef0f0aa Merge https://github.com/ppy/osu into screen-breadcrumbs 2018-05-11 13:45:19 -03: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
DrabWeb
fa403e4e2a Add test step to test pushing after a previous screen is made current. 2018-05-11 04:49:40 -03: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