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 |
|
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 |
|
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 |
|
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
|
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
|
2bb671cf9e
|
Merge pull request #2516 from peppy/update-framework
Update framework
|
2018-05-10 17:18:39 +08:00 |
|
Dean Herbert
|
c7443e6b3b
|
Update framework
|
2018-05-10 17:52:48 +09:00 |
|
Dean Herbert
|
3504f7393f
|
Merge pull request #2482 from smoogipoo/use-bindable-transforms
Use bindable transforms
|
2018-05-10 13:50:13 +08:00 |
|
Dean Herbert
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
Dean Herbert
|
aa69e0ef12
|
Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-10 11:45:23 +08:00 |
|
Dean Herbert
|
fff34be814
|
Merge branch 'master' into fix-editor-beatmap-change
|
2018-05-10 11:37:36 +08:00 |
|
Dean Herbert
|
e44faebea6
|
Merge pull request #2501 from smoogipoo/remove-explicit-clock
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-10 11:15:06 +08:00 |
|