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
Drew DeVault
c00a558cb7
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-30 09:35:14 -05:00
DrabWeb
740f6e5595
Moved delaying resuming to Player
2017-01-30 09:06:26 -04: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
DrabWeb
ad33ae9431
Removed unnecessary change
2017-01-30 06:24:44 -04:00
DrabWeb
015832f242
Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
2017-01-30 06:14:28 -04:00
DrabWeb
d70cbd37dd
Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player
2017-01-30 04:08:14 -04:00
Dean Herbert
2ad9377b37
Adjust carousel radius slightly (flyte wanted it).
2017-01-30 16:55:47 +09:00
Dean Herbert
f0d30cc873
Make triangles opaque.
2017-01-30 16:53:12 +09:00
Dean Herbert
a315db68ab
Remove unused field.
2017-01-30 16:08:31 +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
DrabWeb
28967cf77a
Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups
2017-01-29 05:04:48 -04: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
DrabWeb
582599a8de
Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar
2017-01-28 16:55:42 -04:00
Drew DeVault
10897486ba
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-27 15:41:46 -05:00
DrabWeb
feba3f35ba
Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place
2017-01-27 15:28:39 -04:00
DrabWeb
601a5ed39c
Reverted Player to upstream
2017-01-27 14:29:51 -04:00
Dean Herbert
3e7503e860
Make skip button work.
2017-01-27 21:57:22 +09:00
Dean Herbert
420e61fa97
TwoLayerButton
2017-01-27 21:08:36 +09:00
DrabWeb
3ed88ea043
Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed
2017-01-27 07:11:22 -04:00
DrabWeb
81de5a2097
Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)
2017-01-27 06:36:43 -04:00
DrabWeb
f35974021a
Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing
2017-01-27 06:19:52 -04:00
Dean Herbert
5787b43586
wip
2017-01-27 19:14:44 +09:00
DrabWeb
fe265c01cb
Added current work on pause overlay
2017-01-27 05:24:49 -04:00
Dean Herbert
6d44c5c8f1
Move logo colour definitions local to their usage.
2017-01-27 17:57:52 +09:00
Dean Herbert
9b2669e1ae
Add flash when activating the osu! logo.
2017-01-27 17:23:53 +09:00
Dean Herbert
50e4c39e32
Add flash when activating a menu button.
2017-01-27 17:23:53 +09:00
Dean Herbert
a238637990
Move osu! logo colour declarations to palette.
2017-01-27 17:23:53 +09:00
Dean Herbert
f3e9da609e
Merge pull request #295 from peppy/songselect-footer
...
Initial implementation of song select footer area.
2017-01-27 16:13:43 +09:00
Drew DeVault
f3c5c1f0b8
Fixes following recent updates upstream
2017-01-26 21:31:28 -05:00
Drew DeVault
417933b7ec
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-26 13:57:55 -05:00
Dean Herbert
f07b9591cd
Add null check when popping backgrounds from the mode stack.
2017-01-27 00:41:34 +09:00
Dean Herbert
139cac5e57
Add fail dialog and flow.
2017-01-27 00:41:34 +09:00
Dean Herbert
8c7bb4990c
Add support for failing.
2017-01-27 00:38:21 +09:00
Dean Herbert
70271fee35
Move PlayerInputManager to own file.
2017-01-27 00:38:21 +09:00
Dean Herbert
4a7b3cf391
Initial implementation of song select footer area.
2017-01-27 00:36:12 +09:00
Dean Herbert
1853bbdda8
Move window/volume configuration to framework level.
2017-01-25 18:44:51 +09:00
Dean Herbert
3a27178bb1
Merge pull request #289 from UselessToucan/JudgementsCapacity
...
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
Dean Herbert
ae464fcace
Move Intro logic to OnEntering in line with framework changes.
2017-01-20 16:30:24 +08: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
7559fc593a
Use default background on empty song select screen
2017-01-17 16:43:53 -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
TocoToucan
259c0964fd
Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations
2017-01-16 23:14:35 +03:00
Dean Herbert
ee0b6be84b
Merge pull request #266 from kizayoi/master
...
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
Dean Herbert
4030413291
Merge branch 'refs/heads/SirCmpwn/colors'
2017-01-14 06:52:30 +08:00
Drew DeVault
e81073695f
Implement disable mouse buttons
2017-01-13 17:17:04 -05: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
aebe87fefc
better implementation
2016-12-19 16:09:29 +01:00
n4b3l
09f9f86b06
check if dimLevel is null on exit
2016-12-19 14:03:10 +01: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
db21fe062e
Merge pull request #252 from n4b3l/background-dim
...
basic background dim
2016-12-18 16:04:10 +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
n4b3l
df305989d0
use config bindable directly
2016-12-18 10:48:59 +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
0fbd2d8bc8
removed random enter
2016-12-17 21:03:14 +01:00
n4b3l
224e6a877a
responsive to dim changes
2016-12-17 20:59:41 +01:00
n4b3l
36049cc493
smoother transition
2016-12-17 20:29:20 +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
c73fbe6e42
Remove unnecessary casts
2016-12-17 15:06:56 +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
ba81222af6
basic background dim
2016-12-16 17:13:24 +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
Dean Herbert
c420c55291
Merge branch 'master' into hit-samples
...
# Conflicts:
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
2016-12-13 17:57:24 +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
6cfb174f02
Fix exiting results screen returning to player.
2016-12-08 20:03:18 +09: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
ef8793ff24
Merge branch 'refs/heads/master' into more-sound-effects
2016-12-06 00:08:45 +09:00
Dean Herbert
7bd9a87bda
Add menu button sound effects.
2016-12-05 21:09:41 +09:00
Dean Herbert
8fc8ca3998
Add song select panel sound effects.
2016-12-05 20:09:56 +09:00
Dean Herbert
ff85ccca6d
Move the actual outro sequence into Intro rather than MainMenu.
2016-12-05 19:34:52 +09:00
Thomas Müller
1e8dc780ab
Use new framework-level triangles.
2016-12-01 19:12:35 +01:00
Dean Herbert
22905d2033
Align logo correctly between intro and main menu.
...
Kinda hacky but will do for now.
2016-12-01 21:59:32 +09:00
Dean Herbert
2342a17dbc
Move BufferedContainer usage to allow ripple to blend correctly with the background layer.
2016-12-01 21:29:14 +09:00
Dean Herbert
511dab32ef
Remove masking from Triangles to simplify OsuLogo masking hierarchy.
2016-12-01 21:12:37 +09:00
Dean Herbert
4b74ea7586
Separate logo hover and bounce into separate containers to fix consecutive actions.
2016-12-01 20:52:26 +09:00
Dean Herbert
1f370fe29c
Add animated osu! logo.
2016-12-01 20:21:14 +09:00
Dean Herbert
c26587ec3a
Update depth comparer name.
2016-11-30 15:50:48 +09:00
Dean Herbert
5101297f53
Add drop shadows to main menu buttons.
2016-11-30 15:02:53 +09:00
Dean Herbert
476168eec2
Add shadow to main menu button/icon text.
2016-11-30 13:15:34 +09:00
Dean Herbert
1e037b3eaa
Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth
2016-11-30 12:21:12 +09:00
Thomas Müller
d0065d2d20
Merge pull request #205 from peppy/scoring
...
Wire up basic scoring.
2016-11-29 20:56:53 +01:00
Thomas Müller
b12b82fdd3
Fix depth values.
2016-11-29 20:50:12 +01:00
Dean Herbert
74e3a87f78
Add *very* basic ranking screen.
2016-11-29 23:59:56 +09:00
Dean Herbert
2947121e48
Hook up ScoreProcessor to Scoreoverlay etc.
2016-11-29 21:28:43 +09:00
Dean Herbert
9d2a69f1e2
Add concept of ScoreProcessor.
2016-11-29 20:30:16 +09:00
Dean Herbert
9871960112
Basic score flow.
2016-11-29 17:34:16 +09: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
82a708d2c0
Merge pull request #189 from SirCmpwn/general-fixes
...
General fixes
2016-11-26 16:56:07 +09:00
Dean Herbert
396ca9fe91
Remove HitJudgementResolver; reimplement in DrawableHitObject.
2016-11-26 16:51:51 +09:00
Dean Herbert
e36a51acf0
Custom LifetimeList (experimental).
2016-11-25 18:30:13 +09:00
Dean Herbert
f9f72f25a2
Add basic flow for hitobject judgement.
2016-11-25 16:26:50 +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
6c69bd2ba3
Fix regression causing crash on using z/x in player mode.
2016-11-24 21:27:12 +09: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
a3234a5269
Avoid synchronous queries in BackgroundModeBeatmap.
2016-11-22 21:22:12 +09:00
Dean Herbert
a251db804c
Stop adding beatmaps to song select when disposed.
2016-11-22 16:13:38 +09:00
Dean Herbert
3e9c398652
Update input handler logic to match framework changes.
2016-11-21 21:36:11 +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
Thomas Müller
40805ad32c
Adjust size of wedged background overlay.
2016-11-20 12:29:38 +01:00
Thomas Müller
57e7c7097d
Update framework and add rudimentary fading to song select screen.
2016-11-20 12:16:54 +01:00
Thomas Müller
0fdd505807
Add wedged background overlay to song select.
2016-11-20 10:02:20 +01:00
Thomas Müller
f8788bb24b
Update the background according to the currently selected beatmap and blur it within song select.
2016-11-19 17:39:43 +01:00
Dean Herbert
b61521a93c
Tidy up Player.cs.
2016-11-16 15:48:35 +09:00
Huo Yaoyuan
53deaf2a00
Merge branch 'master'
2016-11-16 10:51:39 +08:00
Dean Herbert
d846246ef2
ShowToolbar -> ShowOverlays; include MusicController.
2016-11-15 20:55:57 +09:00
Dean Herbert
abdfe42388
Merge branch 'refs/heads/master' into better-anchors
...
# Conflicts:
# osu.Game.Mode.Osu/UI/OsuComboCounter.cs
# osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
2016-11-15 14:33:13 +09:00
Dean Herbert
5dd4e31011
Move DrawableHitObject.
2016-11-14 19:49:29 +09:00
Dean Herbert
4590be552f
Move play modes to their own projects.
2016-11-14 18:54:24 +09:00
Dean Herbert
06f4f93918
Move play modes to Modes namespace.
2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f
Rename GameModes namespace to Screens.
2016-11-14 17:23:33 +09:00