Dean Herbert
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
Dean Herbert
479fe98335
Add more prominent sound when skipping
2018-07-22 22:57:55 +02:00
Dean Herbert
6fa70ed696
Merge branch 'master' into centralise-judgement-display
2018-07-23 05:23:52 +09:00
Dean Herbert
3c59ccadd0
Fix gameplay always skipping to first hitobject time
...
Regresssed with previous build
2018-07-22 22:19:58 +02:00
Dean Herbert
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
Dean Herbert
77da100c0f
Merge branch 'master' into fix-model-import
2018-07-20 23:30:41 +09:00
AlFasGD
7b4616c6c1
Add circular button file
2018-07-20 14:02:02 +03:00
AlFasGD
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dean Herbert
fc6deb6ab5
Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
2018-07-20 16:42:46 +09:00
Dean Herbert
7fea2b3a8b
Add ToList
2018-07-20 16:38:02 +09:00
Dean Herbert
92fe996a8b
Merge branch 'master' into fix-model-import
2018-07-20 16:17:39 +09:00
Dean Herbert
0e7bb3b548
Merge branch 'master' into no-more-memory-sqlite
2018-07-20 16:17:36 +09:00
smoogipoo
c087a73f40
Implement per-hitobject custom sample banks
2018-07-20 15:12:44 +09:00
smoogipoo
de8d05bb0c
Remove unnecessary setting of sample name to same value
2018-07-20 15:12:21 +09:00
Dean Herbert
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
David V
9eb69a1e76
Restructure + corrects converting to support all systems
2018-07-19 17:47:55 +02:00
David V
4e72794101
Converts float to int.
2018-07-19 15:55:38 +02:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container
2018-07-19 19:38:43 +09:00
Dean Herbert
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
Dean Herbert
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
Dean Herbert
693ba8e994
Add more ToString output
2018-07-19 18:43:11 +09:00
smoogipoo
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
Dean Herbert
332c62f110
Merge branch 'fix-model-import' into open-downloaded-beatmas
...
# Conflicts:
# osu.Game/Beatmaps/BeatmapManager.cs
# osu.Game/Database/SingletonContextFactory.cs
2018-07-19 14:11:31 +09:00
Dean Herbert
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
Dean Herbert
68614f1512
Ensure online IDs are validated for imports that don't have an associated archive too
2018-07-19 13:41:34 +09:00
Dean Herbert
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
Dean Herbert
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
0c24244340
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
# Conflicts:
# osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
Dean Herbert
1d52231d4f
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
2018-07-18 16:44:47 +09:00
Dean Herbert
90840c9384
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 13:18:50 +09:00
Dean Herbert
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
Dean Herbert
5fe634a3b6
Click download button to load beatmap
2018-07-18 13:18:50 +09:00
Dean Herbert
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
Dean Herbert
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
...
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
smoogipoo
9b7d01397b
Add ruleset config to HitObjectComposer
2018-07-17 16:53:32 +09:00
smoogipoo
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width
2018-07-17 16:36:05 +09:00
Dean Herbert
9f933187e9
Apply review feedback
2018-07-17 16:33:08 +09:00
smoogipoo
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
smoogipoo
9f730dd784
Merge branch 'editor-composer-cleanup' into mania-mask-container
...
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00
smoogipoo
3905a9105c
Add a playfield method to retrieve all hitobjects
2018-07-17 15:51:10 +09:00
smoogipoo
48190e3b5a
Make NestedPlayfields non-null
2018-07-17 15:48:51 +09:00
Dean Herbert
569d0f7993
Merge branch 'master' into scrolldirection-cleanup
2018-07-17 15:39:13 +09:00
smoogipoo
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +09:00
Dean Herbert
e681bd3244
Merge branch 'master' into fix-incorrect-mods
2018-07-17 15:23:21 +09:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
Dean Herbert
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods
2018-07-17 13:41:02 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications
2018-07-17 13:29:16 +09:00
smoogipoo
577ff4cc7f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dan Balasescu
61f58ed08a
Merge branch 'master' into reduce-panel-width
2018-07-17 12:51:16 +09:00
Dan Balasescu
e4fc3a1c65
Merge branch 'master' into fix-drawable-load-regression
2018-07-17 12:22:12 +09:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width
2018-07-17 04:20:40 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags
2018-07-17 03:50:40 +09:00
Dean Herbert
40a1f8313e
Merge branch 'master' into make-notifications-quieter
2018-07-17 03:24:47 +09:00
Dean Herbert
f4591c6d0b
Merge branch 'master' into fix_color_parsing
2018-07-17 00:25:32 +09:00
Dean Herbert
da300baff1
Update hide logic
2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade
2018-07-17 00:02:15 +09:00
morguldir
fc77e01ba9
Fix formatting, make StripComments protected
...
Don't strip comments when calling ParseLine
2018-07-16 16:35:55 +02:00
Dean Herbert
58fe434dd0
Don't use in invalidation logic to avoid incorrect execution
2018-07-16 16:39:52 +09:00
Dean Herbert
98cddc0c04
Fix some legacy cases
2018-07-16 16:26:37 +09:00
Dean Herbert
dbc538abbe
Use Enum.HasFlag
...
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter
2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b
Change default to being important
2018-07-16 13:00:21 +09:00
morguldir
429306aa87
Fix casing, use ordinal string comparison when stripping comments
2018-07-16 01:54:20 +02:00
morguldir
87a4bf3d92
Remove using directive for regex in LegacyDecoder
2018-07-16 01:08:30 +02:00
morguldir
6c861a1638
Strip comments from everything except metadata
2018-07-16 01:04:41 +02:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state
2018-07-16 03:17:26 +09:00
HoutarouOreki
453d58bcbd
Hide Content instead of particular overlays
2018-07-15 01:10:05 +02:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused
2018-07-14 03:08:28 +02:00
Dean Herbert
730eb2daa2
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-14 03:47:56 +09:00
Dean Herbert
81e5a37d6d
Enlist a few more important notifications
2018-07-14 03:31:19 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys
2018-07-13 23:32:44 +09:00
Dean Herbert
d63611a9b3
Merge branch 'master' into fix-incorrect-mods
2018-07-13 22:08:21 +09:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state
2018-07-13 22:05:26 +09:00
Dean Herbert
4f5578245e
Fix regression causing previews to not play
2018-07-13 21:45:49 +09:00
Dean Herbert
63c40e9051
Remove unnecessary cache operations
2018-07-13 21:45:42 +09:00
Dean Herbert
ac35e8bd99
Remove redundant empty statement
2018-07-13 21:27:09 +09:00
Dean Herbert
ac4f25c5bc
Make notifications less noisy
2018-07-13 21:25:08 +09:00
Dean Herbert
fc3aff6689
Fix initial colour
2018-07-13 21:19:10 +09:00
Dean Herbert
6d8923a37c
Use better logic
2018-07-13 21:08:41 +09:00
Dan Balasescu
ce804461e8
Merge branch 'master' into focused-overlay-blocks-select
2018-07-13 21:06:59 +09:00
Dean Herbert
a1a077398c
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
2018-07-13 21:04:17 +09:00
Dean Herbert
95f314d949
Fix crash when clicking notification from player
2018-07-13 21:04:10 +09:00
Dean Herbert
b33a0f772e
Don't close toolbar
2018-07-13 21:00:52 +09:00
Dean Herbert
67e7e371cc
Also block keyboard completely
2018-07-13 20:40:49 +09:00
Dean Herbert
3308f8f823
Fix focused overlays not blocking select action
2018-07-13 20:37:49 +09:00
Dean Herbert
96eb44425b
Fix informational overlays not hiding when user toggles other overlay views
...
Closes #3014 .
2018-07-13 20:34:41 +09:00
Dean Herbert
bbb11a4066
Fix regression in drawable rank first display
2018-07-13 19:53:29 +09:00
Dan Balasescu
6cc0a69413
Merge branch 'master' into remove-migration-notice
2018-07-13 19:31:20 +09:00
Dean Herbert
cd31df7c2e
Merge pull request #2903 from smoogipoo/storyboard-samples
...
Implement storyboard sample playback
2018-07-13 18:48:05 +09:00
Dean Herbert
c160a61fb7
Merge branch 'master' into storyboard-samples
2018-07-13 18:34:51 +09:00
Dean Herbert
3f44f5c60e
Remove migration log output
2018-07-13 18:34:38 +09:00
Dan Balasescu
69acb4f10e
Merge branch 'master' into improve-difficulty-icons
2018-07-13 18:27:43 +09:00
Dean Herbert
2d602c0e3c
Add todo regarding playback skip logic
2018-07-13 18:23:12 +09:00
Dean Herbert
b5a05a13ab
Merge branch 'master' into fix-ugly-line
2018-07-13 18:19:03 +09:00
Dan Balasescu
3d136ef0f9
Merge branch 'master' into fix-ugly-line
2018-07-13 18:08:55 +09:00
Dan Balasescu
1a5e77ab40
Merge branch 'master' into fix-weird-import-fail
2018-07-13 17:58:35 +09:00
Dean Herbert
159b26509b
Improve visuals of difficulty icons
2018-07-13 17:15:06 +09:00
Dean Herbert
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496
Fix incorrect corner radius
2018-07-13 14:56:44 +09:00
Dean Herbert
09be9c2ed2
Merge remote-tracking branch 'upstream/master' into naoey-download-button-state
2018-07-13 14:52:10 +09:00
Dean Herbert
ac078153ae
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
2018-07-13 14:20:56 +09:00
Criminalllz
a9f8c2acb8
Use Regex to only care about colors and commas when parsing a color.
2018-07-12 20:36:57 +02:00
Dan Balasescu
3a9929d466
Merge branch 'master' into fix-tooltip-behaviour
2018-07-12 23:54:24 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer
2018-07-12 23:41:55 +09:00
Dean Herbert
4eb0e207b2
Merge branch 'master' into fix-tooltip-behaviour
2018-07-12 20:18:04 +09:00
Dean Herbert
20b805f9eb
Merge branch 'master' into fix-key-binding-row
2018-07-12 20:06:47 +09:00
Dean Herbert
6bcc8d1cbc
Update framework
2018-07-12 19:56:41 +09:00
Dean Herbert
68fa6f03f0
Merge remote-tracking branch 'upstream/master' into peppy-fix-tooltip-behaviour
2018-07-12 19:55:24 +09:00
Dean Herbert
c67e11b2c7
Restore old tooltip appear delay behaviour
2018-07-12 15:27:17 +09:00
Dean Herbert
5df2df9b3a
Fix osu! logo handling non-left mouse buttons
2018-07-12 12:36:58 +09:00
HoutarouOreki
1e48582dc2
Instantly hide pause menu for quick retry
2018-07-11 13:49:37 +02:00
Dean Herbert
24054246b8
Fix DI regression
2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
96ef526474
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse
2018-07-11 17:02:01 +09:00
Dean Herbert
8bc7c4c9a2
Add TestCase and update disclaimer screen
2018-07-11 16:30:51 +09:00
ekrctb
55e0cd770d
Use BypassAutoSizeAxes
2018-07-11 11:24:43 +09:00
Dean Herbert
7157428882
Fix import failure of beatmap sets containing duplicate beatmap difficulties
2018-07-11 02:59:00 +09:00
Dean Herbert
1418d1369f
Add the ability to click completed download notifications to select beatmap
...
Closes #2731 .
2018-07-11 01:32:10 +09:00
HoutarouOreki
dd20663192
Lesser keyboard steps
2018-07-10 17:28:56 +02:00
Dean Herbert
2150cb1028
Update framework and other packages
2018-07-10 20:31:04 +09:00
Dan Balasescu
f5504914cc
Merge branch 'master' into fix-hitsound-fallback
2018-07-10 17:19:16 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system
2018-07-10 16:44:55 +09:00
Dan Balasescu
ce219cda53
Merge branch 'master' into fix-beatmap-links
2018-07-10 16:20:59 +09:00
smoogipoo
bf1ce8cdd8
Fix linking still being broken
2018-07-10 16:02:13 +09:00
smoogipoo
0f649cd231
Merge remote-tracking branch 'origin/master' into fix-beatmap-links
2018-07-10 16:01:56 +09:00
Dan Balasescu
8cc042bd5a
Merge branch 'master' into fix-beatmap-id-conflicts
2018-07-10 15:49:30 +09:00
Dean Herbert
6dffb1147c
Merge branch 'master' into fix-right-mouse-absolute
2018-07-10 15:34:03 +09:00
Dan Balasescu
ede95b6954
Merge branch 'master' into fix-hitsound-fallback
2018-07-10 15:31:15 +09:00
Dean Herbert
14c3cc70b1
Prefer namespace lookups first
2018-07-10 15:23:47 +09:00
Dean Herbert
7f315d79c2
Fix pixel gap in user profile when scrolling
2018-07-10 13:06:03 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
974c4f5185
ToolbarMode* -> ToolbarRuleset*
2018-07-10 01:20:21 +09:00
Dean Herbert
abfebbddd9
Update framework
2018-07-09 23:50:45 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in
2018-07-09 19:10:57 +09:00
Dan Balasescu
ee4607c86e
Merge branch 'master' into fix-exit-race-condition
2018-07-09 19:02:37 +09:00
Dean Herbert
49e94850b6
Fix being able to trigger player before carousel is ready
...
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
Dean Herbert
09b3375a9d
Fix pressing escape too fast causing multiple exit attempts at song select
2018-07-09 18:12:23 +09:00
Dean Herbert
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
Dean Herbert
6ced51bb67
Merge branch 'master' into removeAge
2018-07-09 17:43:23 +09:00
HoutarouOreki
10aae3b0ee
Remove age from User class
2018-07-09 10:33:46 +02:00
HoutarouOreki
930667d0f9
Remove unused age display code
2018-07-09 10:12:10 +02:00
smoogipoo
0a67e5a274
Fix some possible null reference exceptions
2018-07-09 17:09:17 +09:00
Dean Herbert
b20afb915d
Fix right mouse activated absolute scroll not working
2018-07-09 15:26:22 +09:00
Dean Herbert
e223074876
Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
...
Resolves #2970 .
2018-07-09 00:24:55 +09:00
Dean Herbert
91777b04d8
Merge branch 'master' into download-button-state
2018-07-08 14:15:47 +09:00
Dean Herbert
ad51d95c1a
Merge branch 'master' into more-mania-conversion-fixes
2018-07-08 01:44:06 +09:00
Dean Herbert
7bfd82a417
Merge branch 'master' into hit-shake
2018-07-06 18:42:18 +09:00
Dean Herbert
f872c56deb
Merge branch 'master' into improve-button-system
2018-07-06 18:25:34 +09:00
Dean Herbert
0b30e6eb6a
Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system
2018-07-06 17:55:02 +09:00
Dean Herbert
c025158735
Give VisibleState a default rather than nullable
2018-07-06 17:53:06 +09:00
Dean Herbert
c4952569cc
Merge branch 'master' into fix-menu-cursor-animation
2018-07-06 17:46:29 +09:00
Dean Herbert
54db287791
Remove casting
2018-07-06 17:45:39 +09:00
Dean Herbert
79af5cb0a0
Limit shake duration to ensure it doesn't overlap miss window
2018-07-06 17:24:30 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes
2018-07-06 13:29:16 +09:00
Dean Herbert
98410dbb6d
Reduce shake transform count by one for more aesthetic behaviour
2018-07-06 13:24:02 +09:00
Dean Herbert
48d90a67ae
xmldoc and formatting
2018-07-06 12:13:23 +09:00
Dean Herbert
0ecbc5945f
Adjust transform to look better
2018-07-06 12:07:39 +09:00
Dean Herbert
aa96d91762
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-07-06 11:57:32 +09:00
Dean Herbert
dffe6af5d9
Merge branch 'master' into fix-menu-cursor-animation
2018-07-06 11:29:53 +09:00
tgi74000
558b2622a7
Move the Shake logic to a new ShakeContainer
2018-07-05 15:48:54 +02:00
Dean Herbert
7e28a993f7
Update framework
2018-07-05 21:08:53 +09:00
Dean Herbert
e5001b84bd
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
2018-07-05 21:04:19 +09:00
Dean Herbert
5f5790f566
Merge branch 'master' into fix-menu-cursor-animation
2018-07-05 21:04:06 +09:00
Dean Herbert
625b9ead4c
Fix links from profile top scores to beatmaps not working correctly
2018-07-05 21:00:23 +09:00
Dean Herbert
8f04acc506
Add missing xmldoc
2018-07-05 20:16:55 +09:00
Dean Herbert
4f894969df
Merge branch 'master' into hitobject-samples
2018-07-05 19:43:19 +09:00
ekrctb
bbceac6cda
Apply renaming of wheel -> scroll
2018-07-05 16:50:04 +09:00
Dean Herbert
44aecdc3a0
Rename method to EquivalentTo
2018-07-05 15:00:02 +09:00
Dean Herbert
d11ba2df0e
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
2018-07-05 14:53:31 +09:00
Dean Herbert
aea1299762
Merge branch 'master' into fix-footer-clicking-area
2018-07-05 13:39:53 +09:00
Dean Herbert
e28a610757
Fix mods not correctly resetting when changing ruleset at song select
2018-07-05 13:22:52 +09:00
Jacob Odgård Tørring
2979cb96a6
attemptSeek accesses beatmap Disabled directly
2018-07-04 21:09:28 +02:00
Jacob Odgård Tørring
9248340df8
Merge branch 'master' into master
2018-07-04 20:51:05 +02:00
Dan Balasescu
7a4d3f9ffa
Merge branch 'master' into fix-popup-dialog-regression
2018-07-04 11:15:18 +09:00
naoey
6ea6a10def
Reduce size of download button in list view to fit hover effect
2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615
Update direct panel download button for new design
...
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
ekrctb
d71b61c122
Rewrite disable mouse buttons logic
2018-07-03 20:04:15 +09:00
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
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
627a5deff9
Merge branch 'master' into fix-menu-cursor-crash
2018-07-02 18:09:11 +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
6abb3fa62c
Merge branch 'master' into add-scroll-speed-keybinds
2018-07-02 17:26:05 +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
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
e5947cc969
Merge branch 'master' into non-null-ruleset
2018-07-02 15:32:55 +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
50f561fbc2
Merge branch 'master' into allow-back-in-player
2018-07-02 14:44:58 +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
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
aea50e770b
Use .Equals everywhere
2018-07-02 13:34:14 +09:00
Dean Herbert
812929fa05
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
2018-07-02 13:10:42 +09:00
Dean Herbert
b7893bc994
Remove unnecessary comments
2018-07-02 13:07:44 +09:00
smoogipoo
9f85c55915
Merge remote-tracking branch 'origin/master' into legacy-custom-banks
2018-07-02 12:34:51 +09:00
Dean Herbert
6a459efd8f
Don't allow Key.Escape
2018-07-02 11:04:40 +09:00
Dean Herbert
2c597874bf
Fix leaderboard showing placeholder briefly when entering song select
2018-07-01 18:17:02 +09:00
Dean Herbert
98fb2e03c0
Fix rulesets not loading in debug builds after running a release build
2018-07-01 18:03:15 +09:00
Dean Herbert
b1403d837e
Add back support for closing focused overlays using back key
2018-07-01 15:52:47 +09:00
Dean Herbert
7028767e50
Fix regression in HoldFocus behaviour
2018-07-01 14:08:34 +09:00
Dean Herbert
00fd5c8dbc
Fix regression causing binding settings to fail
2018-06-30 23:51:27 +09:00
Dean Herbert
754e072e01
Don't handle all actions
2018-06-29 23:35:14 +09:00
Dean Herbert
fb90a4924b
Only clear text in FocusedTextBox
2018-06-29 23:28:15 +09:00
Dean Herbert
7c0547b4ee
Replace todo
2018-06-29 23:16:05 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player
2018-06-29 21:54:18 +09:00
Dean Herbert
ad28f88498
Fix protection change
2018-06-29 21:25:51 +09:00
Dean Herbert
cd47bd2cf8
Update framework
2018-06-29 21:06:43 +09:00
Dean Herbert
6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
smoogipoo
6d6436c8d3
Fix ruleset not getting updated if changed
2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626
SongSelect needs to recache as IBindable
2018-06-29 20:50:30 +09:00
Dean Herbert
8cf1553fd5
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-29 20:30:42 +09:00
Dean Herbert
06bd3d4815
Use IBindable where possible
2018-06-29 20:28:28 +09:00
Dean Herbert
0e649b8866
Change logic
2018-06-29 20:16:24 +09:00
Dean Herbert
34fef3caba
Update exception type
2018-06-29 20:13:29 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset
2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b
Ensure toolbar triggers updates to SongSelect's ruleset
2018-06-29 19:32:42 +09:00
Dean Herbert
182ac80881
Cache also as IBindable
2018-06-29 19:25:28 +09:00
Dean Herbert
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds
2018-06-29 18:45:37 +09:00
smoogipoo
1e696d247e
Re-privatise
2018-06-29 18:33:28 +09:00
Dan Balasescu
8abcf68188
Merge branch 'master' into fix-negative-online-set-id
2018-06-29 18:29:36 +09:00
Dean Herbert
4212a9d0d7
Fix incorrect migration conditional
2018-06-29 18:23:53 +09:00
Dan Balasescu
f149289c83
Merge branch 'master' into fix-delta-patching
2018-06-29 18:01:56 +09:00
Dean Herbert
23aa2a2361
Merge branch 'master' into catch-scoring
2018-06-29 17:29:15 +09:00
Dean Herbert
e12ce3c2a8
Adjust xmldoc
2018-06-29 17:21:55 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring
2018-06-29 17:16:14 +09:00
Dan Balasescu
845d1400dc
Merge branch 'master' into beatmap-defaults
2018-06-29 17:14:40 +09:00
Dean Herbert
c0b65a6a73
Change default IsBonus definition and remove unnecessary overrides
2018-06-29 17:07:08 +09:00
Dean Herbert
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring
2018-06-29 14:59:15 +09:00
smoogipoo
99068debc4
Split out into separate interface + add xmldocs
2018-06-29 13:24:33 +09:00
smoogipoo
756cabd5d0
Add a preprocess method to BeatmapProcessor
2018-06-29 12:45:48 +09:00
Dean Herbert
70a119dde7
Remove unused/duplicate interface
2018-06-29 12:20:53 +09:00
Dean Herbert
8742f41b7d
Revert SharpCompress library to fix delta patching regression
2018-06-29 11:34:52 +09:00
tgi74000
b0739023ce
Add BeatmapInfo's stable defaults to fix compatibility with old maps
2018-06-28 19:02:38 +02:00
Dean Herbert
8ba2ac922f
Move to local components namespace
2018-06-28 19:23:56 +09:00
Dean Herbert
0ef5b8f464
Tidy up code, remove unnecessary string.Formats
2018-06-28 19:19:00 +09:00
Dean Herbert
98fec94693
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates
2018-06-28 19:14:47 +09:00
smoogipoo
94f1b2eeb8
Only custom sample banks > 1 modify the filename
2018-06-28 18:29:17 +09:00
smoogipoo
3a9a82c80c
Add back legacy custom sample banks
2018-06-28 18:29:12 +09:00
smoogipoo
781095b96b
Encapsulate the method to apply SampleControlPoints to SampleInfos
2018-06-28 18:29:07 +09:00
smoogipoo
2882981f9c
Implement and use equality comparers for ControlPoint
2018-06-28 18:28:59 +09:00
Dean Herbert
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
Dean Herbert
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
Dean Herbert
b1a3f01212
Fix mania maps not being treated as mania maps in release builds
2018-06-28 17:10:30 +09:00
Dean Herbert
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
smoogipoo
d879b96d9f
Implement storyboard samples
2018-06-28 13:43:56 +09:00
Dean Herbert
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
smoogipoo
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
smoogipoo
2f2bd59844
Remove editor functionality from VirtualBeatmapTrack
...
/shrug
2018-06-28 11:47:41 +09:00
smoogipoo
87e8074cd2
Use a const for excess length
2018-06-28 11:46:56 +09:00
smoogipoo
c0c94e24b9
Use VirtualBeatmapTrack in testcases
2018-06-28 11:45:48 +09:00
Dean Herbert
ac7ee59d50
Add migration for previous incorrectly imported beatmaps
2018-06-28 10:48:01 +09:00
Dean Herbert
5ad122bfec
Fix beatmaps importing with -1 as online set ID
2018-06-28 10:28:35 +09:00
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
ekrctb
1ed6a672f2
Update volme control
...
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
2018-06-27 18:43:29 +09:00
smoogipoo
5640385f48
Update the length once during construction
2018-06-27 16:12:49 +09:00
smoogipoo
b4b28f8ae8
Make GetWaveform() not hard bail if errors occur
2018-06-27 16:07:18 +09:00
smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash
2018-06-27 16:00:59 +09:00
smoogipoo
f8acd9e451
Cleanup
2018-06-27 12:59:19 +09:00
Dean Herbert
0866dd11bd
DefaultBackAction -> BackAction, defaults to last button
...
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
smoogipoo
ede59f63f6
Merge remote-tracking branch 'origin/master' into make-loading-more-visible
2018-06-27 12:52:06 +09:00
Dean Herbert
d7ce4ab6fd
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-27 12:36:10 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds
2018-06-27 12:21:29 +09:00
smoogipoo
80501de4b9
Add legacy slider offsets
2018-06-27 12:09:21 +09:00
