|
|
d40efd3134
|
Merge branch 'master' into fix-testruleset-issues
|
2018-05-14 19:39:56 +09:00 |
|
|
|
47cf4f27fb
|
Fix possibility of test rulesets being discovered from assemblies
|
2018-05-14 19:39:23 +09:00 |
|
|
|
f14948c022
|
Merge branch 'master' into exit-hold-confirmation
|
2018-05-14 18:13:40 +09:00 |
|
|
|
fe1c1fec0d
|
Stop overlays from handling DragStart
This was causing weird behaviour with the key configuration section and back button in settings.
|
2018-05-14 15:44:19 +09:00 |
|
|
|
39970c831e
|
Merge branch 'master' into fix-diffcalc-timerates
|
2018-05-14 15:19:51 +09:00 |
|
|
|
345e213eff
|
Merge branch 'master' into fix-wedge-nullref
|
2018-05-14 15:08:48 +09:00 |
|
|
|
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 |
|
|
|
ecd8b69e5e
|
Merge branch 'master' into fix-diffcalc-timerates
|
2018-05-14 14:22:39 +09:00 |
|
|
|
d7cba000ab
|
Merge branch 'master' into fix-wedge-nullref
|
2018-05-14 13:36:07 +09:00 |
|
|
|
2e648a90c8
|
Merge branch 'master' into fix-song-progress-counters
|
2018-05-14 13:27:50 +09:00 |
|
|
|
a81921118d
|
Strip whitespaces
|
2018-05-14 11:54:11 +09:00 |
|
|
|
e1b8a1589b
|
Fix TimeRate not being considered for performance calculation
|
2018-05-14 11:15:14 +09:00 |
|
|
|
db0470243a
|
Fix nullref when changing ruleset at main menu
|
2018-05-13 12:55:54 +09:00 |
|
|
|
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 |
|
|
|
36af7feab3
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-12 21:01:58 +09: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 |
|
|
|
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 |
|
|
|
4fc887b25f
|
Add a pressing effect to make mouse up response feel good
|
2018-05-11 21:40:36 +09:00 |
|
|
|
c19432dc6d
|
Merge branch 'master' into ruleset-beatmap-statistics
|
2018-05-11 17:37:50 +09:00 |
|
|
|
2afc0c1abd
|
Merge branch 'master' into breadcrumb-design-adjustments
|
2018-05-11 17:19: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 |
|
|
|
a86843ccc9
|
Remove unused usings caused by multiplayer folder restructuring.
|
2018-05-10 20:49:42 -03:00 |
|
|
|
bc9ac8f72a
|
Move multiplayer screens to osu.Game/Screens/Multi/Screens
|
2018-05-10 20:47:25 -03:00 |
|
|
|
2d206d258a
|
Move multiplayer screen components to osu.Game/Screens/Multi/Components
|
2018-05-10 20:44:24 -03:00 |
|
|
|
c35760fdef
|
Rename osu.Game/Screens/Multiplayer to Multi.
|
2018-05-10 20:39:05 -03:00 |
|
|
|
ecb8de29a2
|
Adjust BreadcrumbControl to better match the designs.
|
2018-05-10 20:30:03 -03:00 |
|
|
|
8a6ef0dabb
|
Merge branch 'master' into beatmap-conversion-rework
|
2018-05-10 19:10:07 +08:00 |
|
|
|
9e26bcd571
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
|
2018-05-10 19:51:52 +09:00 |
|
|
|
40c1b24b3d
|
Move IBeatmap to its own file
|
2018-05-10 19:51:40 +09:00 |
|
|
|
fadb1a5e0b
|
Add tests and expand functionality to ensure single fire
|
2018-05-10 17:31:16 +09:00 |
|
|
|
5df9f126d1
|
Implement a hold-to-confirm screen when exiting game using escape key
|
2018-05-10 17:07:19 +09:00 |
|
|
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
|
|
fff34be814
|
Merge branch 'master' into fix-editor-beatmap-change
|
2018-05-10 11:37:36 +08:00 |
|
|
|
674e45d49b
|
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-07 16:32:15 +09:00 |
|
|
|
fbd7ccc03f
|
Make BeatmapInfoWedge display properly for converts
|
2018-05-07 15:51:08 +09:00 |
|
|
|
5489976c20
|
Implement ruleset-specific beatmap statistics
|
2018-05-07 15:51:08 +09:00 |
|
|
|
30a3f4f29f
|
Fix not being able to convert beatmaps with 0 hitobjects
|
2018-05-07 15:27:45 +09:00 |
|
|
|
1be1b10059
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-07 13:32:19 +08:00 |
|
|
|
68441f1ef0
|
Output ruleset instantiation info
|
2018-05-07 14:28:30 +09:00 |
|
|
|
6867886f4c
|
Give conversion-tested beatmaps a ruleset
|
2018-05-07 14:04:37 +09:00 |
|
|
|
ad2c2a5fe6
|
Restore star difficulty calculation
|
2018-05-07 12:25:21 +09:00 |
|
|
|
794418432f
|
Fix incorrect method name
|
2018-05-07 11:22:25 +09:00 |
|
|
|
db3e48c194
|
Rename GetBeatmap() to GetPlayableBeatmap()
|
2018-05-07 10:40:30 +09:00 |
|
