Roman Kapustin
|
2ecf78e3d2
|
Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode
|
2018-06-21 19:44:29 +03:00 |
|
Dean Herbert
|
91af960200
|
Merge pull request #2848 from peppy/notification-usability
Improve log to notification forwarding
|
2018-06-21 20:04:00 +09:00 |
|
Dan Balasescu
|
465342c636
|
Merge branch 'master' into notification-usability
|
2018-06-21 19:48:16 +09:00 |
|
Dean Herbert
|
fcf7e211fa
|
Merge pull request #2851 from peppy/remove-dangling-files
Remove vscode files from long-gone deploy project
|
2018-06-21 18:34:05 +09:00 |
|
Dean Herbert
|
8706740825
|
Merge pull request #2593 from frankhjwx/catch_star_rating
Implement osu!catch star rating
|
2018-06-21 18:29:22 +09:00 |
|
Dean Herbert
|
999d3a240d
|
Merge remote-tracking branch 'upstream/master' into frankhjwx-catch_star_rating
|
2018-06-21 17:49:13 +09:00 |
|
Dean Herbert
|
34498f7f86
|
Use var where possible
|
2018-06-21 17:49:04 +09:00 |
|
Dean Herbert
|
c64f64814f
|
Remove unnecessary AimRating
|
2018-06-21 17:32:10 +09:00 |
|
Dean Herbert
|
5c63b3ddac
|
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-21 17:24:15 +09:00 |
|
Dean Herbert
|
4982efce88
|
Remove vscode files from long-gone deploy project
|
2018-06-21 17:22:59 +09:00 |
|
Dean Herbert
|
a9cb214aa9
|
Replace usage of GetEnumerator
|
2018-06-21 16:31:33 +09:00 |
|
Dean Herbert
|
d00c578b05
|
Merge branch 'master' into catch_star_rating
|
2018-06-21 15:57:55 +09:00 |
|
Dean Herbert
|
4c14f547dd
|
Merge pull request #2841 from tom-arrow/taiko-mouse-input
Bind mouse clicks with only one TaikoAction
|
2018-06-21 14:51:09 +09:00 |
|
Dean Herbert
|
6ec0aaee91
|
Split out logic for subsequent log message and apply action to only itself
|
2018-06-21 14:50:42 +09:00 |
|
Dean Herbert
|
87d94591e4
|
Start displaying notifications earlier
Also show important notifications and more in total.
|
2018-06-21 14:43:38 +09:00 |
|
Dean Herbert
|
ed17a241f5
|
Decrease notification font size
|
2018-06-21 14:43:02 +09:00 |
|
Dean Herbert
|
566d125658
|
Change order of default initialisation to look better in settings
|
2018-06-21 14:28:40 +09:00 |
|
Dean Herbert
|
6aa0ca5cc9
|
Add (one-way) migration for existing users
|
2018-06-21 14:22:25 +09:00 |
|
Dean Herbert
|
9908957412
|
Merge remote-tracking branch 'upstream/master' into tom-arrow-taiko-mouse-input
|
2018-06-21 13:19:34 +09:00 |
|
smoogipoo
|
afcf91a4c5
|
What the...
|
2018-06-21 13:12:22 +09:00 |
|
Dean Herbert
|
498302e298
|
Merge pull request #2559 from KoziLord/ParallaxContainerImprovement
Add support for negative ParallaxAmount in ParallaxContainer
|
2018-06-21 13:06:09 +09:00 |
|
smoogipoo
|
9314f49bc3
|
Expose the catch width from the Catcher
|
2018-06-21 12:57:59 +09:00 |
|
Dean Herbert
|
74f732038f
|
Add documentation for negative values of ParallaxAmount
|
2018-06-21 12:49:07 +09:00 |
|
Dean Herbert
|
df0083e3d9
|
Add tests for ParallaxContainer
|
2018-06-21 12:48:57 +09:00 |
|
Dean Herbert
|
5f2d1d4a1e
|
Dim TestCase background a bit
|
2018-06-21 12:48:44 +09:00 |
|
smoogipoo
|
5d0c847835
|
Fix post-merge errors
|
2018-06-21 12:26:21 +09:00 |
|
smoogipoo
|
c9581a2d56
|
Merge remote-tracking branch 'origin/master' into catch_star_rating
# Conflicts:
# osu-framework
# osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
# osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
|
2018-06-21 12:15:25 +09:00 |
|
Dean Herbert
|
733b7d1177
|
Merge branch 'master' into ParallaxContainerImprovement
|
2018-06-21 12:10:10 +09:00 |
|
Dean Herbert
|
bf9b210a44
|
Merge pull request #2708 from DrabWeb/multiplayer-match
Multiplayer match screen
|
2018-06-21 10:33:37 +09:00 |
|
Dean Herbert
|
2a42418dbf
|
Tidy up ReadyButton
|
2018-06-21 10:21:54 +09:00 |
|
Dean Herbert
|
4c068097c8
|
Change required child to use same structure as other use cases
|
2018-06-21 10:12:12 +09:00 |
|
Dean Herbert
|
2697579448
|
Give TestLounge a background to make transitions work correctly
|
2018-06-21 09:54:13 +09:00 |
|
Dean Herbert
|
96100a2200
|
Remove schedule logic (seems unnecessary)
|
2018-06-20 17:41:48 +09:00 |
|
Dean Herbert
|
39649747aa
|
Simplify and synchronise multiplayer screen transitions
|
2018-06-20 17:25:22 +09:00 |
|
Dean Herbert
|
f0c72438a3
|
Group ValueChanged attachment with bindings
|
2018-06-20 17:06:02 +09:00 |
|
Dean Herbert
|
3f020a2802
|
Merge branch 'master' into multiplayer-match
|
2018-06-20 14:49:32 +09:00 |
|
Dean Herbert
|
ee0950a845
|
Merge branch 'master' into select_resolution_in_fullscreen_mode
|
2018-06-20 13:19:39 +09:00 |
|
Dean Herbert
|
a01a0b7d52
|
Merge pull request #2831 from ThePyrotechnic/ShowMorePadding
Add padding to "show more" button
|
2018-06-20 12:27:47 +09:00 |
|
Dean Herbert
|
3eb0a17978
|
Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
|
2018-06-20 10:45:43 +09:00 |
|
Dean Herbert
|
d7f65d62e0
|
Use vertical/horizontal pair instead
|
2018-06-20 10:45:35 +09:00 |
|
Dean Herbert
|
03db19eb9c
|
Merge pull request #2838 from tom-arrow/ruleset-container
RulesetContainer<TObject> cannot be derived
|
2018-06-20 10:36:31 +09:00 |
|
Tom Arrow
|
d753df65a5
|
Remove default bindings for right actions
|
2018-06-19 18:04:53 +02:00 |
|
Dan Balasescu
|
77e03a59a9
|
Merge branch 'master' into ruleset-container
|
2018-06-19 21:47:10 +09:00 |
|
Tom Arrow
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
Dean Herbert
|
58b551b98e
|
Merge pull request #2836 from peppy/update-framework
Update framework
|
2018-06-19 21:12:16 +09:00 |
|
Dan Balasescu
|
0b1b3319aa
|
Merge branch 'master' into update-framework
|
2018-06-19 20:57:19 +09:00 |
|
Dean Herbert
|
e17d60db8a
|
Merge branch 'master' into improve-editor-scrolling
|
2018-06-19 20:23:41 +09:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
Dean Herbert
|
b9d63ee7b1
|
Merge pull request #2829 from tom-arrow/reverse-arrow-fix
Fix reverse arrow displayed with incorrect angle
|
2018-06-19 20:17:16 +09:00 |
|
Dean Herbert
|
cb24957c62
|
Merge branch 'master' into reverse-arrow-fix
|
2018-06-19 20:06:37 +09:00 |
|