ocboogie
|
8a5bd27c20
|
Add global key bindings for changing current ruleset
|
2018-05-12 16:30:29 -07:00 |
|
Dean Herbert
|
a162453e9b
|
Merge remote-tracking branch 'upstream/master' into joystick
# Conflicts:
# osu-framework
# osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
|
2018-05-13 00:11:17 +09:00 |
|
Dean Herbert
|
a14531b9a4
|
Fix crash on startup when adjusting volume before volume control loaded
|
2018-05-11 22:57:36 +09:00 |
|
Dean Herbert
|
aa5d5ab2a8
|
Fix readonly field
|
2018-05-11 21:48:35 +09:00 |
|
Dean Herbert
|
f1fd2ae7be
|
Merge branch 'master' into modmouseup
|
2018-05-11 21:41:14 +09:00 |
|
Dean Herbert
|
4fc887b25f
|
Add a pressing effect to make mouse up response feel good
|
2018-05-11 21:40:36 +09:00 |
|
Dean Herbert
|
4b3c2466a4
|
Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons
|
2018-05-10 19:16:52 +09:00 |
|
smoogipoo
|
df604c40cc
|
Keep shortcut padding even when there is no shortut
|
2018-05-10 18:49:33 +09:00 |
|
smoogipoo
|
c03ab9014f
|
Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
|
2018-05-10 18:48:48 +09:00 |
|
Dean Herbert
|
fadb1a5e0b
|
Add tests and expand functionality to ensure single fire
|
2018-05-10 17:31:16 +09:00 |
|
Dean Herbert
|
5df9f126d1
|
Implement a hold-to-confirm screen when exiting game using escape key
|
2018-05-10 17:07:19 +09:00 |
|
smoogipoo
|
853680ca51
|
Merge remote-tracking branch 'origin/master' into disable-mouse-buttons
|
2018-05-10 14:31:52 +09:00 |
|
Dean Herbert
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
Roman Kapustin
|
33e2b91ccc
|
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
|
2018-05-03 22:59:49 +03:00 |
|
Santeri Nogelainen
|
89db7f81cb
|
Selecting a mod now triggers on mouseup
|
2018-05-02 17:11:55 +03:00 |
|
smoogipoo
|
d4ada3000c
|
Add keybind to disable mouse buttons
|
2018-05-02 19:37:47 +09:00 |
|
smoogipoo
|
2d6b2d10f7
|
Use bindable transforms
|
2018-05-02 18:26:23 +09:00 |
|
Dan Balasescu
|
9f9447d441
|
Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"
This reverts commit 67793845b0.
|
2018-05-02 16:39:00 +09:00 |
|
TocoToucan
|
ca574f2345
|
Disable RulesetToggleButton whenever the ruleset can't be changed
|
2018-04-29 18:36:19 +03:00 |
|
TocoToucan
|
8de05450c4
|
Cleanup UserProfileOverlay during PopOut
|
2018-04-29 17:53:38 +03:00 |
|
Dean Herbert
|
3de3bb31f8
|
Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del
|
2018-04-25 18:10:28 +09:00 |
|
Dean Herbert
|
76e58a51b9
|
Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
|
2018-04-25 17:28:21 +09:00 |
|
Shane Woolcock
|
84bda7d23f
|
Update framework and ensure the add channel button is not switchable
|
2018-04-24 20:46:44 +09:30 |
|
Dean Herbert
|
eb7fe0b9e2
|
Merge branch 'master' into fix-badge-container
|
2018-04-23 19:13:34 +09:00 |
|
Dean Herbert
|
27437cfbaf
|
Merge branch 'master' into show-beatmap-id
|
2018-04-20 18:05:24 +09:00 |
|
Dean Herbert
|
0b993561d8
|
Fix BadgeContainer being unsable to handle null badges
This fixes a failing test (hidden becaues the test wasn't being run).
- [ ] Merge osu-framework#1530 first.
|
2018-04-20 16:05:34 +09:00 |
|
Dean Herbert
|
a64ed142f0
|
Use a more suiting icon for discord for now
|
2018-04-20 13:51:30 +09:00 |
|
Dean Herbert
|
8649ddc68b
|
Make forum posts a web link
|
2018-04-20 13:01:23 +09:00 |
|
Dean Herbert
|
fe644c6909
|
Merge branch 'master' into profile_web_changes
|
2018-04-20 12:51:30 +09:00 |
|
Dean Herbert
|
8eefd04fcb
|
Don't return overlay to null until it has been completely hidden
|
2018-04-20 12:47:23 +09:00 |
|
Dean Herbert
|
c77f339444
|
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
|
2018-04-20 12:41:38 +09:00 |
|
tgi74000
|
64709da546
|
Update profile header to osu-web changes
|
2018-04-19 14:46:42 +02:00 |
|
Dean Herbert
|
0356e5e6bf
|
Remove unused property
|
2018-04-19 21:00:22 +09:00 |
|
Dean Herbert
|
f7ca6267b1
|
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
|
2018-04-19 20:53:06 +09:00 |
|
aQaTL
|
1dc8986c22
|
Switched back to switch
|
2018-04-18 15:06:03 +02:00 |
|
Dean Herbert
|
e395a47112
|
Changes to naming and text
|
2018-04-18 19:47:13 +09:00 |
|
Dean Herbert
|
bd834dd487
|
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
|
2018-04-18 19:46:59 +09:00 |
|
Dean Herbert
|
1728dd6502
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:42:09 +09:00 |
|
Dean Herbert
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
smoogipoo
|
ffbe6f2e37
|
Merge remote-tracking branch 'origin/master' into fix-rank-status
# Conflicts:
# osu.Game/Beatmaps/RankStatus.cs
# osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
# osu.Game/Overlays/Direct/FilterControl.cs
# osu.Game/Overlays/DirectOverlay.cs
|
2018-04-18 14:16:58 +09:00 |
|
Dean Herbert
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09:00 |
|
Dean Herbert
|
a827fb51bc
|
Simplify child definition
|
2018-04-18 11:42:55 +09:00 |
|
jorolf
|
ddd59382e2
|
Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges
|
2018-04-16 19:37:52 +02:00 |
|
jorolf
|
de9f15f620
|
add new test case and fix rotation not working
|
2018-04-16 19:22:11 +02:00 |
|
jorolf
|
046412f962
|
make hover lost transition instant (similar to hover transition)
|
2018-04-16 18:52:09 +02:00 |
|
jorolf
|
2a18b4c3f8
|
add a DRAWABLE_BADGE_SIZE const and center badges
|
2018-04-16 18:51:35 +02:00 |
|
jorolf
|
af0c49cca8
|
badge_size is the actual badge size now
also fixes rotateBadges bug when hover is lost
|
2018-04-16 18:27:18 +02:00 |
|
jorolf
|
af755b4a90
|
Merge branch 'master' into profile-badges
|
2018-04-15 23:50:52 +02:00 |
|
jorolf
|
6ca714d93b
|
add badges to ProfileHeader
|
2018-04-15 23:49:45 +02:00 |
|
Dean Herbert
|
c9615f837a
|
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
|
2018-04-16 00:20:06 +09:00 |
|
Dean Herbert
|
ae77c010e2
|
Merge remote-tracking branch 'upstream/master' into wave-container
|
2018-04-15 21:03:18 +09:00 |
|
Dean Herbert
|
fd54ae3c87
|
Simplify logic
|
2018-04-15 16:12:42 +09:00 |
|
Dean Herbert
|
069d48ac14
|
Remove unused variable
|
2018-04-15 15:29:00 +09:00 |
|
TocoToucan
|
671de4f6c2
|
Resolve merge conflicts
|
2018-04-14 15:11:28 +03:00 |
|
Dean Herbert
|
a0f9f8d512
|
Update frramework again
|
2018-04-13 21:47:50 +09:00 |
|
smoogipoo
|
733f70cbd5
|
Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
|
2018-04-13 21:13:09 +09:00 |
|
Dean Herbert
|
9f5a52b641
|
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
|
2018-04-13 19:54:15 +09:00 |
|
Dean Herbert
|
81f0649e44
|
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
|
2018-04-13 19:50:44 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
tgi74000
|
e3cd0ef200
|
Add right click scrolling in song select (and its option)
|
2018-04-13 11:09:49 +02:00 |
|
Dean Herbert
|
a1a7e63646
|
Merge branch 'master' into ignored_input_handler
|
2018-04-13 18:05:12 +09:00 |
|
smoogipoo
|
826a8552e5
|
Reword options item to include "screenshot"
|
2018-04-13 17:30:02 +09:00 |
|
TocoToucan
|
9acea6eab0
|
Order beatmap difficulty icons correctly
|
2018-04-12 19:33:30 +03:00 |
|
Joehu
|
463b189d2f
|
Remove unused using directives
|
2018-04-12 08:13:24 -07:00 |
|
Joehu
|
f18594887b
|
Move enum to SearchBeatmapSetsRequest
|
2018-04-12 07:49:23 -07:00 |
|
TocoToucan
|
7c3441e2d0
|
ActiveInputHandlers -> IgnoredInputHandler
|
2018-04-12 17:06:35 +03:00 |
|
Joehu
|
461e063f19
|
Rename RankStatus to BeatmapSearchCategory
|
2018-04-11 22:50:39 -07:00 |
|
DrabWeb
|
0bede52381
|
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
|
2018-04-11 16:22:27 -03:00 |
|
TocoToucan
|
6a8f568f66
|
BeatmapContainer -> beatmapContainer
|
2018-04-11 16:32:58 +03:00 |
|
TocoToucan
|
6cdfaffcf7
|
PaginatedBeatmapContainer.BeganPlayingPreview
|
2018-04-11 16:19:21 +03:00 |
|
Dean Herbert
|
903dd7a015
|
Fix regression causing hard crash
Regressed in #2373. My bad.
|
2018-04-11 19:24:19 +09:00 |
|
aQaTL
|
90beff83f6
|
Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width
|
2018-04-11 08:07:26 +02:00 |
|
aQaTL
|
38277bff35
|
Changed mapping of deleting key binding to shift+delete
|
2018-04-10 18:00:22 +02:00 |
|
naoey
|
d851446aca
|
Remove redundant anchor and use Show/Hide instead of FadeIn/Out.
|
2018-04-10 19:15:37 +05:30 |
|
Dean Herbert
|
c33cb9c02e
|
Merge branch 'master' into show-beatmap-id
|
2018-04-10 16:05:32 +09:00 |
|
UselessToucan
|
9225c06872
|
Merge branch 'master' into hide_menu_cursor
|
2018-04-09 21:41:54 +03:00 |
|
aQaTL
|
dbee936748
|
Allow mapping delete key via alt+delete key combination
|
2018-04-09 18:48:47 +02:00 |
|
smoogipoo
|
b97c4e8b44
|
Fix all possible cases of crossthread import data races
|
2018-04-09 12:45:44 +09:00 |
|
TocoToucan
|
640be621ac
|
Handle multiple song previews playing in different beatmap categories on profile
|
2018-04-07 13:29:46 +03:00 |
|
naoey
|
ca4299c6fe
|
Remove unused using and fix possible nullref.
|
2018-04-04 22:07:24 +05:30 |
|
naoey
|
7482d5986a
|
Add a loading state to BeatmapSetOverlay.
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
|
2018-04-04 21:46:31 +05:30 |
|
naoey
|
c304c1eecf
|
Make LinkFlowContainer handle beatmap id lookup in game.
|
2018-04-04 21:23:51 +05:30 |
|
Dan Balasescu
|
6dfca4b2fa
|
Merge branch 'master' into osu-tab-strip
|
2018-04-04 14:20:06 +09:00 |
|
smoogipoo
|
c39fb9a200
|
Update with framework changes
|
2018-04-03 20:10:26 +09:00 |
|
smoogipoo
|
e9ec544bf6
|
Implement joystick keybindings
|
2018-04-03 02:04:40 +09:00 |
|
Huo Yaoyuan
|
b842f682eb
|
Use Linq.Append and Prepend.
|
2018-04-02 12:06:34 +08:00 |
|
Joseph Madamba
|
ee14ca7cc5
|
Merge branch 'master' into score-multiplier-edits
|
2018-03-31 10:43:58 -07:00 |
|
DrabWeb
|
3d05798d80
|
Change SearchableListOverlay to use OsuTabControl strip.
|
2018-03-29 15:34:53 -03:00 |
|
Joseph Madamba
|
af9e3a849f
|
Merge branch 'master' into score-multiplier-edits
|
2018-03-28 20:42:35 -07:00 |
|
Joseph Madamba
|
5457f17e79
|
Clean up code from reviews
|
2018-03-28 19:53:15 -07:00 |
|
DrabWeb
|
19bc6b9168
|
Merge https://github.com/ppy/osu into beatmap-set-status
|
2018-03-27 18:13:58 -03:00 |
|
Joseph Madamba
|
ac9527147f
|
Fix transitioning of unranked label
|
2018-03-27 03:05:05 -07:00 |
|
DrabWeb
|
eb374c5774
|
Add beatmap set online status and display it in direct panels and the beatmap set overlay.
|
2018-03-26 21:04:45 -03:00 |
|
Joseph Madamba
|
90d763fda5
|
Apply review changes and suggestions
|
2018-03-25 10:00:30 -07:00 |
|
Joseph Madamba
|
78a7564acd
|
Score multiplier edits
|
2018-03-24 16:00:18 -07:00 |
|
smoogipoo
|
c29f7a4333
|
Merge remote-tracking branch 'origin/master' into netstandard
|
2018-03-24 14:49:46 +09:00 |
|
Dean Herbert
|
b593c47809
|
Add setting to toggle performance logging
|
2018-03-24 05:07:48 +09:00 |
|
TocoToucan
|
dd5cc59250
|
Introduce 'Capture menu cursor' setting
|
2018-03-23 22:53:06 +03:00 |
|
Dan Balasescu
|
676feb3658
|
Merge branch 'master' into fix-mod-button-sounds
|
2018-03-23 21:03:42 +09:00 |
|
smoogipoo
|
52fa837447
|
Fix volume glow being cut off
Fixes #2285.
|
2018-03-23 18:17:23 +09:00 |
|
Dean Herbert
|
fd124d2ee6
|
Merge branch 'master' into fix-mod-button-sounds
|
2018-03-22 21:55:15 +09:00 |
|
Dean Herbert
|
e7cb579ec4
|
Merge branch 'master' into take_screenshot
|
2018-03-22 21:34:53 +09:00 |
|
Dean Herbert
|
14a653aa28
|
Restore old auto-popout notification overlay behaviour
|
2018-03-22 20:55:00 +09:00 |
|
Dean Herbert
|
74191e1b73
|
Merge remote-tracking branch 'upstream/master' into take_screenshot
|
2018-03-22 20:49:17 +09:00 |
|
Dean Herbert
|
65b6a2faad
|
Fix mod button sounds playing when mod overlay is not visible
Resolves #2240.
|
2018-03-21 18:41:21 +09:00 |
|
Dean Herbert
|
f944c29505
|
Merge remote-tracking branch 'upstream/master' into take_screenshot
|
2018-03-21 12:32:27 +09:00 |
|
Dean Herbert
|
ec851648da
|
Add better ToString output from SkinInfo
|
2018-03-19 20:06:44 +09:00 |
|
TocoToucan
|
604e725f3f
|
Remove redundant code
|
2018-03-16 20:42:05 +03:00 |
|
Dean Herbert
|
4411758ff7
|
Merge branch 'master' into fix-autoplay-button-deselect
|
2018-03-16 17:31:14 +09:00 |
|
Dean Herbert
|
46f5c0fc19
|
Merge branch 'master' into mod-fixes
|
2018-03-16 15:38:41 +09:00 |
|
TocoToucan
|
34dc8e7375
|
Resolve merge conflict
|
2018-03-14 23:22:19 +03:00 |
|
Dean Herbert
|
551b67ac16
|
Merge branch 'master' into fix-autoplay-button-deselect
|
2018-03-14 21:46:19 +09:00 |
|
FreezyLemon
|
070decf890
|
small code cleanups
|
2018-03-14 12:38:22 +01:00 |
|
FreezyLemon
|
a438e45434
|
make SelectTypes set mods instead of only adding new ones
also made the method actually take types as parameter to make it consistent
|
2018-03-14 12:33:08 +01:00 |
|
Joseph Madamba
|
1eeacb7bf7
|
Change descriptions and special section
|
2018-03-14 01:05:19 -07:00 |
|
Joseph Madamba
|
d122aa80e4
|
Edit mods description, multiplier, and code
|
2018-03-13 20:07:03 -07:00 |
|
Dean Herbert
|
07642546bb
|
Make APIAccess a component
|
2018-03-14 11:29:54 +09:00 |
|
Dean Herbert
|
afc3646450
|
Move API configuration hooks out of OsuGameBase
Also makes username more private, and password completely private.
|
2018-03-14 10:15:05 +09:00 |
|
vperus
|
ba44813c00
|
Fixed exit from game save username instead of email. Resolve #2156
|
2018-03-13 12:10:47 +02:00 |
|
Dean Herbert
|
1d0a44a0bb
|
Merge branch 'master' into fix-login-failure
|
2018-03-12 12:41:45 +09:00 |
|
Vidalee
|
6d9e78a3a3
|
Review changes
|
2018-03-11 22:40:49 +01:00 |
|
Vidalee
|
eed0f3a1de
|
Added setting to not hide the first object in Hidden mod
|
2018-03-11 21:02:14 +01:00 |
|
TocoToucan
|
e6c22e2287
|
Taking screenshot support initial commit
|
2018-03-10 21:59:20 +03:00 |
|
Dean Herbert
|
9233266fe1
|
Fix login failure for users with no country rank
Closes #2148.
|
2018-03-11 00:44:16 +09:00 |
|
Dean Herbert
|
3b56999118
|
Add drawable to display (and update) relative dates
|
2018-03-08 12:58:16 +09:00 |
|
naoey
|
983cefbe40
|
Add VisualTest.
|
2018-03-07 19:08:26 +05:30 |
|
Dean Herbert
|
f78538fea8
|
Merge branch 'master' into user-profile-recent
|
2018-03-07 19:41:52 +09:00 |
|
Dean Herbert
|
a71e5ce19c
|
Tidy up
|
2018-03-07 14:54:54 +09:00 |
|
Dean Herbert
|
4094ffbddd
|
Remove unnecessary comment
|
2018-03-07 14:54:15 +09:00 |
|
Dean Herbert
|
96ea42d3ba
|
Ensure initial value is set even if that value is zero
|
2018-03-07 14:51:34 +09:00 |
|
Dean Herbert
|
05a13d4d39
|
Improve the way bindings are done
|
2018-03-07 14:50:50 +09:00 |
|
Dean Herbert
|
51a9dd038e
|
Add default bindable values
|
2018-03-07 14:38:41 +09:00 |
|
Dean Herbert
|
e2f9e237e8
|
Use GradientHorizontal helper function
|
2018-03-07 14:07:04 +09:00 |
|
Dean Herbert
|
c176e309e1
|
Merge branch 'master' into volume-control
|
2018-03-07 14:03:09 +09:00 |
|
smoogipoo
|
78d73d4c11
|
Additional fixes for flow ordering after framework changes
|
2018-03-06 17:20:58 +09:00 |
|
naoey
|
9669c5aee3
|
Make locally used things local and rename method.
|
2018-03-06 09:33:15 +05:30 |
|
jorolf
|
ec013dbee8
|
remove blank line and try to get test case working
|
2018-03-03 21:55:19 +01:00 |
|
jorolf
|
1cda58fe29
|
another blank line
|
2018-03-03 19:51:11 +01:00 |
|
jorolf
|
9293ec635a
|
add license headers and remove blank line
|
2018-03-03 19:49:38 +01:00 |
|
jorolf
|
8e0a524c4d
|
change colours
|
2018-03-03 19:31:29 +01:00 |
|
jorolf
|
ef63366d91
|
simplify VolumeMeter
|
2018-03-03 19:25:34 +01:00 |
|
jorolf
|
3a420ba826
|
add the volume overlay
|
2018-03-03 19:08:35 +01:00 |
|
jorolf
|
bd75422d88
|
Merge branch 'master' of git://github.com/ppy/osu into volume-control
|
2018-03-03 14:10:50 +01:00 |
|
jorolf
|
46dfb761c5
|
basic volume meter and testcase
|
2018-02-28 16:14:52 +01:00 |
|
Dean Herbert
|
eacb9ba743
|
Merge branch 'master' into user-profile-recent
|
2018-02-28 23:49:33 +09:00 |
|
naoey
|
2e535afb84
|
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
|
2018-02-28 15:25:29 +05:30 |
|
naoey
|
62913163e0
|
Fix long recent activity text overlapping timestamp.
- Also remove unnecessary fallback from absolute URL helper
|
2018-02-27 21:21:53 +05:30 |
|
Dean Herbert
|
034875be47
|
Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
|
2018-02-27 20:45:32 +09:00 |
|
naoey
|
a77d1eedae
|
Fix achievements parsing and add badges to recent activity.
|
2018-02-26 13:08:12 +05:30 |
|