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
Dean Herbert
09dd0cabd6
Move beatmap/ruleset change restrictions to OsuGame
...
Allows test cases to more freely exist
2017-08-22 15:59:32 +09:00
Dean Herbert
18645fcf29
Update volume control logic to use key bindings
...
Fixes them not working at all, too.
2017-08-22 14:48:04 +09:00
Dean Herbert
a19fc28cff
Visually improve settings transitions and back button
2017-08-17 17:31:14 +09:00
Dean Herbert
66fa84a451
Make settings more modular
2017-08-14 13:09:59 +09:00
Dean Herbert
99458aab48
Propagate framework updates
2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
a93a92a2bb
Remove GlobalHotkeys
2017-08-10 19:52:45 +09:00
Dean Herbert
798fff00b2
Remove shortcomings, remove InputState.Data usage, make everything amazing
...
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
c82db54fb5
Rename OsuAction to GlobalAction
2017-08-10 17:22:08 +09:00
Dean Herbert
d9e36237c7
Move all OsuGame events to OsuAction
2017-08-10 16:45:10 +09:00
Dean Herbert
720bd38d8e
Fix CI issues
2017-08-09 17:30:37 +09:00
Dean Herbert
34b12fbfa4
Add global actions; improve default assignment
2017-08-09 17:10:32 +09:00
Dean Herbert
941f3f0934
Tidy up osu-stable import process
...
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Alex Park (박상희)
bb3a8a29ea
Hide Notification when playing osu
...
Hide Notification Overlay when playing osu
2017-08-01 11:31:11 +09:00
Dean Herbert
df5094c0d4
Rework how notifications are distributed
2017-07-31 18:03:55 +09:00
Dean Herbert
f705589bf2
Rename NotificationManager to NotificationOverlay
2017-07-28 15:03:42 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
750fc0db0e
Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
2017-07-22 11:34:27 +02:00
Thomas Müller
e469a114a6
Update dependency caching according to framework
2017-07-21 19:03:43 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Dean Herbert
ae58e18178
Reorder code based on depth (and avoid possible conflicts)
2017-07-18 10:41:52 +09:00
Jorolf
689866f5dd
minor improvements
2017-07-17 20:25:57 +02:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Huo Yaoyuan
6cf36da389
Merge branch 'master' into profile
2017-07-14 22:52:19 +08:00
Dean Herbert
939e167d6a
Correct offset settings vertically based on toolbar visibility
2017-07-13 17:09:12 +09:00
Dean Herbert
3a4150c6c3
Merge remote-tracking branch 'upstream/master' into profile
...
# Conflicts:
# osu.Game/Graphics/Containers/SectionsContainer.cs
2017-07-13 13:44:21 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Huo Yaoyuan
35bec7ddc0
Hide profile when not showing overlays.
2017-06-22 21:43:58 +08:00
Huo Yaoyuan
3883f4a746
Show profile when click on user panel.
2017-06-16 16:23:20 +08:00
Huo Yaoyuan
13d9f3b9bb
Move namespace and setup for DI.
2017-06-15 17:53:12 +08:00
Dean Herbert
1b0e96f411
Fix some discrepancies when changing settings
2017-06-08 20:57:21 +09:00
Dean Herbert
028364b2d9
Add on-screen display support for RawInput and CursorSensitivity
...
Also allows resetting both at once using Ctrl+Alt+R.
- Depends on https://github.com/ppy/osu-framework/pull/807
2017-06-08 17:58:57 +09:00
Dean Herbert
bf45155ed5
Merge branch 'master' into master
2017-06-08 12:55:25 +09:00
John Neijzen
9b0e1c26a3
Clean Up Code
2017-06-07 19:53:37 +08:00
Dean Herbert
97db4856fc
Add toolbar toggle button
...
Also ensure chat is hidden when social is displayed and vice-versa.
2017-06-07 20:15:58 +09:00
