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
Dean Herbert
7a6a614358
Don't show pause menu when watching replays.
2017-03-04 21:35:26 +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
Dean Herbert
adb6f01e39
Create class hierarchy for Score/Replay storage.
2017-03-04 15:32:41 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
Jorolf
b9e4c920c5
SelectRandom doesnt select hidden groups now
2017-03-03 21:11:38 +01:00
Dean Herbert
6f3b59268a
Merge pull request #385 from DrabWeb/mod-overlay
...
Mod select
2017-03-03 21:09:08 +09:00
Dean Herbert
dc6a728cce
Merge branch 'master' into tournament_drawings
2017-03-03 20:48:07 +09:00
Dean Herbert
38a9e820e6
GroupsContainer -> GroupContainer.
2017-03-03 20:46:07 +09:00
Dean Herbert
bc01935a89
Move around some namespaces.
2017-03-03 20:42:22 +09:00
Dean Herbert
2ac248c7d0
Use OsuSpriteText.
2017-03-03 20:29:39 +09:00
Dean Herbert
1ea1118db6
Simplify file reading.
2017-03-03 20:24:34 +09:00
Dean Herbert
4a109fcc55
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.
2017-03-03 20:21:11 +09:00
Dean Herbert
ca73b77a9a
Tidying code.
2017-03-03 20:08:32 +09:00
Dean Herbert
41cefd1cb3
xmldoc commenting.
2017-03-03 20:08:21 +09:00
Dean Herbert
c3cb225eef
Fix being able to stop rotation when it isn't started.
2017-03-03 20:07:57 +09:00
smoogipooo
5a4d07d770
Better way to initialize team lists.
2017-03-03 18:47:56 +09:00
smoogipooo
890066dae4
Use sprite visualiser lines instead of shader.
2017-03-03 18:47:22 +09:00
smoogipooo
54993b874f
Fix idle and stopping -> stopped state.
2017-03-03 18:45:04 +09:00
smoogipooo
2a49200008
Nothing to see here.
2017-03-03 18:02:02 +09:00
smoogipooo
b2661be0b2
Fix setting same state multiple times.
2017-03-03 17:59:16 +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
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
smoogipooo
7cac2680b1
Make test case add test drawings file.
2017-03-03 16:33:40 +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
smoogipooo
1d1c08125b
Further safety checking.
2017-03-03 16:01:24 +09:00
smoogipooo
777996d884
Rewrite VisualiserLine + add VisualiserContainer.
2017-03-03 15:43:16 +09:00
smoogipooo
a70b1ae108
Use a singular FlowContainer for teams.
2017-03-03 15:12:26 +09:00
smoogipooo
04dd24b04b
OnTeamSelected + async changes.
2017-03-03 14:51:19 +09:00
smoogipooo
3ae55933c4
Remove game dependency.
2017-03-03 14:11:47 +09:00
smoogipooo
d96345e408
s/internalPeriod/_period
2017-03-03 14:11:37 +09:00
Seth
1891bdf51e
Merge branch 'master' into mod-overlay
2017-03-03 01:11:15 -04:00
smoogipooo
e6d911e49b
Move modified key conditional location.
2017-03-03 14:08:37 +09: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
smoogipooo
3174b56e28
Add license headers.
2017-03-03 13:17:24 +09:00
smoogipooo
959a3d49be
Post-merge fixes.
2017-03-03 13:17:16 +09:00
Dan Balasescu
09a2d39e3e
Merge branch 'master' into tournament_drawings
2017-03-03 13:06:18 +09:00
smoogipooo
efb13b29d1
General cleanups.
2017-03-03 13:01:57 +09:00
smoogipooo
d0894bbc9b
Use storage instead of raw file access.
2017-03-03 12:59:58 +09:00
smoogipooo
b7b36b6306
Unused.
2017-03-03 12:59:31 +09:00
smoogipooo
d6c1f82105
Make visualiser lines have no separation.
2017-03-03 12:59:19 +09:00
smoogipooo
d222c523a1
Exit drawings if no drawings.txt file.
2017-03-03 12:43:48 +09:00
smoogipooo
26b81a14cf
Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it.
2017-03-03 12:42:19 +09:00
smoogipooo
062d8ddc7c
Don't handle menu buttons when Shift or Ctrl or Alt is pressed.
2017-03-03 12:41:45 +09:00
smoogipooo
febdfd5de4
Make groups fill up in round robin way, rather than sequentially.
2017-03-03 12:06:35 +09:00
Dean Herbert
78a0bce3bb
Merge pull request #423 from peppy/general-fixes
...
Move PauseOverlay to correct namespace.
2017-03-03 11:32:42 +09: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
3a8246f56d
Move PauseOverlay to correct namespace.
2017-03-03 10:17:39 +09: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
Dean Herbert
c4ca18eeba
Remove references to PassThrough.
2017-03-02 16:28:51 +09:00
DrabWeb
367d6d694c
Merge https://github.com/ppy/osu into mod-overlay
2017-03-02 01:44:18 -04:00
smoogipooo
b0d5d88fe9
Fix slight threading scheduling issue.
2017-03-02 12:26:42 +09:00
smoogipooo
1a4f0a92a5
Add saving + reloading (to/from drawings_results.txt) functionality.
2017-03-02 12:20: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
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
Dean Herbert
b6e7e054c3
wankoz
2017-03-01 22:56:20 +09:00
Dean Herbert
58ae9e888d
Basic partial replay support.
2017-03-01 22:04:20 +09:00
smoogipooo
35d246b59d
Merge remote-tracking branch 'origin/master' into tournament_drawings
2017-03-01 19:32:33 +09:00
DrabWeb
d5d8352b62
Testing build
2017-02-28 17:09:31 -04:00
Jorolf
61cbcfd597
Merge branch 'master' into pluginManager
2017-02-28 20:34:56 +01:00
Jorolf
522034020e
Moved Bindable init
2017-02-28 11:44:12 +01: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
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes
2017-02-28 13:49:19 +09:00
DrabWeb
fbd9523596
Added beatmap delete dialog
2017-02-27 23:19:28 -04:00
smoogipooo
1e15318da6
Add background.
2017-02-28 10:26:37 +09:00
Jorolf
8b3477820f
Disable mousewheel while playing
2017-02-28 00:08:34 +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
smoogipooo
44f3dfa3fe
Make it display by default.
2017-02-27 23:38:37 +09:00
Andrey Zavadskiy
3487dfe236
Removed unused variables and parameters
2017-02-27 17:32:32 +03:00
smoogipooo
fc33bf4761
Add drawings config.
2017-02-27 23:29:18 +09:00
smoogipooo
9d731af01b
Finish it up, slightly hackishly, but that's ok.
2017-02-27 23:29:17 +09:00
smoogipooo
5f3e484353
Add scrolling teams container.
2017-02-27 23:29:06 +09: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
4da09713a9
Fix test case regression.
2017-02-27 18:09:27 +09:00
Dean Herbert
68dd3c02aa
Fix failing testcase (nullref).
2017-02-27 17:05:12 +09:00
Dean Herbert
7c602a2af3
Update framework.
2017-02-27 15:55:57 +09:00
smoogipooo
25a1c7a8ad
Initial groups implementation.
2017-02-27 14:19:07 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith.
2017-02-27 12:24:53 +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
Dean Herbert
c227eb1be5
Welded bindables.
2017-02-26 22:08:21 +09:00
Dean Herbert
c5ad79e3e2
Remove unnecessary schedule.
2017-02-26 21:15:33 +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
7483b69477
Remove unnecessary Dispose logic.
2017-02-25 10:44:19 +09:00
Thomas Müller
4aecd59c74
Merge branch 'master' into fix-memory-leak
2017-02-24 19:54:14 +01: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
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
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
0264c44a20
Do not shadow Colour in TwoLayerButton
...
Renames Colour to BackgroundColour instead.
2017-02-23 22:33:37 +01:00
Thomas Müller
37bc75a7b6
Remove unused variables
2017-02-23 22:32:49 +01: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
f812641696
Merge pull request #383 from peppy/player-loading-screen
...
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
Dean Herbert
9746877903
Merge remote-tracking branch 'upstream/master' into mod-overlay
2017-02-23 11:11:52 +09:00
Dean Herbert
7e7bf07d03
Remove unused whitebox.
2017-02-23 11:11:46 +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
Dean Herbert
7cda82d016
Space to skip.
2017-02-22 21:28:40 +09:00
Thomas Müller
0d3cc39cbc
Merge branch 'master' into general-fixes
2017-02-22 08:01:34 +01:00
Dean Herbert
2d2660c1c5
Improve transition when retrying a beatmap.
2017-02-22 14:14:37 +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
444c3ba817
Merge branch 'master' into difficulty-calculator
2017-02-20 07:38:10 +01:00
Alex Amadori
a0d0c1854b
Merge remote-tracking branch 'upstream/master'
2017-02-19 19:09:55 +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
Dean Herbert
520e040396
Add FocusedTextBox abstraction.
2017-02-19 17:59:22 +09:00
Jorolf
a48e4a31a7
Parallax Option works now
2017-02-18 21:34:21 +01: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
Dean Herbert
c1194102b1
Remove second sample playback when clicking osu! logo.
2017-02-18 22:33:24 +09: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
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing.
2017-02-18 14:16:46 +09: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
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer.
2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
Dean Herbert
9e8b4d43dd
Improve exit procedure.
2017-02-17 17:25:28 +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
9a2beb5979
Update Key Counter font.
2017-02-16 22:43:49 +09: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
Dean Herbert
13ed7db361
Merge branch 'master' into general-fixes
2017-02-15 01:14:25 +09:00
Dean Herbert
f207da6041
Add/update license headers.
2017-02-14 18:17:35 +09:00
Dean Herbert
6fa84f3a81
Merge branch 'master' into disable-unimplemented-options
2017-02-14 08:35:40 +09:00
Dean Herbert
4f9d1a6c39
Visually disable options which aren't yet wired up.
2017-02-14 00:36:50 +09:00
Dean Herbert
343e48c195
Merge branch 'master' into followpoints
2017-02-13 22:23:57 +09:00
Dean Herbert
1aeb48b920
Merge remote-tracking branch 'upstream/master' into osb_loading
2017-02-13 18:22:29 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Thomas Müller
e3f35cd66e
Merge branch 'master' into osb_loading
2017-02-12 12:26:25 +01:00
Dean Herbert
37e75e9a54
Add null check when loading beatmap background.
2017-02-12 16:13:44 +09:00
Dean Herbert
7efa3415a4
Merge branch 'master' into followpoints
2017-02-10 20:59:45 +09:00
Damnae
2d155f6a5c
Bring back the delay to what it was before.
2017-02-10 10:48:25 +01:00
Damnae
6f37c02868
Fix followpoints needing a DelayReset.
2017-02-10 10:07:52 +01:00
Dean Herbert
e23202c449
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests
2017-02-10 17:22:38 +09:00
Damnae
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
Andrey Zavadskiy
e06aa44c4c
Warning Fixes
2017-02-09 16:18:08 +03:00
Dean Herbert
829fb2605b
Fix visualtest regression.
2017-02-09 17:47:11 +09:00
Dean Herbert
60e206e587
Merge pull request #336 from Damnae/hitobject_stacking
...
Add hit object stacking.
2017-02-09 17:01:52 +09:00
Damnae
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01: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
a7dac15d05
Toolbar is now toggled by the main menu.
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
34a030e3be
Fix race conditions causing menu transitions to look wrong when executed in very fast succession.
2017-02-07 22:19:36 +09:00
Dean Herbert
d06f0cf870
Fix escape not always handling back action correctly at main menu (back button not yet visible).
2017-02-07 22:19:17 +09:00
Dean Herbert
dc5e9dde56
Fix escape key nonsense.
2017-02-07 21:46:13 +09:00
Dean Herbert
8a0887c3c3
Add sound effect to osu! logo clicking.
2017-02-07 21:45:59 +09:00
Dean Herbert
24ba21363e
Make intro->mainmenu work better by delaying interactiveness of osu! logo.
2017-02-07 21:37:34 +09:00
Dean Herbert
e2f680a65f
Change main menu buttons to be activate OnClick.
2017-02-07 20:30:40 +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
9b9ed32245
Remove all @2x references, updates resource and framework.
2017-02-06 22:19:47 +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
Thomas Müller
6db70f8850
Use MaskingSmoothness to make masked diagonal edges smoother.
2017-02-04 11:06:26 +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
Dean Herbert
4f89cc0784
Merge pull request #298 from peppy/skip-button
...
Make skip button work.
2017-02-03 12:47:53 +09:00
Drew DeVault
52fb345e79
Merge branch 'master' into song-select-filtering
2017-02-02 09:25:27 -08: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
c88a2fbf8a
Replace incorrectly removed background logic
...
I had earlier thought that removing this would solve the weirdness with
starting the beatmap on any but the first difficulty, and forgot to
replace it when I found the actual cause.
2017-02-01 19:32:30 -05: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
Dean Herbert
90fd9d9132
Merge branch 'master' into options-refactor
2017-02-01 14:07:49 +09:00
Dean Herbert
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
DrabWeb
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
Dean Herbert
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09:00
Dean Herbert
ea204ad606
Merge pull request #301 from DrabWeb/pause-overlay
...
Pause overlay
2017-02-01 10:07:12 +09:00
DrabWeb
c92418e000
Made Player.canPause one line
2017-01-31 21:02:58 -04: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
DrabWeb
13da75f149
Fixed a bug where the user can double press escape to exit the song
2017-01-31 20:44:59 -04:00
Drew DeVault
35a1479fc1
Fix extra click sound effect
2017-01-31 19:37:00 -05:00
DrabWeb
bcd41a2c8f
Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
2017-01-31 20:28:50 -04:00
Drew DeVault
624d51204f
Fix issue with background on player
...
Not sure why this only happens on my branch, I didn't touch this code.
2017-01-31 19:14:54 -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
DrabWeb
91a5d0b3cf
Made requested changes
2017-01-31 09:17:47 -04: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
