Dean Herbert
|
ba89bfee0c
|
Define explicit method to add background
Also cleans up some redundant/misplaced comments.
|
2019-03-20 20:16:45 +09:00 |
|
Dean Herbert
|
8865d53992
|
Reword comment
|
2019-03-20 20:04:07 +09:00 |
|
David Zhao
|
2e9d823af4
|
Add comment regarding HandlePositionalInput
|
2019-03-20 19:59:54 +09:00 |
|
David Zhao
|
2ff7aa6c2e
|
Remove handle positional input
|
2019-03-20 19:49:37 +09:00 |
|
David Zhao
|
bc6e8ce7b4
|
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
|
2019-03-20 19:48:57 +09:00 |
|
David Zhao
|
8543e8c36f
|
Put loadcomplete next to other protected overrides
|
2019-03-20 19:42:39 +09:00 |
|
Dean Herbert
|
cda5bc28c8
|
Add proper comment
|
2019-03-20 19:41:20 +09:00 |
|
David Zhao
|
9013afe412
|
Query for input manager once
|
2019-03-20 19:35:40 +09:00 |
|
David Zhao
|
fbfef844de
|
Add test case for resuming PlayerLoader
|
2019-03-20 17:18:42 +09:00 |
|
David Zhao
|
a5916f995e
|
Use the previous conditional instead
|
2019-03-20 16:54:42 +09:00 |
|
David Zhao
|
e9034c8a30
|
Move blurring logic into Update instead
|
2019-03-20 16:50:47 +09:00 |
|
David Zhao
|
15637f9c4a
|
Rework instant blur logic such that updateVisuals doesn't need to be public
|
2019-03-20 14:17:35 +09:00 |
|
David Zhao
|
8cdfb1fd61
|
Remove BlurrableBackgroundScreen, rework tests
|
2019-03-14 16:09:17 +09:00 |
|
David Zhao
|
8714902349
|
Handle all blurring directly from background
|
2019-03-14 14:02:46 +09:00 |
|
David Zhao
|
de6d8fc637
|
Move user blurring into VIsualSettingsContainer
|
2019-03-13 18:25:22 +09:00 |
|
smoogipoo
|
c06dac5b1a
|
Remove null check (beatmap cannot be null)
|
2019-03-05 17:58:30 +09:00 |
|
smoogipoo
|
2fee7276ae
|
Combine creation + assignment
|
2019-03-05 17:58:05 +09:00 |
|
LeNitrous
|
cf51c8aa31
|
attempt to comply with appveyor
|
2019-03-01 19:10:32 +08:00 |
|
LeNitrous
|
4e081fe1fc
|
Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader
|
2019-03-01 18:41:41 +08:00 |
|
David Zhao
|
69b1c76dce
|
Actually implement blurring fix
|
2019-02-28 16:51:17 +09:00 |
|
David Zhao
|
d750023c52
|
Fix TestCasePlayerLoader not having a background stack
|
2019-02-25 22:05:49 +09:00 |
|
David Zhao
|
ab3fa91a2f
|
Merge branch 'master' into UserDimLogic
|
2019-02-22 20:38:10 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
David Zhao
|
ad5e81f0cd
|
Add test case for background preview, fix unit tests
|
2019-02-21 15:24:26 +09:00 |
|
Jamie Taylor
|
9b3f2fdd24
|
Change RelativePositionAxes default on osu! logo to be both
|
2019-02-20 19:34:55 +09:00 |
|
David Zhao
|
d703a9511a
|
Fix background dim previews
|
2019-02-20 17:20:45 +09:00 |
|
David Zhao
|
1bd1b6b099
|
Move user dim logic into UserDimContainer instead
|
2019-02-20 16:53:57 +09:00 |
|
smoogipoo
|
dbfa95b9e7
|
Made medium the default font weight
|
2019-02-20 16:52:36 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
David Zhao
|
9be25c3758
|
Fix unit tests
|
2019-02-18 16:00:59 +09:00 |
|
David Zhao
|
df148f8787
|
Fix background dim not being disabled on playerloader exit
|
2019-02-18 12:55:42 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
smoogipoo
|
bdaff27575
|
Fix nullref due to screens now being removed from parent
|
2019-01-31 15:02:07 +09:00 |
|
smoogipoo
|
91302ea0bc
|
Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-01-29 21:21:36 +09:00 |
|
smoogipoo
|
7b1c1f3728
|
Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
|
2019-01-28 15:42:06 +09:00 |
|
LeNitrous
|
a1ce7e9a95
|
add ModDisplay on PlayerLoader
|
2019-01-26 17:14:45 +08:00 |
|
smoogipoo
|
28f5c950ec
|
Fix player never completing load
|
2019-01-24 19:55:42 +09:00 |
|
smoogipoo
|
8ea7ec6445
|
Convert everything to use IScreen
|
2019-01-24 19:47:44 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
chrisny286
|
03e3247baf
|
replace FadeTo in PlayerLoader
didnt notice that interaction yet. yes this makes it neccessary.
|
2019-01-23 09:40:38 +01:00 |
|
Dean Herbert
|
8cf30bdb6a
|
Play with delegate
|
2018-12-26 22:16:35 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
smoogipoo
|
28f31540c4
|
Apply changes in-line with framework localisation changes
|
2018-09-19 14:07:46 +09:00 |
|
Dean Herbert
|
042e4e3966
|
Merge branch 'master' into add-loading-animation
|
2018-08-03 21:50:02 +09:00 |
|
Dean Herbert
|
b1afcf0e5d
|
Add loading animation to player loader to make it more obvious when loading is complete
|
2018-08-02 19:47:50 +09:00 |
|
Dean Herbert
|
4a11f2ec2a
|
Improve UX when adjusting visual settings at loading screen
|
2018-08-02 18:18:55 +09:00 |
|
ekrctb
|
ecc6d55380
|
Fix player loader not gets ready when multiple mouse button is down
|
2018-08-01 16:20:29 +09:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
Dean Herbert
|
5872b61988
|
Fix potential double-disposal of player if PlayerLoader is finalised
|
2018-05-30 15:48:26 +09:00 |
|
smoogipoo
|
a3470f9ec3
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
|
2018-05-28 18:01:15 +09:00 |
|
Dean Herbert
|
28aa6faef9
|
Merge branch 'master' into player_loader_input_toggles
|
2018-05-25 18:38:12 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
Roman Kapustin
|
30956b64aa
|
Do not change Margin for player settings groups on the PlayerLoader screen
|
2018-05-21 18:57:01 +03: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 |
|
Roman Kapustin
|
ccf82cacb0
|
Show InputSettings on the PlayerLoader screen
|
2018-05-09 17:31:52 +03:00 |
|
Dean Herbert
|
8bf25542cb
|
Add PlayerLoader TestCase and fix dummy beatmap load procedure
|
2018-04-20 17:30:27 +09:00 |
|
Dean Herbert
|
de85436534
|
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
|
2018-04-20 16:52:58 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Joehu
|
128446e51d
|
Remove composer from player loader
|
2018-04-12 16:46:46 -07:00 |
|
Dean Herbert
|
31ade986a7
|
Scren async changes in line with framework changes
Makes editor not stutter on load, amongst other screens.
|
2018-03-30 14:58:11 +09:00 |
|
Dean Herbert
|
b56eee1927
|
Fix background loaded player never being disposed if early exit occurs
|
2018-03-23 15:04:40 +09:00 |
|
Dean Herbert
|
917334a39a
|
Move cancel code to exit paths for screen
|
2018-03-22 13:01:40 +09:00 |
|
Dean Herbert
|
8f71d53c17
|
Fix retry not allowing continuing beyond PlayerLoader
Resolves #2265.
|
2018-03-22 02:10:31 +09:00 |
|
Dean Herbert
|
ea649f9650
|
Avoid scheduling during non-current screen
|
2018-03-14 12:09:19 +09:00 |
|
Dean Herbert
|
ef8d595914
|
Apply formatting changes
|
2018-03-14 11:44:19 +09:00 |
|
Dean Herbert
|
c3a3d76b88
|
Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging
|
2018-03-14 11:43:33 +09:00 |
|
Dean Herbert
|
94ed4ab01b
|
Add debouncing to player loading
Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load
|
2018-03-08 20:28:55 +09:00 |
|
Dean Herbert
|
d3e91024a7
|
Block player enter when a drag initiates from an overlaying container
|
2018-03-08 18:16:23 +09:00 |
|
TocoToucan
|
2cb197d0c4
|
Replace ConfigureBackgroundUpdate with OnEntering
|
2018-03-08 11:35:00 +03:00 |
|
Dean Herbert
|
9760f30ce9
|
Tidy things up to make more sense
|
2018-02-16 12:08:36 +09:00 |
|
TocoToucan
|
c57e8785e2
|
Move all storyboard loading to Player itself
|
2018-02-15 23:57:53 +03:00 |
|
TocoToucan
|
a860dd7208
|
Preview visual settings at the “loading” screen
|
2018-02-09 00:06:24 +03:00 |
|
TocoToucan
|
d437c1d7ec
|
Introduce PlayerBase class
|
2018-02-08 23:28:42 +03:00 |
|
TocoToucan
|
ce4122b3c4
|
Display visual settings overlay on PlayerLoader screen
|
2018-01-26 23:29:54 +03:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dan Balasescu
|
3bfa6bd9fd
|
Merge branch 'master' into better-notification-delays
|
2017-12-27 23:26:57 +09:00 |
|
Dean Herbert
|
d17f6cb564
|
Fix crash when starting play mode with no beatmap
Closes #1767
|
2017-12-27 11:46:44 +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
|
49a5af60e2
|
Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
|
2017-11-13 18:43:16 +09:00 |
|
Dean Herbert
|
4874371dbf
|
Rename methods back
|
2017-11-09 17:38:20 +09:00 |
|
Dean Herbert
|
c2d4a213b1
|
Rename logo-related methods
|
2017-11-08 16:34:03 +09:00 |
|
Dean Herbert
|
9b2d41f4eb
|
Fix quick retry looking bad
|
2017-11-02 21:52:01 +09:00 |
|
Dean Herbert
|
b8b05fe8d2
|
Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
|
2017-11-02 20:38:02 +09:00 |
|
Dean Herbert
|
6fa02ce9bb
|
Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
|
2017-11-01 17:10:54 +09:00 |
|
Dean Herbert
|
cd722e4abb
|
Fix beatmap author being stored in two different places
|
2017-10-14 11:39:55 +09:00 |
|
Damnae
|
010a6ec252
|
Fix player loading.
|
2017-09-15 09:06:27 +02:00 |
|
Dean Herbert
|
6ea22cc6c7
|
Add missing return to PlayerLoader
was being a bit too eager previously
|
2017-09-15 08:15:23 +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
|
c4619f614a
|
Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
# osu-framework
|
2017-07-19 19:15:51 +02:00 |
|
Dean Herbert
|
d0dea33faa
|
Make Beatmap (bindable) non-nullable.
|
2017-07-19 15:16:53 +09: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 |
|
Thomas Müller
|
a5e610a7ba
|
Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
|
2017-07-14 19:18:12 +03:00 |
|
Dean Herbert
|
9bbcc0526d
|
Disable beatmap changes in specified screens
|
2017-07-11 18:39:10 +09:00 |
|
Thomas Müller
|
40225238d9
|
Set RelativeSizeAxes for updated FillMode behavior
|
2017-06-28 12:24:23 +03:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
EVAST9919
|
0386e96573
|
applied requested changes
|
2017-05-01 05:38:51 +03:00 |
|
EVAST9919
|
668262ed06
|
Applied requested changes
|
2017-05-01 04:53:46 +03:00 |
|
EVAST9919
|
e9094bac51
|
Added suggested changes
|
2017-04-30 17:05:00 +03:00 |
|
EVAST9919
|
a8c918f7bf
|
Removed empty line
|
2017-04-28 21:12:48 +03:00 |
|
EVAST9919
|
d5c56aab7a
|
Initial commit
|
2017-04-28 21:05:00 +03:00 |
|
Dean Herbert
|
5aa90df819
|
Allow OsuScreens to decide whether ruleset switching should be allowed.
Tidies up ToolbarModeSelector a lot by using DI.
|
2017-04-21 16:03:59 +09:00 |
|
Dean Herbert
|
5ba85818db
|
Combine push logic and adjust transitions a bit more.
|
2017-04-18 17:07:02 +09:00 |
|
Dean Herbert
|
ddff26d167
|
Show metadata when loading between retries.
Also speeds up the display a bit.
|
2017-04-18 17:00:58 +09:00 |
|
Dean Herbert
|
edd71c0560
|
Tidy up and comment PlayerLoader logic.
|
2017-04-18 16:56:01 +09:00 |
|
ocboogie
|
2bd89e922f
|
Removed unneeded newPlayer
|
2017-04-17 23:48:21 -07:00 |
|
ocboogie
|
c0f4cbcba6
|
Added back PlayerLoader overlays
|
2017-04-17 23:36:11 -07:00 |
|
ocboogie
|
aa466d0e84
|
PlayerLoader creates a new instance of the Player class on Restart
|
2017-04-17 21:32:38 -07:00 |
|
Dean Herbert
|
6f1fff4ee7
|
Update async load usage to new style.
|
2017-04-02 15:56:12 +09:00 |
|
Dean Herbert
|
f7dc7e9bb9
|
Update references.
|
2017-03-28 21:26:20 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
Dean Herbert
|
d7497330b2
|
Reduce warning/suggestion count to zero.
|
2017-03-09 15:52:40 +09:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
Thomas Müller
|
4d28696479
|
FlowDirection -> FillDirection
|
2017-03-01 20:15:38 +01:00 |
|
Thomas Müller
|
9c853b0465
|
Update framewörk
|
2017-03-01 19:33:01 +01:00 |
|
Thomas Müller
|
d46e68b36b
|
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
|
2017-03-01 18:05:58 +01:00 |
|
default0
|
03889e6ca6
|
Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
|
2017-02-27 16:55:55 +01:00 |
|
Dean Herbert
|
68dd3c02aa
|
Fix failing testcase (nullref).
|
2017-02-27 17:05:12 +09:00 |
|
default0
|
8d91519d59
|
Update usage of FlowContainer and its subclasses
|
2017-02-26 21:32:43 +01:00 |
|
Dean Herbert
|
bc231c6bd4
|
Remove dispose which is no longer necessary.
|
2017-02-26 22:08:29 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
17a28cd3b6
|
Don't push Player if we aren't still current.
|
2017-02-25 11:46:19 +09:00 |
|
Dean Herbert
|
c4fbfb5a8f
|
Update comment with new knowledge.
|
2017-02-24 21:46:34 +09:00 |
|
Dean Herbert
|
5096f6b83d
|
Fix memory leak from Player's InputManager.
|
2017-02-24 21:01:05 +09:00 |
|
Dean Herbert
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09:00 |
|
Thomas Müller
|
2689de0c0c
|
Update framework and add "Async" suffix to asynchronous methods
|
2017-02-23 22:32:10 +01:00 |
|
Thomas Müller
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +01:00 |
|
Dean Herbert
|
aef0eb49a1
|
Add loading screen.
|
2017-02-22 21:53:59 +09:00 |
|