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

799 Commits

Author SHA1 Message Date
Dean Herbert 9938084343 Make parallax container work with global mouse state (so it ignores bounds checks). 2016-11-24 16:04:16 +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 20ae8df2bd Refactor volume control to load asynchronously. 2016-11-23 16:12:21 +09:00
Dean Herbert 0c841cffdd Change GetChildren recursive default to false (should be more common). 2016-11-23 15:34:32 +09: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 60d939f323 Use FillMode in more cases. 2016-11-23 13:18:22 +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
Dean Herbert b3b7fb90c5 Add shadows to toolbar tooltips. 2016-11-23 11:35:52 +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 d71550d22a Don't do a recursive fill by default, we don't need it. 2016-11-22 22:07:28 +09: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 b73cdba08c Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation. 2016-11-22 21:38:46 +09:00
Dean Herbert a3234a5269 Avoid synchronous queries in BackgroundModeBeatmap. 2016-11-22 21:22:12 +09:00
Dean Herbert 3bc38268a0 Make MusicController more async. 2016-11-22 20:47:28 +09:00
Dean Herbert f576b4bf82 Don't use texture atlases for beatmap backgrounds. 2016-11-22 20:14:58 +09:00
Dean Herbert 0109c79cae Async load of panel backgrounds (failing for on-screen panels). 2016-11-22 19:48:51 +09:00
Dean Herbert 2ba365657e Tidy up some linq. 2016-11-22 17:21:42 +09:00
Dean Herbert a251db804c Stop adding beatmaps to song select when disposed. 2016-11-22 16:13:38 +09:00
Dean Herbert 7df8324957 Explicit disposal via using() to WorkingBeatmap. 2016-11-22 14:57:53 +09:00
Dean Herbert 070c7dc621 Merge remote-tracking branch 'refs/remotes/upstream/master' into input-handler-improvements 2016-11-22 12:37:57 +09:00
Dean Herbert 3e9c398652 Update input handler logic to match framework changes. 2016-11-21 21:36:11 +09:00
Dean Herbert 41a84ba00c Add finalizer logic for WorkingBeatmap for now. 2016-11-21 21:35:10 +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 3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert acb85d0140 Fix regressions in combo counters and tidy up naming of SpriteTexts. 2016-11-19 16:19:54 +09:00
Dean Herbert 1242ae3f2a Add the concept of a HitJudgementResolver. 2016-11-19 16:19:26 +09:00
Dean Herbert 4db2a1e693 Split ApproachCircle out into its own class. 2016-11-18 17:47:47 +09:00
Dean Herbert 885df47864 Add simple implementation of HitExplosions. 2016-11-16 19:24:48 +09:00
Dean Herbert b61521a93c Tidy up Player.cs. 2016-11-16 15:48:35 +09:00
Dean Herbert 42d2d39ade Merge pull request #171 from huoyaoyuan/improvements 
Various improvements
 2016-11-16 12:00:55 +09:00
Huo Yaoyuan 53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Dean Herbert 89bb87a6f3 Merge pull request #176 from Tom94/simpler-gradient 
Use gradient helper function to create toolbar tooltip gradient.
 2016-11-16 11:18:31 +09:00
Thomas Müller e049f8582a Fix option checkbox losing its glow incorrectly in certain cases. 2016-11-15 19:11:36 +01:00
Thomas Müller 746c28246f Use gradient helper function to create toolbar tooltip gradient. 2016-11-15 19:09:30 +01:00
Thomas Müller 696d21f762 Merge pull request #174 from peppy/general-fixes 
General fixes
 2016-11-15 18:20:48 +01:00
Dean Herbert d846246ef2 ShowToolbar -> ShowOverlays; include MusicController. 2016-11-15 20:55:57 +09:00
Dean Herbert 2af839cdbd Render musicController above toolbar. 2016-11-15 20:55:55 +09:00
Dean Herbert 0b8c307549 Toolbar should block Hover events. 2016-11-15 20:55:53 +09:00
Dean Herbert a2d505af78 ToolbarButtons should still handle MouseDown events. 2016-11-15 20:55:52 +09:00
Dean Herbert f415e5820f Add an implementation of the new design of checkboxes. 2016-11-15 19:35:01 +09:00
Dean Herbert 5b1711f797 Update some colour palette discrepancies in options. 2016-11-15 19:34:58 +09:00
Dean Herbert 1f73bb4cf0 Set drag bar to correct orange. 2016-11-15 19:34:55 +09:00
Dean Herbert a92404413c Adjust padding and fonts of options. 2016-11-15 19:34:53 +09:00
Dean Herbert 2cbe2b34fd Change default font weight to Medium. 2016-11-15 19:34:50 +09:00
Dean Herbert 566e09083f Add gradient overlay when hovering toolbar to make tooltips more visible. 
Also adjusts opacity of toolbar.
 2016-11-15 16:25:41 +09:00
