Dean Herbert
3d61cde266
Correctly delay loading of PlaySongSelect-specific components
2017-09-01 18:22:38 +09:00
Dean Herbert
e8021c2b92
Move line inside if
2017-08-04 17:20:05 +09:00
Huo Yaoyuan
74facb32b4
Use removeAutoModOnResume as a field.
2017-08-04 15:34:11 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b
Pass input state in OnSelected.
2017-08-04 00:09:41 +08:00
Huo Yaoyuan
47b4ef5cd2
Handle control key with OnKeyUp/OnKeyDown.
2017-07-24 22:14:21 +08:00
Huo Yaoyuan
e0b1057b87
Merge branch 'master' into fixes
2017-07-24 20:50:33 +08:00
Dean Herbert
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
Dean Herbert
15eb6954da
Fix hitting down and enter at song select causing a hard-crash
...
Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
2017-07-20 11:50:52 +09:00
Dean Herbert
c8593a38c8
Remove incorrect looping reset behaviour
...
Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.
2017-07-19 15:55:16 +09:00
Dean Herbert
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Huo Yaoyuan
9cd895c249
Implement Ctrl+Enter in PlaySongSelect.
2017-07-18 15:55:21 +08:00
MrTheMake
4056338203
Remove unnecessary track starting
2017-05-21 21:35:49 +02:00
MrTheMake
0539584578
CI fix
2017-05-21 21:33:54 +02:00
MrTheMake
b543b1f9fc
Remove unnecessary restart
2017-05-21 21:20:59 +02:00
MrTheMake
6219b8e6dd
Fixed an error with looping
2017-05-21 20:27:41 +02:00
MrTheMake
9b87f5d8db
Reformating
2017-05-21 18:16:54 +02:00
MrTheMake
6d7f70d0ea
Fix CI warnings
2017-05-21 18:00:31 +02:00
MrTheMake
34653eb8c0
Fixed null references
2017-05-21 17:20:20 +02:00
MrTheMake
7db45cb58f
Moved the whole looping assignments inside PlaySongSelect
2017-05-21 17:09:56 +02:00
MrTheMake
ec213efc49
Trimmed whitespaces
2017-05-21 16:13:20 +02:00
MrTheMake
cc35cc281c
Fixed null reference in case there are no beatmaps
2017-05-21 16:10:10 +02:00
MrTheMake
48f4879157
Use the track's implemented looping algorithm to loop tracks in the song select screen
2017-05-21 15:57:41 +02:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
skettios
36dff94802
removed check if ModSelectOverlay is open
2017-05-05 18:16:48 -07:00
skettios
d129bd0c1f
Fix ModSelectOverlay accepting escape when it shouldn't
...
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
2017-05-05 17:03:24 -07:00
Dean Herbert
7d32cc85c8
Make leaderboard scores clickable.
2017-04-18 22:22:14 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting.
2017-03-23 19:35:46 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie.
2017-03-23 19:32:58 +09:00
Dean Herbert
644e9ae9d5
Increase padding to make flyte happy.
2017-03-23 16:36:52 +09:00
Dean Herbert
3ae7d0cb98
Better handle the passing of Beatmap and updating of scores.
...
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
2017-03-23 16:31:08 +09:00
DrabWeb
b8129526a4
Typo
2017-03-23 02:29:23 -03:00
Dean Herbert
e77229b34b
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 14:26:00 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5
Formatting
2017-03-23 01:35:55 -03:00
DrabWeb
677b8afc1f
Integration
2017-03-23 01:19:29 -03:00
Dean Herbert
8e5d83b857
Isolate leaderboard retrieval code into its own method.
2017-03-16 12:56:59 +09:00
Dean Herbert
1855f48997
Add cancellation support for API requests.
2017-03-15 18:07:26 +09:00
Dean Herbert
295f821025
Add leaderboard to song select.
2017-03-15 17:11:08 +09:00
Huo Yaoyuan
37ff1f3971
Control footer by virtual property.
2017-03-15 10:10:59 +08:00
Huo Yaoyuan
a8d15e616b
Remove parameter of OnSelected.
2017-03-14 22:22:23 +08:00
Huo Yaoyuan
b2dd9afcf3
Update editor workflow and make edit button works.
2017-03-14 22:18:40 +08:00
Huo Yaoyuan
f068f7c4bd
No footer in EditSongSelect.
2017-03-14 21:51:26 +08:00
Huo Yaoyuan
c939897a8a
Revert "Auto assign hotkeys for BeatmapOptionsButton."
...
This reverts commit beb0a8ff03
2017-03-14 21:13:57 +08:00
Huo Yaoyuan
beb0a8ff03
Auto assign hotkeys for BeatmapOptionsButton.
2017-03-14 20:50:43 +08:00
Huo Yaoyuan
35a60a8f7d
Use depth to arrange buttons.
2017-03-14 20:19:05 +08:00
Huo Yaoyuan
3871a350f8
Move BeatmapOptions buttons to derived class and simplify.
2017-03-14 19:38:21 +08:00
Huo Yaoyuan
c4e5eac35b
Move footer stuff to derived.
2017-03-14 18:38:06 +08:00
Huo Yaoyuan
c3a0549cdd
Move player specific stuff to derived PlaySongSelect.
2017-03-14 16:58:34 +08:00
Huo Yaoyuan
fae6afa9e3
Create basic SongSelect class.
2017-03-14 16:44:35 +08:00
Huo Yaoyuan
0198593697
Make BeatmapInfoWedge:OverlayContainer and unify transforms.
2017-03-14 16:29:20 +08:00
Huo Yaoyuan
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
Dean Herbert
9908c1905d
Add keyboard shortcuts at song select for mod/random/options.
2017-03-06 17:32:12 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support.
2017-03-06 14:52:37 +09:00
Dean Herbert
81cc27e104
Fix typo.
2017-03-06 10:06:25 +09:00
Dean Herbert
7afcac3660
Move PreferredPlayMode to WorkingBeatmap.
2017-03-05 17:45:40 +09:00
Dean Herbert
389635c7ed
Avoid panel state changes when performing a sort.
2017-03-04 22:05:16 +09:00
Dean Herbert
8f3621ca24
Make selectGroup a private method.
2017-03-04 22:05:02 +09:00
DrabWeb
9d75ab85e9
Put mod select over beatmap options
2017-03-03 04:19:03 -04:00
Seth
fde509ab1d
Merge branch 'master' into mod-overlay
2017-03-03 04:12:42 -04:00
Dean Herbert
b0ee728528
Remove full-screen background layer and add half-height holder.
...
Doesn't interact well with dialog popups. May add back later with complementing logic.
2017-03-03 16:11:23 +09:00
Seth
1891bdf51e
Merge branch 'master' into mod-overlay
2017-03-03 01:11:15 -04:00
Seth
2e74b4be60
Merge branch 'master' into beatmap-options
2017-03-03 00:52:45 -04:00
DrabWeb
7a4b9c5571
osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options
2017-03-02 21:20:30 -04:00
Dean Herbert
f9b87ad08c
Fix selection on entry to song select.
...
Also only shows sets with beatmaps for current play mode.
2017-03-02 22:02:32 +09:00
DrabWeb
b856fb5991
Implemented beatmap options overlay
2017-03-02 08:40:55 -04:00
Dean Herbert
e399d6c6d1
Use bindable for PlayMode.
2017-03-02 21:16:58 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
Dean Herbert
51950eef43
Merge branch 'master' into master
2017-03-02 18:06:31 +09:00
DrabWeb
6c680825ed
ModSections in Ruleset, fixed toolbar play mode changed not firing
2017-03-01 22:05:52 -04:00
DrabWeb
befdf68abe
Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
2017-03-01 18:41:00 -04:00
DrabWeb
d5d8352b62
Testing build
2017-02-28 17:09:31 -04:00
DrabWeb
570c95cb98
Merge https://github.com/ppy/osu into mod-overlay
2017-02-28 02:22:59 -04:00
DrabWeb
ce1798b8bc
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
2017-02-28 02:09:36 -04:00
DrabWeb
50d172be39
Added DialogManager(not wired up for desktop project yet)
2017-02-28 00:59:36 -04:00
DrabWeb
fbd9523596
Added beatmap delete dialog
2017-02-27 23:19:28 -04:00
Alex Amadori
8b336156f0
Merge remote-tracking branch 'upstream/master'
2017-02-27 14:55:44 +01:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Thomas Müller
f7d985fe18
Fix and refactor star difficulty calculation boilerplate
...
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
Alex Amadori
51b6075210
Merge remote-tracking branch 'upstream/master'
2017-02-24 16:54:37 +01:00
Alex Amadori
e2ae03e798
Merge with upstream/master
2017-02-24 16:54:27 +01:00
Dean Herbert
ea4639932c
Simplify event names.
2017-02-24 17:21:14 +09:00
Dean Herbert
958bf54c31
Add safe deletion support.
2017-02-24 17:08:13 +09:00
Dean Herbert
6c3bda18b6
Add beatmap deletion support.
...
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
2017-02-24 14:37:54 +09:00
Dean Herbert
3a89348413
Centralise access to WorkingBeatmaps.
...
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
2017-02-24 13:43:21 +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
Seth
b4b88712ad
Merge branch 'master' into mod-overlay
2017-02-23 08:00:24 -04:00
Dean Herbert
6701cd9016
Merge branch 'master' into general-fixes
2017-02-23 17:04:53 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
DrabWeb
99f1f88c75
Merge https://github.com/ppy/osu into mod-overlay
2017-02-22 12:35:55 -04:00
Dean Herbert
aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
Alex Amadori
6c161fb167
Merge remote-tracking branch 'upstream/master'
2017-02-21 18:15:46 +01:00
Thomas Müller
417f146386
Add difficulty calculation
...
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Alex Amadori
21cf96ec10
More sorting rookie mistakes
2017-02-18 16:23:13 +01:00
Alex Amadori
d92382c1aa
Merge remote-tracking branch 'upstream/master'
2017-02-18 15:18:26 +01:00
Alex Amadori
6bbbbd8f96
Implemented sorting in TestCasePlaySong
2017-02-18 15:11:40 +01:00
DrabWeb
006fb5502d
ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
2017-02-18 07:28:22 -04:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
Alex Amadori
7dcbefd50f
Implemented basic sorting logic
2017-02-17 17:41:53 +01:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
DrabWeb
9fc3726925
ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
2017-02-16 18:32:27 -04:00
DrabWeb
0a58fc62db
Added mod selection overlay
2017-02-16 16:05:03 -04:00
Dean Herbert
d230c3f9ac
Correct masking layers on song select.
2017-02-08 20:39:17 +09:00
Dean Herbert
050fa7fbe8
Adjust FilterControl to match design and give an absolute height.
2017-02-08 20:30:45 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better.
2017-02-08 20:30:45 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing.
2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Drew DeVault
437cc834eb
@Tom94 pointed out this problem
2017-02-02 12:23:06 -05:00
Dean Herbert
aec84ae725
Fix laggy animations, incorrect hiding logic.
2017-02-02 19:24:14 +09:00
Drew DeVault
2d691ca8d5
Use OnChange instead of OnCommit
...
OnCommit only gets fired when focus is lost
2017-02-01 19:12:24 -05:00
Drew DeVault
b1a55f6b5e
Use OnCommit instead of OnChange simplifies things
2017-01-31 19:48:33 -05:00
Drew DeVault
f740707712
Initialize previousFilter to string.Empty
2017-01-31 19:45:42 -05:00
Drew DeVault
35a1479fc1
Fix extra click sound effect
2017-01-31 19:37:00 -05:00
Drew DeVault
4597a765b8
Fix escape key to exit PlaySongSelect
...
This is less than ideal but is the least disruptive solution. The
InputManager itself holds Escape keypresses from getting to anything
else if something is focused.
2017-01-31 19:00:54 -05:00
Drew DeVault
5852657205
Refactor out Hidden
...
Also fixes a bug I didn't think about before
2017-01-30 22:35:09 -05:00
Drew DeVault
144a87a247
Fix focus interactions with search text box
2017-01-30 13:56:33 -05:00
Drew DeVault
fb431fd44e
&&=, unnecessary null check
2017-01-30 09:49:58 -05:00
Drew DeVault
9a2cba8520
Use null coalesce operator where appropriate
2017-01-30 09:48:21 -05:00
Drew DeVault
42a2285ef3
Make BeatmapGroup.Hidden more intelligent
2017-01-30 09:47:04 -05:00
Drew DeVault
0a81fdbd10
Update null background handling
2017-01-30 09:44:02 -05:00
Drew DeVault
c00a558cb7
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-30 09:35:14 -05:00
Dean Herbert
0272c4b559
Add StarDifficulty property and correct colouring of difficulty icons.
2017-01-30 15:26:28 +09:00
Drew DeVault
10897486ba
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-27 15:41:46 -05:00
Drew DeVault
f3c5c1f0b8
Fixes following recent updates upstream
2017-01-26 21:31:28 -05:00
Dean Herbert
4a7b3cf391
Initial implementation of song select footer area.
2017-01-27 00:36:12 +09:00
Drew DeVault
678f0aaa16
Implement filtering with strings
2017-01-17 19:18:15 -05:00
Drew DeVault
46e7bcef8c
Improve beatmap import
2017-01-17 17:05:06 -05:00
Drew DeVault
5eb1cda77b
Rename FilterSongSelect, use OsuColour
2017-01-17 16:43:40 -05:00
Drew DeVault
63031fbc3d
Move filter container z depth and add hover fx
2017-01-17 15:41:50 -05:00
Drew DeVault
73e46ee8c0
Initial layout of song select filtering UI
2017-01-17 15:41:50 -05:00
Dean Herbert
ee0b6be84b
Merge pull request #266 from kizayoi/master
...
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
Drew DeVault
f5f545df62
Refactor OsuColour into injected instance class
...
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d
Refactor colors to palette based design
2017-01-12 16:38:27 -05:00
Drew DeVault
c222be05c0
Add Color4.Opacity and OsuColor.Gray
2017-01-10 13:44:40 -05:00
Drew DeVault
70ecf48ca7
Add central color class
...
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.
Closes #126
2017-01-09 17:20:31 -05:00
柯十六夜
ef11c3f389
Add default Beatmap ID
2016-12-21 14:47:56 +08:00
柯十六夜
02f6e46105
Add support for v9 beatmaps
2016-12-20 23:56:49 +08:00
Thomas Müller
66435a515c
Don't async/await song selection since audio operations are now on a separate thread.
2016-12-18 15:19:41 +01:00
Dean Herbert
6e10a9bb29
Allow starting maps by clicking an active panel a second time.
2016-12-18 16:59:13 +09:00
Dean Herbert
2cbc528971
Remove janky beatmap info wedge animation, restore pixel snapping.
2016-12-18 16:50:39 +09:00
Dean Herbert
3e42fa4f90
Merge pull request #247 from peppy/song-select-async-player
...
Load player async
2016-12-17 16:05:50 +09:00
BuildTools
d37ff8f153
Deleted unnecesary things (I guess)
2016-12-15 17:35:14 -06:00
