smoogipoo
|
bfbe00e6ec
|
Remove multiple caching
|
2018-08-08 15:38:09 +09:00 |
|
Dean Herbert
|
4453b5faca
|
Cache mods at PlaySongSelect
|
2018-08-08 12:43:08 +09:00 |
|
Dean Herbert
|
4cb7063801
|
Add automated testing of mod preservation/removal
|
2018-08-07 16:45:18 +09:00 |
|
Dean Herbert
|
7b8bd7f21c
|
Fix mod selection not restoring when re-entering song select
|
2018-08-07 14:49:44 +09:00 |
|
miterosan
|
cc640893c2
|
Merge branch 'master' into Private_Messages
|
2018-08-04 00:33:46 +02:00 |
|
Dean Herbert
|
2ea90ef98a
|
Add sentry logging
|
2018-08-03 19:25:55 +09:00 |
|
miterosan
|
b1e9a4fd24
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
|
2018-07-29 23:28:34 +02:00 |
|
Dean Herbert
|
b7de922896
|
Merge branch 'master' into open-downloaded-beatmas
|
2018-07-28 12:44:34 +09:00 |
|
smoogipoo
|
464333cf0b
|
Merge remote-tracking branch 'origin/master'
|
2018-07-26 21:28:31 +09:00 |
|
miterosan
|
9f43e0c900
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
|
2018-07-23 15:45:54 +02:00 |
|
Dean Herbert
|
f1c3fbe644
|
Improve integrity of song select bind/change logic
|
2018-07-18 13:18:50 +09:00 |
|
Dean Herbert
|
ac35e8bd99
|
Remove redundant empty statement
|
2018-07-13 21:27:09 +09:00 |
|
Dean Herbert
|
6d8923a37c
|
Use better logic
|
2018-07-13 21:08:41 +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
|
96eb44425b
|
Fix informational overlays not hiding when user toggles other overlay views
Closes #3014.
|
2018-07-13 20:34:41 +09:00 |
|
Dean Herbert
|
fbc5250bf1
|
Update framework
|
2018-07-11 17:12:01 +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 |
|
miterosan
|
c56a4ea893
|
Merge branch 'master' into Private_Messages
|
2018-07-08 19:29:33 +02:00 |
|
Dean Herbert
|
e5001b84bd
|
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
|
2018-07-05 21:04:19 +09:00 |
|
ekrctb
|
bbceac6cda
|
Apply renaming of wheel -> scroll
|
2018-07-05 16:50:04 +09:00 |
|
Jacob Odgård Tørring
|
9248340df8
|
Merge branch 'master' into master
|
2018-07-04 20:51:05 +02:00 |
|
miterosan
|
621f4218a3
|
Merge branch 'master' into Private_Messages
|
2018-06-30 16:17:56 +02:00 |
|
Dean Herbert
|
182ac80881
|
Cache also as IBindable
|
2018-06-29 19:25:28 +09: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 |
|
Dean Herbert
|
b0a1b25983
|
Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
|
2018-06-26 16:32:32 +09:00 |
|
miterosan
|
6049303c40
|
Merge branch 'master' into Private_Messages
|
2018-06-23 20:44:43 +02: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
|
285062d93e
|
Merge branch 'master' into master
|
2018-06-21 11:40:37 +09:00 |
|
miterosan
|
cd0fe6a09e
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
|
2018-06-17 14:15:14 +02:00 |
|
Dean Herbert
|
55921efffb
|
Rewrite much state logic
|
2018-06-06 16:17:51 +09:00 |
|
Dean Herbert
|
9e25e02696
|
Ensure notifications don't appear during UserTriggered mode
Closes #2640.
|
2018-06-06 15:50:24 +09:00 |
|
Dean Herbert
|
d1fd09ed47
|
Rename variables
|
2018-06-06 15:49:27 +09:00 |
|
Dean Herbert
|
49a683e386
|
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
|
2018-05-31 14:50:20 +09:00 |
|
Aergwyn
|
2b3a630270
|
add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
|
2018-05-28 13:43:47 +02:00 |
|
HoutarouOreki
|
e2d840c2de
|
Rename CursorOverrideContainer to MenuCursorContainer
|
2018-05-25 21:13:40 +02:00 |
|
Aergwyn
|
b7e3ea348b
|
expose two Bindables with split logic instead of one with mixed logic
|
2018-05-21 15:53:55 +02:00 |
|
Aergwyn
|
1482bca147
|
Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
|
2018-05-21 09:42:29 +02:00 |
|
Jacob Odgård Tørring
|
5e0bbe7d0a
|
Merge branch 'master' into master
|
2018-05-18 10:19:16 +02:00 |
|
Jacob Odgård Tørring
|
a7e7c3a74a
|
Enables/Disables seek and Play/Resume on call to beatmapDisabledChanged
|
2018-05-12 11:55:52 +02:00 |
|
Jacob Odgård Tørring
|
d54a7295f6
|
Adds DisableSeek property to MusicController
|
2018-05-10 13:20:04 +02:00 |
|
miterosan
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
smoogipoo
|
482ae2db87
|
Unify naming
|
2018-05-02 19:42:03 +09:00 |
|
smoogipoo
|
d4ada3000c
|
Add keybind to disable mouse buttons
|
2018-05-02 19:37:47 +09:00 |
|
tgi74000
|
f41006def7
|
Set game ruleset to the score ruleset
|
2018-04-24 21:17:04 +02:00 |
|
miterosan
|
3b68dda23e
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-18 20:55:12 +02: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
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09:00 |
|
tgi74000
|
3454ec1ca3
|
Set Value instead of BindTo
|
2018-04-15 20:23:57 +02:00 |
|
tgi74000
|
4c08aa3dfb
|
Merge remote-tracking branch 'upstream/master'
|
2018-04-15 20:22:16 +02:00 |
|
Dean Herbert
|
2eefe722f3
|
Move cache to a slightly more familiar place and add comment
|
2018-04-16 00:38:32 +09:00 |
|
Dean Herbert
|
c9615f837a
|
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
|
2018-04-16 00:20:06 +09:00 |
|
miterosan
|
5bfb386226
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-14 13:31:03 +02:00 |
|
tgi74000
|
b23b0a445b
|
Add support for replay mods
|
2018-04-13 15:41:35 +02: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 |
|
smoogipoo
|
cd594ce12b
|
BDL cache screenshot manager
|
2018-04-13 20:46:01 +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
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
smoogipoo
|
2e5bbe7074
|
Don't expose CursorOverrideContainer via DI + internalise access
|
2018-04-13 17:36:38 +09:00 |
|
TocoToucan
|
7c3441e2d0
|
ActiveInputHandlers -> IgnoredInputHandler
|
2018-04-12 17:06:35 +03:00 |
|
miterosan
|
a48ccb5603
|
Implement Private chat
|
2018-04-08 22:12:57 +02:00 |
|
miterosan
|
a70b329155
|
Split drawing and business logic of ChatOverlay
|
2018-04-08 18:21:48 +02:00 |
|
Dean Herbert
|
421e9e0641
|
Add xmldoc to some high-level classes to explain their separation
|
2018-04-08 12:58:34 +09:00 |
|
naoey
|
c304c1eecf
|
Make LinkFlowContainer handle beatmap id lookup in game.
|
2018-04-04 21:23:51 +05:30 |
|
Dean Herbert
|
1d3c9098b8
|
Load component asynchronously
|
2018-03-22 21:42:57 +09:00 |
|
Dean Herbert
|
74191e1b73
|
Merge remote-tracking branch 'upstream/master' into take_screenshot
|
2018-03-22 20:49:17 +09:00 |
|
Dean Herbert
|
e5f83530b8
|
Only allow settings or notifications to be visible at once
Resolves #2273.
|
2018-03-22 19:49:31 +09:00 |
|
TocoToucan
|
245200d3ee
|
Add simple screenshot notification
|
2018-03-16 21:25:00 +03:00 |
|
TocoToucan
|
604e725f3f
|
Remove redundant code
|
2018-03-16 20:42:05 +03:00 |
|
TocoToucan
|
5a1af062d3
|
Handle GlobalAction.TakeScreenshot in ScreenshotManager
|
2018-03-14 22:55:24 +03:00 |
|
TocoToucan
|
0e69ab1615
|
Introduce ScreenshotManager class
|
2018-03-14 00:17:12 +03:00 |
|
TocoToucan
|
e6c22e2287
|
Taking screenshot support initial commit
|
2018-03-10 21:59:20 +03:00 |
|
Dean Herbert
|
f78538fea8
|
Merge branch 'master' into user-profile-recent
|
2018-03-07 19:41:52 +09:00 |
|
Dean Herbert
|
fac4cd6a32
|
Move to overlayContent
|
2018-03-07 14:20:47 +09:00 |
|
jorolf
|
3a420ba826
|
add the volume overlay
|
2018-03-03 19:08:35 +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 |
|
Dean Herbert
|
d2f98642a1
|
Merge branch 'master' into confine-mode-reset
|
2018-02-26 20:59:53 +09:00 |
|
Dean Herbert
|
e9c5834387
|
Add query method for now
|
2018-02-23 13:26:01 +09:00 |
|
Dean Herbert
|
402d71a8d9
|
Add user skin setting storage
|
2018-02-22 16:29:05 +09:00 |
|
Dean Herbert
|
4c14b32783
|
Add basic skin database model layout and importing
|
2018-02-22 15:46:11 +09:00 |
|
Dean Herbert
|
c84ded258f
|
Reset mouse confine mode on input setting reset hotkey
|
2018-02-22 10:08:56 +09:00 |
|
Dean Herbert
|
a0a65abcac
|
Crentalise all import logic
|
2018-02-15 14:22:39 +09:00 |
|
Dan Balasescu
|
0589708da5
|
Merge branch 'master' into inactive-volume-duck
|
2018-02-01 16:21:33 +09:00 |
|
Dean Herbert
|
cdf4d9b033
|
Remove empty line
|
2018-01-31 18:33:18 +09:00 |
|
Dean Herbert
|
335f0d577c
|
Add the ability to duck volume when the game is inactive
|
2018-01-31 18:16:55 +09:00 |
|
Dean Herbert
|
28b67e3d77
|
Merge branch 'master' into url-parsing-support
|
2018-01-30 17:47:55 +09:00 |
|
Dan Balasescu
|
2bae22999d
|
Merge branch 'master' into global-mod-binding
|
2018-01-29 15:18:11 +09:00 |
|
Dean Herbert
|
6e0cb1adb3
|
Remove redundant arguments
|
2018-01-29 15:05:07 +09:00 |
|
Dean Herbert
|
a5b0d51205
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-01-27 14:06:58 +09:00 |
|
Dean Herbert
|
7852015db3
|
Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.
Alternative to #1968.
Closes #1961.
|
2018-01-26 19:32:57 +09:00 |
|
smoogipoo
|
9ac035f3d5
|
Merge branch 'bdl-cache-changes' into ruleset-configs
|
2018-01-22 13:11:45 +09:00 |
|
smoogipoo
|
b4e1872322
|
osu!-side changes in-line with framework BDL cache changes
|
2018-01-22 12:56:30 +09:00 |
|
smoogipoo
|
7910b47868
|
Move ConfigManager registration/dependency injection to RulesetContainer
|
2018-01-18 17:00:23 +09:00 |
|
Dean Herbert
|
73d69e2fd9
|
Add more xmldoc
|
2018-01-17 20:32:26 +09:00 |
|
Dean Herbert
|
38c5434b82
|
Remove placeholder methods in OsuGame
Let's add these when they can actually be implemented.
|
2018-01-17 20:32:20 +09:00 |
|
Dean Herbert
|
3892965894
|
Remove unnecessary region and make methods public
|
2018-01-17 19:45:10 +09:00 |
|
Dean Herbert
|
54b0f4b912
|
Merge branch 'master' into url-parsing-support
|
2018-01-17 16:16:55 +09:00 |
|
smoogipoo
|
0459f0a069
|
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
|
2018-01-16 13:40:02 +09:00 |
|
smoogipoo
|
43f8a8e8c5
|
Rename OsuCursorVisualiser -> CursorOverrideContainer
|
2018-01-15 14:00:13 +09:00 |
|
smoogipoo
|
78441c05cb
|
OsuCursorContainer -> OsuCursorVisualiser
|
2018-01-12 19:45:09 +09:00 |
|
smoogipoo
|
620e125fad
|
Fix cursor being displayed on intro/disclaimer
|
2018-01-12 19:34:55 +09:00 |
|
smoogipoo
|
512e4d2c9f
|
Rewrite the way that cursor overrides are done game-wide
|
2018-01-12 18:13:17 +09:00 |
|
FreezyLemon
|
3bf9901dd2
|
Fixed bugs and added tests
|
2018-01-09 16:11:45 +01:00 |
|
Dean Herbert
|
b035a92bda
|
Merge branch 'master' into url-parsing-support
|
2018-01-09 14:28:20 +09:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dean Herbert
|
faf1181fc3
|
Merge branch 'master' into url-parsing-support
|
2018-01-02 17:51:50 +09:00 |
|
FreezyLemon
|
e7721d71f3
|
Changed chat link implementation according to review
|
2017-12-31 00:51:47 +01:00 |
|
Dean Herbert
|
58b0c9d56c
|
Dim screen when overlay has focus
|
2017-12-30 20:45:45 +09:00 |
|
Dean Herbert
|
7a0662da4b
|
Fix regression during merges
|
2017-12-28 00:38:50 +09:00 |
|
Dan Balasescu
|
3bfa6bd9fd
|
Merge branch 'master' into better-notification-delays
|
2017-12-27 23:26:57 +09:00 |
|
Dean Herbert
|
ab6c93fba4
|
Merge branch 'master' into notification-verbosity
|
2017-12-26 16:14:24 +09:00 |
|
Dean Herbert
|
3524ad3dc2
|
Merge remote-tracking branch 'upstream/master' into better-notification-delays
|
2017-12-26 16:10:57 +09:00 |
|
Dean Herbert
|
f737a64189
|
Remove ScreenChanged
|
2017-12-26 16:09:40 +09:00 |
|
Dean Herbert
|
c15b2382a2
|
Remove unused variable
|
2017-12-26 15:56:32 +09:00 |
|
FreezyLemon
|
025d3941a2
|
Fixed problems introduced by the merge
|
2017-12-25 19:43:35 +01:00 |
|
FreezyLemon
|
a30448095e
|
Merge branch 'master' into url-parsing-support
|
2017-12-25 19:12:23 +01:00 |
|
Dean Herbert
|
d8f0844742
|
Fix null reference in release builds
Intro may not be initialised yet
|
2017-12-26 02:51:53 +09:00 |
|
Dean Herbert
|
71a94d6b44
|
Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
|
2017-12-25 20:53:23 +09:00 |
|
Dean Herbert
|
96e4518e60
|
Add thread safety
|
2017-12-25 18:22:58 +09:00 |
|
Dean Herbert
|
320a6b0480
|
Reduce notification output when exceptions are encountered
|
2017-12-25 18:20:52 +09:00 |
|
Aergwyn
|
68a00235b9
|
simplify offset calculation for background
|
2017-12-24 14:32:56 +01:00 |
|
Dean Herbert
|
7cbf271645
|
Merge branch 'master' into add-nofitication-overlay-push-bg
|
2017-12-24 21:52:14 +09:00 |
|
Aergwyn
|
5b22c5a453
|
reduce code duplication to move intro background
|
2017-12-24 10:28:37 +01:00 |
|
Aergwyn
|
2ffc479411
|
let NotificationOverlay move the background
|
2017-12-23 14:56:23 +01:00 |
|
Aergwyn
|
9bb0cda525
|
fix NotificationOverlay going out of bounds at the bottom
also fixes the overlap with the Toolbar at the top
|
2017-12-23 14:33:43 +01:00 |
|
FreezyLemon
|
908553ffaf
|
Added parameter for LoadMultiplayerLobby (CI warning for unused int)
|
2017-12-07 19:38:03 +01:00 |
|
FreezyLemon
|
94eb853d3d
|
Added centralised handling for some chat links
|
2017-12-06 16:41:57 +01:00 |
|
Miterosan
|
b3b1f2018e
|
Fix osu crashing if a invalid gamerule is given in the game.ini
|
2017-11-21 15:13:00 +01:00 |
|
Dean Herbert
|
8a407a68b3
|
Ensure only one information overlay is open at once
|
2017-11-15 18:49:06 +09:00 |
|
Dean Herbert
|
542c6501a7
|
Fix VolumeControl and OnScreenDisplay being added to the wrong container
|
2017-10-24 13:10:17 +09:00 |
|
Dean Herbert
|
635f26badc
|
Remove unnecessary using
|
2017-10-24 11:59:57 +09:00 |
|
Dean Herbert
|
9ec870a821
|
Add comment pertaining to why Schedule() is required
|
2017-10-24 11:50:18 +09:00 |
|
Dean Herbert
|
e98bfec644
|
Remove Thread.Sleep and tidy up new method
|
2017-10-24 11:40:38 +09:00 |
|
Dean Herbert
|
777cdcbdc1
|
Load even more components async
|
2017-10-24 10:08:42 +09:00 |
|
Dean Herbert
|
9b7d569a65
|
Add a single-file loading sequence for main components
This stops aync loading from getting overloaded with tasks, which was happening previously.
|
2017-10-24 10:08:42 +09:00 |
|
Dean Herbert
|
15373c71b6
|
Allow scores to open beatmap overlay
Reshuffles depth of beatmap and profile overlays for now.
|
2017-10-13 20:09:03 +09:00 |
|
EVAST9919
|
92c3d722b4
|
Show mapper's profile when clicking on avatar in BeatmapSetOverlay
|
2017-09-30 05:41:32 +03:00 |
|
Dean Herbert
|
c2bb3ea7bc
|
Add minimal viable implementation of BeatmapSetOver in game
|
2017-09-25 17:58:03 +08:00 |
|
Dean Herbert
|
80c35801a6
|
Hide all overlays when home button is pressed
|
2017-09-08 16:18:57 +09:00 |
|
smoogipooo
|
57678a13d9
|
Update in-line with framework changes.
|
2017-09-04 09:32:35 +09:00 |
|
Dean Herbert
|
72a16e31dd
|
Remove unnecessary old code
|
2017-08-25 13:07:10 +09:00 |
|
Dean Herbert
|
2dd3e51373
|
Ensure other full-screen overlays are closed when direct is open (and vice-versa)
|
2017-08-25 10:51:28 +09:00 |
|
Dean Herbert
|
9adff5f697
|
Add osu!direct toggle to toolbar
|
2017-08-24 20:18:47 +09:00 |
|
Dean Herbert
|
9e96ee989d
|
Merge branch 'master' into volume-control-fixes
|
2017-08-22 18:59:02 +09:00 |
|
Dean Herbert
|
8f32fd28c9
|
Fix backwards conditional
|
2017-08-22 17:21:19 +09:00 |
|