Dean Herbert 4b6c139c3e Toolbar buttons should handle on click, not mouse down. 2016-11-15 15:31:48 +09:00
Dean Herbert 867797a089 Change volume control mouse wheel behaviour to not gain full-screen focus. 2016-11-15 15:22:14 +09:00
Dean Herbert 51235343fd Fix ChatConsole regression. 2016-11-15 14:46: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
Thomas Müller 997bc16d63 Fix incorrect positioning of ButtonSystem. 2016-11-14 19:18:16 +01:00
Huo Yaoyuan dcd3ba0915 Make Player.Autoplay can be set. 2016-11-15 01:49:06 +08:00
Huo Yaoyuan f2f6fe8e00 Set option object to members. 2016-11-15 01:49:06 +08:00
Huo Yaoyuan c8d23408d7 Fix ChatLine for now. 2016-11-15 01:49:05 +08:00
Huo Yaoyuan 1cddc4eb5b Use EqualityComparer<T> to avoid boxing and casting when comparing. 2016-11-15 01:49:05 +08:00
Tom94 c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01:00
Dean Herbert 08bf7c6d39 Make abstract ruleset no play mode. 2016-11-15 01:06:53 +09:00
Dean Herbert e01057df3d Add thread safety somewhere it will never be required. 2016-11-14 23:13:47 +09:00
Dean Herbert 9a8003f6fa Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure 
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
 2016-11-14 22:08:30 +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 0011d7f720 Simplify linq. 2016-11-14 20:24:44 +09:00
Dean Herbert 5dd4e31011 Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Dean Herbert 07fee61989 Use reflection to load Rulesets. 2016-11-14 19:20:27 +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 0b203a7bf4 Move enum to end of file. 2016-11-14 16:50:17 +09:00
Dean Herbert dde3a68c8f Account for anchor when dragging MusicController (fixes VisualTest). 2016-11-14 16:40:13 +09:00
Dean Herbert 1d51e6af2a Merge pull request #168 from huoyaoyuan/fixes 
Fixes for music controller
 2016-11-14 16:11:31 +09:00
Dean Herbert eb32d842cc Use switch instead of if-else. 2016-11-14 16:10:07 +09:00
Dean Herbert 57c4314cae Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements 2016-11-14 16:00:06 +09:00
Dean Herbert c37afd7a81 Merge pull request #166 from Tom94/various-improvements 
Various improvements
 2016-11-14 15:59:17 +09:00
Huo Yaoyuan 86a6c7641d Make TransformDirection more clear. 2016-11-14 04:59:41 +08:00
Huo Yaoyuan 7c8ef2a82b Select and unselect BeatmapPanel when selecting BeatmapGroup. 2016-11-14 04:22:06 +08:00
Huo Yaoyuan 33a35ca711 Do not set WorkingBeatmap explicitly in mode stack. 2016-11-14 04:01:48 +08:00
Huo Yaoyuan afab938794 Strongly typed TransformDirection for music controller. 2016-11-14 03:21:07 +08:00
Thomas Müller ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Thomas Müller 16dc74df5b Avoid stack overflow when trying to push a not-yet async loaded background. 2016-11-12 18:33:47 +01: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
Thomas Müller 6355c8bd45 Hide scrolldragger in options. 2016-11-12 13:10:53 +01:00
Thomas Müller 1c47773e0d Make sidebar behaviour feel a bit nicer. 2016-11-12 13:08:34 +01:00
Thomas Müller e923da1998 Fix lastKnownScroll never being written to. 2016-11-12 12:30:12 +01:00
Thomas Müller 98b69bc6c6 Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 12:24:02 +01:00
Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
 2016-11-12 20:18:26 +09:00
Dean Herbert 646fe5c5f4 Merge pull request #155 from peppy/player-improvements 
Introduce back the concept of Rulesets.
 2016-11-12 18:34:32 +09:00
Dean Herbert 80f146e4bd Fix a locally set beatmap getting overridden by the game-global one. 2016-11-12 18:26:27 +09:00
Dean Herbert 099b309645 Introduce back the concept of Rulesets. 2016-11-12 18:26:21 +09:00
Dean Herbert 16a0be44df Add local InputManager to Player; handle Z and X. 2016-11-12 18:26:14 +09:00
Dean Herbert 18c0e431c1 Fix some nullrefs. 2016-11-12 18:25:58 +09:00
Dean Herbert 3b99a8fd06 Add a shadow and bit of elasticity to MusicController. 2016-11-12 17:09:58 +09:00
Dean Herbert b65eb33774 Fix weird artifacting when the MusicController fades in and out by using a buffered container. 2016-11-12 16:44:31 +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
Dean Herbert 12bc259071 Merge pull request #158 from SirCmpwn/implement-options 
Implement ShowUnicode option behavior
 2016-11-12 16:10:27 +09:00
