|
|
e223074876
|
Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
Resolves #2970.
|
2018-07-09 00:24:55 +09:00 |
|
|
|
ad51d95c1a
|
Merge branch 'master' into more-mania-conversion-fixes
|
2018-07-08 01:44:06 +09:00 |
|
|
|
c4952569cc
|
Merge branch 'master' into fix-menu-cursor-animation
|
2018-07-06 17:46:29 +09:00 |
|
|
|
54db287791
|
Remove casting
|
2018-07-06 17:45:39 +09:00 |
|
|
|
8f3f872182
|
Merge branch 'master' into go-forward
|
2018-07-06 14:29:26 +09:00 |
|
|
|
290812cf65
|
Merge branch 'master' into more-mania-conversion-fixes
|
2018-07-06 13:29:16 +09:00 |
|
|
|
dffe6af5d9
|
Merge branch 'master' into fix-menu-cursor-animation
|
2018-07-06 11:29:53 +09:00 |
|
|
|
7e28a993f7
|
Update framework
|
2018-07-05 21:08:53 +09:00 |
|
|
|
e5001b84bd
|
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
|
2018-07-05 21:04:19 +09:00 |
|
|
|
5f5790f566
|
Merge branch 'master' into fix-menu-cursor-animation
|
2018-07-05 21:04:06 +09:00 |
|
|
|
8f04acc506
|
Add missing xmldoc
|
2018-07-05 20:16:55 +09:00 |
|
|
|
4f894969df
|
Merge branch 'master' into hitobject-samples
|
2018-07-05 19:43:19 +09:00 |
|
|
|
bbceac6cda
|
Apply renaming of wheel -> scroll
|
2018-07-05 16:50:04 +09:00 |
|
|
|
44aecdc3a0
|
Rename method to EquivalentTo
|
2018-07-05 15:00:02 +09:00 |
|
|
|
d11ba2df0e
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
|
2018-07-05 14:53:31 +09:00 |
|
|
|
aea1299762
|
Merge branch 'master' into fix-footer-clicking-area
|
2018-07-05 13:39:53 +09:00 |
|
|
|
7a4d3f9ffa
|
Merge branch 'master' into fix-popup-dialog-regression
|
2018-07-04 11:15:18 +09:00 |
|
|
|
1e1ff8339e
|
Merge branch 'master' into non-null-nestedobjects
|
2018-07-03 19:43:46 +09:00 |
|
|
|
5fc17bacf3
|
Add "Select" action
Allows progressing forwards in the interface
|
2018-07-03 18:39:15 +09:00 |
|
|
|
b33206c212
|
Fix selecting a button on a dialog causing both that button and exit to animate
|
2018-07-03 18:35:09 +09:00 |
|
|
|
73851fb194
|
Fix beatmap details not working for unranked beatmaps
|
2018-07-03 15:57:05 +09:00 |
|
|
|
f9f192ce34
|
Modify MenuCursor hightlight animation
|
2018-07-03 15:15:03 +09:00 |
|
|
|
d476842c44
|
Fix FooterButton clicking area
|
2018-07-02 22:03:17 -07:00 |
|
|
|
627a5deff9
|
Merge branch 'master' into fix-menu-cursor-crash
|
2018-07-02 18:09:11 +09:00 |
|
|
|
6c848f135c
|
Add comment about last button invocation
|
2018-07-02 17:48:16 +09:00 |
|
|
|
e99c05c85e
|
Merge branch 'master' into fix-dialog-popups
|
2018-07-02 17:41:16 +09:00 |
|
|
|
6abb3fa62c
|
Merge branch 'master' into add-scroll-speed-keybinds
|
2018-07-02 17:26:05 +09:00 |
|
|
|
f0ec117bcb
|
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-07-02 17:21:18 +09:00 |
|
|
|
118366303c
|
Merge branch 'master' into fix-leaderboard-placeholder
|
2018-07-02 17:17:40 +09:00 |
|
|
|
9f405b0894
|
Don't hard-bail if config skin doesn't exist anymore
|
2018-07-02 16:49:07 +09:00 |
|
|
|
ae6fdd8e29
|
whitespace
|
2018-07-02 16:20:44 +09:00 |
|
|
|
45a4187923
|
Tidy up lookups to NestedHitObjects
|
2018-07-02 16:10:56 +09:00 |
|
|
|
63746876c2
|
typo
|
2018-07-02 16:09:33 +09:00 |
|
|
|
341ffa4667
|
Fix MenuCursor crash
|
2018-07-02 16:07:52 +09:00 |
|
|
|
e5947cc969
|
Merge branch 'master' into non-null-ruleset
|
2018-07-02 15:32:55 +09:00 |
|
|
|
b61fe10f62
|
Adapt to IBindables
|
2018-07-02 15:07:18 +09:00 |
|
|
|
4070c1a888
|
Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
|
2018-07-02 15:05:34 +09:00 |
|
|
|
2c19790a97
|
Merge branch 'master' into fix-background-screen-crash
|
2018-07-02 15:01:59 +09:00 |
|
|
|
50f561fbc2
|
Merge branch 'master' into allow-back-in-player
|
2018-07-02 14:44:58 +09:00 |
|
|
|
189194ee8d
|
Don't include empty namespace in sample lookup
|
2018-07-02 14:35:03 +09:00 |
|
|
|
7f832e34c0
|
Reorder sample bank property setters
|
2018-07-02 14:29:18 +09:00 |
|
|
|
596787c941
|
Standardise input handling of popup dialogs
|
2018-07-02 14:25:12 +09:00 |
|
|
|
73fac2115a
|
Implement hitobject sample files
|
2018-07-02 14:20:35 +09:00 |
|
|
|
310c4a7d6c
|
Make SampleInfo choose its own lookup name
|
2018-07-02 14:18:41 +09:00 |
|
|
|
8b0c6a4c85
|
Make SampleControlPoint clone the existing SampleInfo
|
2018-07-02 14:17:19 +09:00 |
|
|
|
37495c34fa
|
Fix possible nullreference
|
2018-07-02 13:51:47 +09:00 |
|
|
|
b664d3ef81
|
Fix time being a part of controlpoint change comparisons
|
2018-07-02 13:34:25 +09:00 |
|
|
|
aea50e770b
|
Use .Equals everywhere
|
2018-07-02 13:34:14 +09:00 |
|
|
|
812929fa05
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
|
2018-07-02 13:10:42 +09:00 |
|
|
|
b7893bc994
|
Remove unnecessary comments
|
2018-07-02 13:07:44 +09:00 |
|
