|
|
ede95b6954
|
Merge branch 'master' into fix-hitsound-fallback
|
2018-07-10 15:31:15 +09:00 |
|
|
|
14c3cc70b1
|
Prefer namespace lookups first
|
2018-07-10 15:23:47 +09:00 |
|
|
|
ba258b8a05
|
Fix lack of fallback logic for custom bank samples
Closes #2966.
---
Was causing some beatmaps to not play all of their hitsounds
|
2018-07-10 02:56:22 +09:00 |
|
|
|
9e59b4a8e2
|
Fix SongSelect binding to ruleset too early
Causes music to stop playing while at main menu.
|
2018-07-10 01:29:24 +09:00 |
|
|
|
974c4f5185
|
ToolbarMode* -> ToolbarRuleset*
|
2018-07-10 01:20:21 +09:00 |
|
|
|
abfebbddd9
|
Update framework
|
2018-07-09 23:50:45 +09:00 |
|
|
|
1670f4fe31
|
Merge branch 'master' into fix-osd-fade-in
|
2018-07-09 19:10:57 +09:00 |
|
|
|
ee4607c86e
|
Merge branch 'master' into fix-exit-race-condition
|
2018-07-09 19:02:37 +09:00 |
|
|
|
49e94850b6
|
Fix being able to trigger player before carousel is ready
Causes an eventual crash.
|
2018-07-09 18:43:20 +09:00 |
|
|
|
09b3375a9d
|
Fix pressing escape too fast causing multiple exit attempts at song select
|
2018-07-09 18:12:23 +09:00 |
|
|
|
df67c0498d
|
Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
|
2018-07-09 17:53:39 +09:00 |
|
|
|
6ced51bb67
|
Merge branch 'master' into removeAge
|
2018-07-09 17:43:23 +09:00 |
|
|
|
10aae3b0ee
|
Remove age from User class
|
2018-07-09 10:33:46 +02:00 |
|
|
|
930667d0f9
|
Remove unused age display code
|
2018-07-09 10:12:10 +02:00 |
|
|
|
0a67e5a274
|
Fix some possible null reference exceptions
|
2018-07-09 17:09:17 +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 |
|