Dean Herbert a39d28efe2 Merge pull request #159 from SirCmpwn/platform-options 
Remove certain options when not running on Windows
 2016-11-12 16:05:47 +09:00
Drew DeVault 00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
Drew DeVault a8bba445db Move scroll logic into Update 2016-11-12 01:44:26 -05:00
Drew DeVault 32196c57af Track the visible section in options 2016-11-12 01:44:11 -05:00
Dean Herbert ff67b77c5b Merge pull request #154 from peppy/sidebar-toolbar-coexistence 
Make options overlay coexist with toolbar.
 2016-11-11 13:34:08 +09:00
Dean Herbert 27542d9747 Merge pull request #151 from SirCmpwn/options-sidebar 
Expand the options sidebar on hover
 2016-11-11 13:33:10 +09:00
Dean Herbert a0e1513df6 Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence 
# Conflicts:
#	osu.Game/OsuGame.cs
 2016-11-11 13:30:57 +09:00
Drew DeVault d36c8e9203 Remove certain options when not running on Windows 2016-11-10 21:54:01 -05:00
Drew DeVault d49b418449 Implement ShowUnicode option behavior 2016-11-10 21:35:58 -05:00
Drew DeVault e2365cfad2 s/internalText/InternalText/g 2016-11-10 18:25:20 -05:00
Drew DeVault a81f099d40 Add TextBoxOption and wire it up 2016-11-10 18:17:15 -05:00
Drew DeVault 0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
Drew DeVault 7327db307b Fix player loading from song select 2016-11-10 16:43:04 -05:00
Drew DeVault 2362665b8a Re-cache the new FontStore when overwritten 
Fixes issues with font loading
 2016-11-10 16:43:04 -05:00
Drew DeVault fe9034323b Get the game running, though not perfectly 2016-11-10 16:42:29 -05:00
Drew DeVault ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Drew DeVault dc03f36793 Use DI for Player 2016-11-10 16:38:44 -05:00
Drew DeVault 19fd6fe249 Introduce dependency injection 2016-11-10 16:38:25 -05:00
Dean Herbert 788c11de10 Merge pull request #103 from huoyaoyuan/music-controller 
Music controller
 2016-11-10 12:54:56 +09:00
Dean Herbert 904d258dc3 Fix checkbox not updating correctly. 2016-11-09 20:13:13 +09:00
Dean Herbert a5dcae859c Give OptionsOverlay an offset to make up for toolbar possibly being present. 2016-11-09 15:24:27 +09:00
Dean Herbert d9bd3717d0 Re-organise overlay-level elements in OsuGame. 2016-11-09 15:24:24 +09:00
Dean Herbert fdb83bed79 Make OsuGameModes self-aware of if they want a toolbar or not. 2016-11-09 15:24:22 +09:00
Dean Herbert 9d1d5a5cea Modify toolbar tooltips to be closer to design. 2016-11-09 15:24:19 +09:00
Drew DeVault 676cdc44b2 Add expanding options sidebar 2016-11-08 23:36:06 -05:00
Drew DeVault 3ad633f363 Wire up all of the boolean options 2016-11-08 23:17:08 -05:00
Dean Herbert 04fa1f897e Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling. 2016-11-09 12:32:38 +09:00
Dean Herbert d41d7b8e9a Don't derive ScrollContainer unnecessarily. 2016-11-09 12:10:22 +09:00
Dean Herbert d70e8806b4 Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes 2016-11-09 11:41:36 +09:00
Dean Herbert 28a94e2df1 Remove unused constant. 2016-11-08 20:35:21 +09:00
Dean Herbert 3ef26a6bf0 Fix paddings, transitions, const variable names. 2016-11-08 20:23:18 +09:00
Dean Herbert 97f3023cd9 Ctrl+O for options. 2016-11-08 19:27:37 +09:00
Dean Herbert 4426a683ed Move OptionsOverlay to OsuGame. 2016-11-08 19:26:12 +09:00
Dean Herbert 89b11ed099 Handle sidebar buttons onClick not onMouseDown. 2016-11-08 19:18:31 +09:00
Dean Herbert 8c68f9ba93 OptionsSideNav -> OptionsSidebar. 2016-11-08 19:17:09 +09:00
Dean Herbert 3b0114671e Max sidebar draggable. 2016-11-08 19:16:39 +09:00
Dean Herbert 30323876a8 Use preload for options (fix icons). 2016-11-08 18:49:20 +09:00
Dean Herbert a851d7b44f Updates. 2016-11-08 18:33:31 +09:00
Dean Herbert c36b54b35a Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container 2016-11-08 18:29:21 +09:00