Dean Herbert
|
1e1ff8339e
|
Merge branch 'master' into non-null-nestedobjects
|
2018-07-03 19:43:46 +09:00 |
|
Dean Herbert
|
5fc17bacf3
|
Add "Select" action
Allows progressing forwards in the interface
|
2018-07-03 18:39:15 +09:00 |
|
Dean Herbert
|
b33206c212
|
Fix selecting a button on a dialog causing both that button and exit to animate
|
2018-07-03 18:35:09 +09:00 |
|
Dean Herbert
|
2aae528e1c
|
Improve code quality of main menu button system
|
2018-07-03 18:23:41 +09:00 |
|
Dean Herbert
|
5f33ab579e
|
Merge pull request #2944 from smoogipoo/fix-beatmap-deserialisation
Fix beatmap details not loading for unranked beatmaps
|
2018-07-03 16:06:46 +09:00 |
|
smoogipoo
|
73851fb194
|
Fix beatmap details not working for unranked beatmaps
|
2018-07-03 15:57:05 +09:00 |
|
ekrctb
|
f9f192ce34
|
Modify MenuCursor hightlight animation
|
2018-07-03 15:15:03 +09:00 |
|
Joehu
|
d476842c44
|
Fix FooterButton clicking area
|
2018-07-02 22:03:17 -07:00 |
|
Dean Herbert
|
e37b931a55
|
Merge pull request #2932 from ekrctb/fix-menu-cursor-crash
Fix MenuCursor assertion failure when multiple mouse buttons pressed
|
2018-07-02 21:29:00 +09:00 |
|
Dean Herbert
|
627a5deff9
|
Merge branch 'master' into fix-menu-cursor-crash
|
2018-07-02 18:09:11 +09:00 |
|
Dan Balasescu
|
908f555a64
|
Merge pull request #2928 from peppy/fix-dialog-popups
Standardise input handling of popup dialogs
|
2018-07-02 18:09:02 +09:00 |
|
Dean Herbert
|
6c848f135c
|
Add comment about last button invocation
|
2018-07-02 17:48:16 +09:00 |
|
Dan Balasescu
|
e99c05c85e
|
Merge branch 'master' into fix-dialog-popups
|
2018-07-02 17:41:16 +09:00 |
|
Dan Balasescu
|
8f6ec0e7b1
|
Merge pull request #2690 from peppy/add-scroll-speed-keybinds
Add key bindings for scroll speed
|
2018-07-02 17:40:16 +09:00 |
|
Dan Balasescu
|
6abb3fa62c
|
Merge branch 'master' into add-scroll-speed-keybinds
|
2018-07-02 17:26:05 +09:00 |
|
Dan Balasescu
|
0123c76b3d
|
Merge pull request #2924 from peppy/fix-leaderboard-placeholder
Fix leaderboard showing placeholder briefly when entering song select
|
2018-07-02 17:25:31 +09:00 |
|
smoogipoo
|
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 |
|
Dan Balasescu
|
118366303c
|
Merge branch 'master' into fix-leaderboard-placeholder
|
2018-07-02 17:17:40 +09:00 |
|
Dean Herbert
|
7c5ad43d22
|
Merge pull request #2934 from smoogipoo/fix-skin-crash
Fix crash if the skin stored in the config doesn't exist anymore
|
2018-07-02 17:07:47 +09:00 |
|
smoogipoo
|
9f405b0894
|
Don't hard-bail if config skin doesn't exist anymore
|
2018-07-02 16:49:07 +09:00 |
|
ekrctb
|
ae6fdd8e29
|
whitespace
|
2018-07-02 16:20:44 +09:00 |
|
smoogipoo
|
45a4187923
|
Tidy up lookups to NestedHitObjects
|
2018-07-02 16:10:56 +09:00 |
|
ekrctb
|
63746876c2
|
typo
|
2018-07-02 16:09:33 +09:00 |
|
ekrctb
|
341ffa4667
|
Fix MenuCursor crash
|
2018-07-02 16:07:52 +09:00 |
|
Dan Balasescu
|
7d256f6595
|
Merge pull request #2885 from peppy/non-null-ruleset
Make BindableRuleset non-null
|
2018-07-02 16:04:31 +09:00 |
|
Dan Balasescu
|
e5947cc969
|
Merge branch 'master' into non-null-ruleset
|
2018-07-02 15:32:55 +09:00 |
|
smoogipoo
|
90d90370c2
|
Use testcase ruleset
|
2018-07-02 15:25:37 +09:00 |
|
Dan Balasescu
|
2b33a3b2eb
|
Merge pull request #2842 from peppy/fix-background-screen-crash
Fix background screens not supporting early-exit condition
|
2018-07-02 15:17:14 +09:00 |
|
smoogipoo
|
b61fe10f62
|
Adapt to IBindables
|
2018-07-02 15:07:18 +09:00 |
|
smoogipoo
|
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 |
|
Dan Balasescu
|
2c19790a97
|
Merge branch 'master' into fix-background-screen-crash
|
2018-07-02 15:01:59 +09:00 |
|
Dan Balasescu
|
154e30fe64
|
Merge pull request #2769 from Aergwyn/allow-back-in-player
Standardise handling of "Back" key binding
|
2018-07-02 15:01:23 +09:00 |
|
Dan Balasescu
|
50f561fbc2
|
Merge branch 'master' into allow-back-in-player
|
2018-07-02 14:44:58 +09:00 |
|
smoogipoo
|
c1b8799253
|
Add simple testcase
|
2018-07-02 14:40:43 +09:00 |
|
Dean Herbert
|
10eccfba39
|
Merge pull request #2882 from UselessToucan/null_coalescing_quickfix
Fix incorrect usages of null coalesce
|
2018-07-02 14:40:16 +09:00 |
|
smoogipoo
|
189194ee8d
|
Don't include empty namespace in sample lookup
|
2018-07-02 14:35:03 +09:00 |
|
smoogipoo
|
7f832e34c0
|
Reorder sample bank property setters
|
2018-07-02 14:29:18 +09:00 |
|
Dean Herbert
|
831b11ff97
|
Remove unnecessary null checks
|
2018-07-02 14:28:56 +09:00 |
|
Dean Herbert
|
9a54bf6854
|
Revert unnecessary change
|
2018-07-02 14:27:42 +09:00 |
|
Dean Herbert
|
c04bfb96e1
|
Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix
|
2018-07-02 14:26:41 +09:00 |
|
Dean Herbert
|
596787c941
|
Standardise input handling of popup dialogs
|
2018-07-02 14:25:12 +09:00 |
|
smoogipoo
|
73fac2115a
|
Implement hitobject sample files
|
2018-07-02 14:20:35 +09:00 |
|
smoogipoo
|
310c4a7d6c
|
Make SampleInfo choose its own lookup name
|
2018-07-02 14:18:41 +09:00 |
|
smoogipoo
|
8b0c6a4c85
|
Make SampleControlPoint clone the existing SampleInfo
|
2018-07-02 14:17:19 +09:00 |
|
Dan Balasescu
|
37495c34fa
|
Fix possible nullreference
|
2018-07-02 13:51:47 +09:00 |
|
smoogipoo
|
b664d3ef81
|
Fix time being a part of controlpoint change comparisons
|
2018-07-02 13:34:25 +09:00 |
|
smoogipoo
|
c78bfbfa55
|
Fix failing json conversion testcases
|
2018-07-02 13:34:19 +09:00 |
|
smoogipoo
|
aea50e770b
|
Use .Equals everywhere
|
2018-07-02 13:34:14 +09:00 |
|
Dean Herbert
|
6fe768366f
|
Merge pull request #2916 from smoogipoo/beatmap-preprocess
Extend BeatmapProcessor to allow processing hitobjects prior to ApplyDefaults
|
2018-07-02 13:20:54 +09:00 |
|
Dean Herbert
|
812929fa05
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
|
2018-07-02 13:10:42 +09:00 |
|