Dean Herbert
78efecb89d
Remove Alpha 0.001 hack.
2017-03-15 17:07:56 +09:00
Dean Herbert
775a86e798
Add null-checks and fallbacks to make display work with current API version.
2017-03-15 15:22:46 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages).
2017-03-15 15:22:28 +09:00
Dean Herbert
7bc0a1fdfe
Use fixed-width for score display.
2017-03-15 15:21:07 +09:00
Dean Herbert
dfc4bccbe0
Add some padding to leaderboard.
2017-03-15 14:42:56 +09:00
Dean Herbert
c1f56c7c0e
Scores should be enumerable.
2017-03-15 14:38:38 +09:00
Dean Herbert
15e713899d
Add a left content area to song select.
2017-03-15 14:34:19 +09:00
Dean Herbert
d96a78459d
Rename ScoreRanks to be in line with current API.
2017-03-15 13:55:29 +09:00
Kelvin
4353c9dc3d
Fixed Warnings
2017-03-14 20:42:02 -07:00
Kelvin
18afd8eabe
Fixed license headers
2017-03-14 20:30:42 -07:00
Dean Herbert
253bcebf51
Merge remote-tracking branch 'upstream/master' into leaderboards
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-03-15 12:23:34 +09:00
Kelvin
20e2e7a8c8
Sort on SortTabs ValueChanged
2017-03-14 20:19:41 -07:00
Kelvin
755fb260db
Updated TabControl Usage
2017-03-14 19:52:21 -07:00
Kelvin
ee3d3b682f
Updated usage for DropDownHeader of FilterTabControl
2017-03-14 19:49:40 -07:00
Kelvin
40bcc63a90
Added and styled FilterTabControls
2017-03-14 19:49:40 -07:00
Kelvin
2629f78afc
Add FilterControl and FilterTabControl
2017-03-14 19:49:40 -07:00
Huo Yaoyuan
37ff1f3971
Control footer by virtual property.
2017-03-15 10:10:59 +08:00
DrabWeb
09cb0d6bbc
Proper icons
2017-03-14 12:58:22 -03:00
DrabWeb
94c2734b09
More warnings
2017-03-14 12:15:19 -03:00
DrabWeb
55187a8380
Warnings, accuracy formatting
2017-03-14 11:55:19 -03:00
Huo Yaoyuan
8c991eae01
Fix CI issues.
2017-03-14 22:27:24 +08:00
DrabWeb
4c03b62a75
More usings
2017-03-14 11:23:48 -03: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
DrabWeb
ebe48b7c24
Removed D rank
2017-03-14 11:14:27 -03:00
DrabWeb
322446effe
-Unused usings
2017-03-14 11:11:23 -03:00
DrabWeb
650fc7563d
ScoreRank, Avatar to own files, +DrawableRank
2017-03-14 10:58:28 -03:00
Huo Yaoyuan
f068f7c4bd
No footer in EditSongSelect.
2017-03-14 21:51:26 +08:00
Huo Yaoyuan
f97e8ae97f
Fix typo and warnings.
2017-03-14 21:20:38 +08:00
Huo Yaoyuan
c939897a8a
Revert "Auto assign hotkeys for BeatmapOptionsButton."
...
This reverts commit beb0a8ff03
2017-03-14 21:13:57 +08:00
Dean Herbert
8176b4ef77
Fix merge errors.
2017-03-14 22:11:38 +09:00
Dean Herbert
12326f610e
Adjust transition to flyte's liking.
2017-03-14 22:11:29 +09:00
Seth
21a9996225
Merge branch 'master' into leaderboards
2017-03-14 10:07:33 -03:00
DrabWeb
d53f219051
Adjusted score rank size
2017-03-14 10:04:42 -03: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
618e8e822b
Implement EditSongSelect and MatchSongSelect.
2017-03-14 19:53:20 +08:00
Huo Yaoyuan
3871a350f8
Move BeatmapOptions buttons to derived class and simplify.
2017-03-14 19:38:21 +08:00
smoogipooo
72e1612f32
Null-safety in the case where there are no HitObjects.
2017-03-14 19:44:14 +09:00
Huo Yaoyuan
c4e5eac35b
Move footer stuff to derived.
2017-03-14 18:38:06 +08:00
Huo Yaoyuan
9a4247f67e
Make Footer handles hotkey.
2017-03-14 18:16:04 +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
smoogipooo
854212a7aa
Merge branch 'master' into beatmap_parsing
...
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
Huo Yaoyuan
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
DrabWeb
6bd9e3cac1
+Score ranks
2017-03-13 18:34:43 -03:00
Huo Yaoyuan
14a22f032f
Fix beatmap panel removal.
2017-03-14 04:35:43 +08:00
DrabWeb
8e90e05f23
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
2017-03-13 12:31:46 -03:00
DrabWeb
442a2c97db
Merge conflicts
2017-03-13 09:44:22 -03:00
DrabWeb
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
DrabWeb
9912f5f9e1
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
2017-03-13 09:33:25 -03:00
smoogipooo
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
Dean Herbert
01c379da19
User invariant culture sorting.
2017-03-09 14:02:20 +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
e356758a7d
Don't expicitly set origin of TextAwesome.
2017-03-06 17:06:48 +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
DrabWeb
5719c6656a
Update to work with latest framework
2017-03-04 22:38:01 -04:00
DrabWeb
9cde20ffc7
Merge https://github.com/ppy/osu into leaderboards
2017-03-04 22:33:05 -04:00
DrabWeb
b02e413e56
Removed LeaderboardFade fully
2017-03-04 22:30:48 -04:00
DrabWeb
269c139d2a
Flags(redoing later), glowing text, proper Score and User usage
2017-03-04 22:29:52 -04:00
Thomas Müller
73fef85b12
Remove unnecessary usings
2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
Jorolf
7eebee36ab
Merge branch 'master' into moarOptions
2017-03-04 16:11:27 +01:00
Jorolf
5c5066e1ae
renamed local groups
2017-03-04 15:30:14 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow
2017-03-04 23:28:39 +09:00
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers).
2017-03-04 23:24:13 +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
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01:00
DrabWeb
d1bad34434
Enter animation, remove testing mod icons
2017-03-04 05:01:55 -04:00
Thomas Müller
a2b79de672
Add comments to CarouselContainer
2017-03-04 09:34:39 +01:00
Thomas Müller
aaa1f766af
Fix beatmap removal
2017-03-04 09:34:28 +01:00
Thomas Müller
9bddd1ed4b
Fix broken CarouselContainer animations
...
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
2017-03-04 09:33:24 +01:00
DrabWeb
d6f53c8b77
Moved test data to visual test
2017-03-04 04:05:31 -04:00
Thomas Müller
a97a7f1024
No more custom lifetimelist in CarouselContainer
2017-03-04 08:54:14 +01:00
DrabWeb
a112b354f0
Basic implementation of score UI
2017-03-04 03:37:34 -04:00
Jorolf
b9e4c920c5
SelectRandom doesnt select hidden groups now
2017-03-03 21:11:38 +01: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
bdb130fabc
Avoid using right-to-left fill direction for now.
2017-03-03 16:54:59 +09:00
Dean Herbert
47845a7fbd
Fix button input handling.
2017-03-03 16:54:43 +09: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
Dean Herbert
fb6c25edf8
Fix more silly hacks.
2017-03-03 13:58:46 +09:00
Dean Herbert
2e01857782
Better constants.
2017-03-03 13:58:46 +09:00
Dean Herbert
00b139b3df
Remove hack (fixed at framework level).
2017-03-03 13:58:46 +09:00
Seth
2e74b4be60
Merge branch 'master' into beatmap-options
2017-03-03 00:52:45 -04:00
DrabWeb
f872330902
Fix BeatmapDeleteDialog namespace
2017-03-02 21:28:05 -04:00
DrabWeb
7a4b9c5571
osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options
2017-03-02 21:20:30 -04:00
Dean Herbert
ecd3453774
Fix potential nullref.
2017-03-02 22:17:14 +09: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
Dean Herbert
9ea83230aa
Formatting fixes.
2017-03-02 22:01:53 +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
Dean Herbert
ff5f0af2d3
Merge branch 'master' into popup-dialog
2017-03-02 16:42:20 +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
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
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
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
e8b027130f
Remove unused variable.
2017-02-27 23:17:21 +09:00
Alex Amadori
8b336156f0
Merge remote-tracking branch 'upstream/master'
2017-02-27 14:55:44 +01:00
Dean Herbert
afdb95f4d5
Fix even more test regressions.
2017-02-27 20:39:04 +09:00
Dean Herbert
7c602a2af3
Update framework.
2017-02-27 15:55:57 +09:00
default0
8d91519d59
Update usage of FlowContainer and its subclasses
2017-02-26 21:32:43 +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
ace023f0c7
Refactor local vars named in a c-like fashion
2017-02-24 17:08:18 +01:00
Alex Amadori
90b0f035ad
Compute average of star ratings
2017-02-24 17:01:14 +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
d24403e58e
Remove unused using statement.
2017-02-24 17:20:00 +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
355bbb6324
SearchTextBox should not handle shift-delete.
2017-02-24 11:44:40 +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
3d19199218
Fixed for star difficulty
2017-02-21 18:27:39 +01:00
Alex Amadori
6c161fb167
Merge remote-tracking branch 'upstream/master'
2017-02-21 18:15:46 +01:00
Dean Herbert
afba4fbfad
Merge remote-tracking branch 'upstream/master' into chat-improvement
2017-02-21 15:46:28 +09: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
Dean Herbert
520e040396
Add FocusedTextBox abstraction.
2017-02-19 17:59:22 +09:00
Alex Amadori
21cf96ec10
More sorting rookie mistakes
2017-02-18 16:23:13 +01:00
Alex Amadori
f48c83b787
Fix silly sorting mistakes
2017-02-18 15:56:29 +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
1cd93f79b3
General sorting improvements
2017-02-18 07:59:01 +01:00
Alex Amadori
6b3ecc28b8
Fixed BeatmapPanels disappearing
2017-02-17 23:32:14 +01: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
04346dbb92
Make osu! logo at song select correctly handle mouse focus.
2017-02-16 22:24:25 +09:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText.
2017-02-15 21:37:43 +09:00
Dean Herbert
d570a6d308
Handle cases where HitObjects were not parsed.
2017-02-15 12:38:10 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Dean Herbert
faa805e437
Fix SearchTextBox's handling of keyboard input to allow for IME input.
2017-02-09 12:33:24 +09: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
417b0817a9
Improve arrow key redirection at song select.
2017-02-08 15:30:20 +09:00
Dean Herbert
937c065af7
Clear content of SearchTextBox on first escape keypress.
2017-02-08 15:14:15 +09:00
Dean Herbert
bbf8d1000b
Update focus requesting code in SearchTextBox.
2017-02-08 15:13:56 +09:00
Dean Herbert
a6f02106a4
Use new placeholder logic.
2017-02-08 14:08:01 +09:00
Dean Herbert
5a89ba1040
Make OsuTextBox use OsuSpriteText.
2017-02-08 11:22:46 +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
Dean Herbert
86205c35a4
Fix weird state changes of footer buttons.
2017-02-06 20:46:53 +09:00
Thomas Müller
8271b139e9
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
2017-02-05 09:40:58 +01:00
Dean Herbert
ddea76927f
Better SearchTextBox focus handling.
2017-02-03 19:12:57 +09:00
Dean Herbert
16a01abc4d
Merge remote-tracking branch 'upstream/master' into options-refactor
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Drew DeVault
437cc834eb
@Tom94 pointed out this problem
2017-02-02 12:23:06 -05:00
Dean Herbert
966121a438
Fix keyboard controls not respecting search filter.
2017-02-02 19:37:35 +09:00
Dean Herbert
0c887d3a46
Fix deselected group remaining visible after search.
2017-02-02 19:24:43 +09:00
Dean Herbert
aec84ae725
Fix laggy animations, incorrect hiding logic.
2017-02-02 19:24:14 +09:00
Drew DeVault
5003b3738a
Remove constant boolean expressions
2017-02-01 19:15:22 -05:00
Drew DeVault
3c7c3d1cb9
Tidy up GetEnumerable
2017-02-01 19:12:24 -05: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
637a99e8d0
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-31 19:00:50 -05:00
Dean Herbert
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
Drew DeVault
acdf64e1f7
Remove code to check for other focused controls
2017-01-30 23:08:24 -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
8d294a4eca
Only grab focus if nothing else has it
2017-01-30 14:03:05 -05:00
Drew DeVault
144a87a247
Fix focus interactions with search text box
2017-01-30 13:56:33 -05:00
Drew DeVault
09680196c9
SearchTextBox: Don't handle Key.{Enter,Left,Right}
2017-01-30 10:16:55 -05:00
Drew DeVault
b32cbdbec2
Relocate enums
2017-01-30 10:07:11 -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
7f3cb381a9
Refactor FilterControl.Search
2017-01-30 09:48:12 -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
bdbe8501d3
Merge branch 'master' into add-flash-effects
...
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
Dean Herbert
2ad9377b37
Adjust carousel radius slightly (flyte wanted it).
2017-01-30 16:55:47 +09:00
Dean Herbert
9f90b57543
Move BPM calculations to Beatmap.
2017-01-30 16:03:45 +09:00
Dean Herbert
0272c4b559
Add StarDifficulty property and correct colouring of difficulty icons.
2017-01-30 15:26:28 +09:00
Dean Herbert
1f2f2fa144
Fix visualtests.
2017-01-30 15:15:56 +09:00
Dean Herbert
0c2152f3d0
Use beatmap's play mode.
2017-01-30 13:14:02 +09:00
Dean Herbert
e93f60396f
Add the ability for individual game modes to report statistics for display at song select.
2017-01-30 13:12:30 +09:00
Dean Herbert
3286713d11
avg -> mostly
2017-01-29 15:16:38 +09:00
Dean Herbert
6027cc7afa
Formatting fixes.
2017-01-29 15:15:04 +09:00
Dean Herbert
2e76874384
Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).
2017-01-29 15:09:42 +09:00
Dean Herbert
3125fa89ee
Fix method which should be class.
2017-01-29 15:06:44 +09:00
Dean Herbert
77558abf58
Merge branch 'master' into more-beatmap-info
...
# Conflicts:
# osu.Game/Screens/Select/BeatmapInfoWedge.cs
2017-01-29 14:47:42 +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
75de03bd88
Use OsuColour for green text
2017-01-17 18:26:43 -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
n4b3l
c614d61b1a
getbpm takes Beatmap instead of WorkingBeatmap
2016-12-18 19:34:20 +01:00
n4b3l
ded6588d3b
minor style fixed
2016-12-18 17:21:05 +01:00
n4b3l
5f893d46c7
style fixes
2016-12-18 16:53:52 +01: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
n4b3l
492581fa50
fixed length.seconds display
2016-12-18 04:03:11 +01:00
n4b3l
f551133b0e
..
2016-12-18 03:56:27 +01:00
n4b3l
3d64bee069
proper round + std bpm
2016-12-18 03:53:26 +01:00
n4b3l
63dd8893d9
bpm as ints
2016-12-18 02:53:43 +01:00
n4b3l
73532b9172
small code improvements
2016-12-17 19:57:58 +01:00
n4b3l
2f708a704d
bpm range added + changed spacing
2016-12-17 19:31:34 +01:00
n4b3l
a04a0a7d2c
fix allignment...
2016-12-17 15:58:51 +01:00
n4b3l
d812a7cb4e
func for icons
2016-12-17 15:53:26 +01:00
n4b3l
9e6161b862
better scaling
2016-12-17 12:18:55 +01:00
n4b3l
e31e19f1b8
removed unnecessary padding
2016-12-17 12:04:42 +01:00
n4b3l
376b3df2f8
icons with TextAwesome
2016-12-17 11:57:52 +01:00
n4b3l
590db66b37
remove icons from resource
2016-12-17 11:30:30 +01: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
n4b3l
b78b40a629
implement icons
2016-12-17 01:58:39 +01:00
n4b3l
881d58574e
Design improvements
2016-12-16 14:21:12 +01:00
n4b3l
991ad298d9
more beatùa
2016-12-16 04:25:28 +01:00
BuildTools
d37ff8f153
Deleted unnecesary things (I guess)
2016-12-15 17:35:14 -06:00
BuildTools
b788878c95
Unnecesary things were removed (I guess)
2016-12-15 17:28:22 -06:00
BuildTools
a845a897b3
Add Base Preview Time
2016-12-15 17:11:48 -06:00
Dean Herbert
8ce18e8986
Improve song select startup time via better database querying. Also fix difficulty displays.
2016-12-15 22:58:32 +09:00
Dean Herbert
08ef8ed8ea
Add comment about future implementation.
2016-12-15 22:58:18 +09:00
Dean Herbert
8d800dac99
Make Player load async.
2016-12-15 22:58:00 +09:00
Dean Herbert
9557821776
Start a map using enter key.
2016-12-15 22:57:28 +09:00
Dean Herbert
21f993d149
Add ability to navigate song select carousel using arrow keys.
2016-12-15 22:57:14 +09:00
Thomas Müller
9c4c713aa0
Fix panels that are moving off-screen having an incorrect X coordinate applied.
2016-12-10 11:30:22 +01:00
Dean Herbert
bbc11c77ca
Add (temporary) transitions to songselect and player.
2016-12-07 20:47:28 +09:00
Dean Herbert
f356640cb7
Add missing licence headers.
2016-12-06 19:07:15 +09:00
Dean Herbert
8fc8ca3998
Add song select panel sound effects.
2016-12-05 20:09:56 +09:00
Thomas Müller
b12b82fdd3
Fix depth values.
2016-11-29 20:50:12 +01:00
stanriders
775e8ac5d6
Hardcoded button size, fixed input handling, fixed flash not being visible
2016-11-27 18:56:05 +03:00
stanriders
ba18c9a309
Merged ExtendableButton and BackButton
2016-11-27 05:48:31 +03:00
stanriders
e9343fe53d
Add stable-alike BackButton
2016-11-27 04:21:12 +03:00
Dean Herbert
af18d25357
Move some styling inside BeatmapInfoWedge and fix initial transition happening too early.
2016-11-26 17:31:35 +09:00
Dean Herbert
5764bf8093
Improve IsAlive logic.
2016-11-26 17:22:58 +09:00
Dean Herbert
ebab9d66bf
Merge remote-tracking branch 'refs/remotes/upstream/master' into carousel-fixes
2016-11-26 17:08:40 +09:00
Dean Herbert
e36a51acf0
Custom LifetimeList (experimental).
2016-11-25 18:30:13 +09:00
Drew DeVault
89effca12e
Remove need for PlaySongSelect ctor to take a db
2016-11-25 00:44:46 -05:00
Dean Herbert
4184dd2329
Change the way we set our initial y position on first display.
2016-11-25 12:50:18 +09:00
Tom94
495cb926f7
Move beatmap panels back to an X of 0 when they are unselected.
2016-11-24 20:25:29 +01:00
Dean Herbert
ece3bc0e01
Refactor BeatmapInfoWedge to be async.
2016-11-24 13:48:48 +09:00
Dean Herbert
1eb04ff11e
Don't use the overlay suffix for beatmapInfo wedge.
2016-11-24 13:35:25 +09:00
Dean Herbert
311b5c623c
Adjust difficulty panel offsets slightly.
2016-11-24 13:33:32 +09:00
Tom94
718f2b13a8
Do not change depth value of drawables currently contained within a container.
2016-11-24 13:23:05 +09:00
Tom94
3e4ff27865
Simplify Y position computations and do not scroll to selected beatmap whenever Y positions are recomputed.
2016-11-23 17:42:21 +01:00
Dean Herbert
1e0b7dffc0
Move WedgeBackground to its own class and improve display a bit.
2016-11-23 14:29:20 +09:00
Dean Herbert
622b127180
One missing carousel rename.
2016-11-23 13:28:49 +09:00
Dean Herbert
2e05ec0296
Fix scaling of BeatmapInfoOverlay wedge.
2016-11-23 13:07:35 +09:00
Dean Herbert
611619fd9c
Fix some namespaces.
2016-11-23 12:00:17 +09:00
Thomas Müller
030a20a3f2
Fix minor issues with alpha fading at edges.
2016-11-22 21:58:46 +01:00
Thomas Müller
5cf5e8c80c
Move BeatmapInfoOverlay into its own class.
...
No loading async optimizations yet.
2016-11-22 21:51:42 +01:00
Thomas Müller
9bf23bc4ad
Only handle beatmap panels that are visible in song select.
2016-11-22 21:41:48 +01:00
Thomas Müller
ba1d3ab20e
Carousell -> Carousel
2016-11-22 20:10:25 +01:00
Thomas Müller
2596e71494
Improve smooth movement in beatmap carousel.
2016-11-22 20:10:04 +01:00
Thomas Müller
20be2f4628
Terminate loop through beatmap groups when having found a selection.
2016-11-22 19:00:42 +01:00
Thomas Müller
b22762d0e1
Merge branch 'master' of github.com:ppy/osu into better-song-select
2016-11-22 18:55:13 +01:00
Dean Herbert
4cf2dd90d6
Standardise and simplify the amount of beatmap information passed around song select.
2016-11-22 22:07:15 +09:00
Dean Herbert
ccb00aeb94
Add comment about wedgedBeatmapInfo performance issues.
2016-11-22 21:43:35 +09:00
Dean Herbert
a251db804c
Stop adding beatmaps to song select when disposed.
2016-11-22 16:13:38 +09:00
Thomas Müller
d32f11b5e2
Smoother movement within song select.
2016-11-21 07:59:46 +01:00
Thomas Müller
318fe2f9d6
Fix broken VisualTests SongSelect.
2016-11-20 20:43:43 +01:00
Thomas Müller
c6d688898f
Initial implementation of a beatmap carousell and various minor improvements to song select.
...
No big optimizations yet, but groundwork is laid out.
2016-11-20 20:34:16 +01:00
