RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,375 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

269 Commits

Author SHA1 Message Date
Dean Herbert aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09: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
Dean Herbert 0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +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 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
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 580584a015
Don't use osu! mode parser for other game modes for now (convert still works). 2017-02-15 12:36:47 +09:00
Dean Herbert fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09:00
John Leuenhagen 7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Dean Herbert 8ec927899f
Implement notifications. 2017-02-10 16:30:23 +09:00
Dean Herbert d05b544d0d
Merge branch 'master' into audio-device-selection 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
 2017-02-09 16:21:28 +09:00
Dean Herbert 2e119cd74f
Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
Dean Herbert 84096b146e
Make password mask characters look better. 2017-02-08 12:49:20 +09:00
default0 b4f30dd417 Rework OptionDropdowns to be more versatile 
The existing OptionDropdown only supported enums and was thus renamed
to OptionEnumDropDown. A new OptionDropdown has been created in its
place to allow binding to arbitrary values, with a set of user-provided
items.
 2017-02-06 01:21:26 +01:00
Thomas Müller d6714324df OsuNub -> Nub. 2017-02-04 12:06:53 +01:00
Thomas Müller 0edc64a08c Re-use checkbox nub for option sliders and slightly re-structure. 2017-02-04 09:50:58 +01:00
Dean Herbert 4504440f80 Fix much dropdown shit. 2017-02-03 19:13:10 +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 a6fd7f46c3 Merge remote-tracking branch 'upstream/master' into login-updates 2017-02-03 12:48:52 +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
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
Dean Herbert e94c92b920 Merge branch 'master' into login-updates 2017-02-01 13:23:22 +09: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
Drew DeVault 637a99e8d0 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-31 19:00:50 -05:00
Dean Herbert 6803b1a8db Sidebar button style pass. 2017-01-31 19:58:38 +09:00
Dean Herbert 0d529cb636 General tidy-ups. 2017-01-31 19:23:52 +09:00
Dean Herbert 6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert 6ca974bf0c Re-namespace options, adjust font sizes + more. 2017-01-31 18:37:11 +09:00
Dean Herbert 62c5ad907a Merge remote-tracking branch 'upstream/master' into login-updates 
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
 2017-01-31 17:05:33 +09:00
Dean Herbert 22ef576c64 Make LoginOverlay mask better. 2017-01-31 16:59:38 +09:00
Dean Herbert 74366c620b Move login screen to toolbar and update design (still not fully implemented). 
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
#	osu.Game/Overlays/Toolbar/Toolbar.cs
 2017-01-30 22:55:35 +09:00
DrabWeb ed3ed8251f Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses 2017-01-30 08:04:39 -04:00
Dean Herbert 26e9533ff0 Add custom implementation of TextBox. 2017-01-30 20:29:04 +09: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
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
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
Dean Herbert 5787b43586 wip 2017-01-27 19:14:44 +09:00
DrabWeb dedd6a4bcf Small cleanups 2017-01-27 05:39:15 -04: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 417933b7ec Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-26 13:57:55 -05:00
Dean Herbert 139cac5e57 Add fail dialog and flow. 2017-01-27 00:41:34 +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 cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +08:00
Drew DeVault 5eb1cda77b Rename FilterSongSelect, use OsuColour 2017-01-17 16:43:40 -05:00
Drew DeVault 73e46ee8c0 Initial layout of song select filtering UI 2017-01-17 15:41:50 -05:00
Dean Herbert a3770adbc5 Merge branch 'master' into hpdisplay 2017-01-16 11:23:54 +08:00
Drew DeVault fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Dean Herbert 7eab50b989 Add basic HP display support. 2017-01-10 16:08:01 +08: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
Drew DeVault cf60c52f00 Switch to System.ComponentModel.Description 2016-12-07 09:42:53 -05:00
Drew DeVault 5456e0102c s/OptionsDropdown/DropdownOption/g 2016-12-07 09:42:52 -05:00
Drew DeVault 4757a1c433 Wire up enum-backed dropdowns 2016-12-07 09:42:52 -05:00
Drew DeVault 0378de8346 Add DisplayName 2016-12-07 09:42:37 -05:00
Drew DeVault 9daf524120 Add OptionsDropdown<T> and wire up one example 2016-12-07 09:42:37 -05:00
Drew DeVault ff7ec88e66 s/OptionsSlider/SliderOption/g 2016-12-07 09:42:37 -05:00
Drew DeVault a350e95e40 Add OptionsSlider and wire up volume sliders 2016-12-07 09:41:28 -05:00
Dean Herbert a80c28ca37 ToolbarOverlayToggleButton 2016-12-02 21:57:01 +09:00
Dean Herbert 9bf36418a0 Make toolbar buttons more independent logic-wise. 
Also adds visual toggle state for toggleable buttons.
 2016-12-02 18:43:01 +09:00
Dean Herbert 11f958030f Make Triangles more flexible and more random. 2016-12-01 18:53:13 +09:00
Dean Herbert 6ccce88a0e Add proper user data retrieval on connect. 2016-12-01 16:44:24 +09:00
Dean Herbert d7ab74363d Simplify toolbar width/padding calculations. Add avatar display (incorrect user id). 2016-12-01 16:05:54 +09:00
Dean Herbert 167b559a95 Move toolbar to own namespace. 2016-12-01 14:22:29 +09:00
Dean Herbert 18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00
Dean Herbert 34e91c8474 Add the concept of IOnlineComponents, registered tot he API for handling state changes. 2016-11-30 18:30:01 +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
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 ba18c9a309 Merged ExtendableButton and BackButton 2016-11-27 05:48:31 +03:00
stanriders af57984d5c Moved ExtendableButton out of framework 2016-11-27 04:41:17 +03:00
stanriders e9343fe53d Add stable-alike BackButton 2016-11-27 04:21:12 +03:00
Dean Herbert c978a4c091 Tidy up code. Make trail smooth. 2016-11-26 19:22:56 +09:00
Dean Herbert 396ca9fe91 Remove HitJudgementResolver; reimplement in DrawableHitObject. 2016-11-26 16:51:51 +09:00
Dean Herbert ece3bc0e01 Refactor BeatmapInfoWedge to be async. 2016-11-24 13:48:48 +09:00
Dean Herbert 611619fd9c Fix some namespaces. 2016-11-23 12:00:17 +09: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 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 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 1242ae3f2a Add the concept of a HitJudgementResolver. 2016-11-19 16:19:26 +09:00
Dean Herbert d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +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
Dean Herbert 75be78752b Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 22:30:15 +09:00
Dean Herbert 099b309645 Introduce back the concept of Rulesets. 2016-11-12 18:26:21 +09:00
Dean Herbert 8d56a881d0 Merge pull request #157 from SirCmpwn/string-options 
Add TextBoxOption and wire it up
 2016-11-12 16:11:09 +09:00
Drew DeVault 00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
Drew DeVault a81f099d40 Add TextBoxOption and wire it up 2016-11-10 18:17:15 -05:00
Dean Herbert 788c11de10 Merge pull request #103 from huoyaoyuan/music-controller 
Music controller
 2016-11-10 12:54:56 +09:00