Dean Herbert
d71b284642
Make ScoreProcessor abstract and avoid making AddJudgement virtual.
2016-11-29 22:02:37 +09:00
Dean Herbert
eb70ae788c
Store max combo in ScoreProcessor.
2016-11-29 21:57:53 +09:00
Dean Herbert
18d331f869
Add combo info to JudgementInfo.
2016-11-29 21:46:30 +09:00
Dean Herbert
f8c1f4dd58
Add basic slider judgement handling.
2016-11-29 21:40:24 +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
fbf35c904d
Fix Config regression with DI.
2016-11-29 18:49:03 +09:00
Dean Herbert
fa80cc84f8
Fix volume control fill being incorrect on first display.
2016-11-29 18:35:59 +09:00
Dean Herbert
139fe873f3
Remove silly weld weld weld.
2016-11-29 18:35:40 +09:00
Dean Herbert
9871960112
Basic score flow.
2016-11-29 17:34:16 +09:00
Dean Herbert
a47507fff3
Remove redundant property assignments.
2016-11-29 16:54:54 +09:00
Dean Herbert
3526c299ec
Reformat code.
2016-11-29 16:24:37 +09:00
stanriders
2ecf72d0d7
More consts, less crap (probably)
2016-11-29 05:36:48 +03:00
Dean Herbert
a506e91b7c
Fix compile issues.
2016-11-28 23:05:05 +09:00
Dean Herbert
49470318f2
Remove silly static using statement.
2016-11-28 22:48:28 +09:00
Dean Herbert
187a8bbfa7
Don't store beatmap reference in hitobjects.
2016-11-28 18:45:50 +09:00
Dean Herbert
bf63be0602
Add better slider duration calculation using bpm and difficulty information.
2016-11-28 15:31:54 +09:00
Dean Herbert
a5651427f6
Add basic ControlPoint parsing.
2016-11-28 15:12:11 +09:00
stanriders
775e8ac5d6
Hardcoded button size, fixed input handling, fixed flash not being visible
2016-11-27 18:56:05 +03:00
Thomas Müller
bd872f6ab8
Explicitly make various member variabled of CursorTrail private.
2016-11-27 15:04:56 +01:00
Thomas Müller
724f849543
Fix incorrect BeatmapPanel border caused by triangles.
2016-11-27 11:49:51 +01:00
stanriders
fb3d5a3b79
One more
2016-11-27 07:18:56 +03:00
stanriders
a3ceef48a6
More backbutton
2016-11-27 07:06:50 +03:00
stanriders
88ead18929
Backbutton improvements
2016-11-27 06:50:36 +03: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
Thomas Müller
069a19a916
Make CursorTrail efficient and add colouring and transparency support.
2016-11-26 18:01:24 +01:00
Thomas Müller
23d0e52d4f
Optimize draw portion of cursor trail.
2016-11-26 14:08:43 +01:00
Dean Herbert
be0cc7badc
Code tidying.
2016-11-26 19:25:58 +09:00
Dean Herbert
c978a4c091
Tidy up code. Make trail smooth.
2016-11-26 19:22:56 +09: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
a1c3d15e6c
Add triangles to difficulty panels.
2016-11-26 17:10:13 +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
Drew DeVault
69cb9cf4de
Fix up volume encapsulation
2016-11-25 00:21:42 -05:00
Drew DeVault
a3db259071
Fix VolumeMeter.Bindable
2016-11-25 00:21:42 -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
Dean Herbert
f540bf3765
Ensure set headers are above difficulties.
2016-11-25 12:48:59 +09:00
Dean Herbert
35a02aa972
Fade in headers but not difficulties by default.
2016-11-25 12:48:41 +09:00
Dean Herbert
12c74b1b0b
Don't set hidden; make it based on alpha value.
2016-11-25 12:47:58 +09:00
Tom94
97b0da1d6b
Merge branch 'master' of github.com:ppy/osu into general-fixes
2016-11-24 20:26:44 +01: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
3dff72ac6c
Bypass masking checks for input on playfields.
2016-11-24 18:59:09 +09:00
Dean Herbert
c48acd4c3d
Fix coordinates being in wrong space.
2016-11-24 16:17:40 +09:00
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
Drew DeVault
743c1bde58
Wire up alternative chat font
2016-11-07 22:37:21 -05:00
Drew DeVault
1bca78f4b6
Wire up one of the settings to the config
...
One step at a time, right
2016-11-07 22:36:24 -05:00
Drew DeVault
fbbd05e606
Remove unnecessary TODO
2016-11-07 22:28:02 -05:00
Drew DeVault
a6593505b3
Say NO to RelativeSizeAxes = Both
2016-11-07 22:19:02 -05:00
Drew DeVault
4d04eb6fb1
Rearrange some options a bit, update framework
2016-11-07 22:15:48 -05:00
Drew DeVault
cbbac0565f
Remove unused using statements
2016-11-07 21:28:06 -05:00
Drew DeVault
1ce6a7285a
Rearrange options namespaces
2016-11-07 21:24:41 -05:00
Drew DeVault
b2bbdfa284
Refactor how the sidebar buttons are created/used
2016-11-07 18:04:49 -05:00
Drew DeVault
e6c3fc1091
Implement scrolling to each section
2016-11-07 17:07:55 -05:00
Huo Yaoyuan
ef5968e243
More robust metadata handling.
2016-11-07 23:12:49 +08:00
Huo Yaoyuan
fd977cacb3
Fix corner case when shuffling.
2016-11-07 23:06:14 +08:00
Huo Yaoyuan
02b903f1ea
Shuffle playlist.
2016-11-07 22:12:58 +08:00
Huo Yaoyuan
dc347a74f5
Don't play transition if audio equals.
2016-11-07 21:58:30 +08:00
Huo Yaoyuan
c59cad2478
AudioEquals method for BeatmapInfo.
2016-11-07 21:52:23 +08:00
Huo Yaoyuan
d1f64cfbfc
Make external changes into history.
2016-11-07 21:30:25 +08:00
Huo Yaoyuan
ad1dccf6ce
Use play history for back and forward.
2016-11-07 21:25:37 +08:00
Huo Yaoyuan
644e337cf6
Add a list for play history.
2016-11-07 20:57:33 +08:00
Dean Herbert
d57d5daac9
Support generic FlowContainer.
2016-11-07 21:17:29 +09:00
Dean Herbert
a61fb5ef5d
Initial updates to make generic containers work.
2016-11-07 21:13:56 +09:00
Huo Yaoyuan
c272041f37
Block click and drag at MusicController level.
2016-11-07 20:07:45 +08:00
Huo Yaoyuan
736079a60d
Update FontAwesome usage.
2016-11-07 19:00:20 +08:00
Huo Yaoyuan
8037f1233f
Merge branch 'master'
2016-11-07 18:58:35 +08:00
Dean Herbert
f14a35d480
Update FontAwesome definitions.
2016-11-07 17:59:00 +09:00
Thomas Müller
90c889a7ce
Smoothen wedged buttons in main menu and the wedges on song select background.
2016-11-06 19:34:44 +01:00
Thomas Müller
103176826f
Ensure transformations are never used prior to being added to the Drawable tree.
2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843
Merge branch 'master' of github.com:ppy/osu into better-clocks
...
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2
Remove now obsolete clock usages.
2016-11-06 10:06:09 +01:00
Huo Yaoyuan
c8a7bd2ece
Minor implementation changes.
2016-11-06 16:47:37 +08:00
Huo Yaoyuan
000c2218b8
Make background update happens in update thread, and thread-safer.
2016-11-06 16:34:47 +08:00
Thomas Müller
8894e5f73a
Fade the options overlay to prevent unnecessary updates to its content.
2016-11-06 08:54:36 +01:00
Thomas Müller
a6c0fd29f2
Make use of new timing system in Drawables and Transforms.
2016-11-06 08:25:21 +01:00
Maciej
bcc1d7c669
Background scaling different approach
2016-11-06 04:37:41 +01:00
Maciej
c4132339a6
Working beatmap background scaling fix
...
Add a check for the working beatmap background width and assign a proper
scaling value to cover the whole box
2016-11-06 04:12:35 +01:00
Huo Yaoyuan
d63e3b6724
Add fallback texture of beatmap when getting null;
2016-11-06 05:37:55 +08:00
Huo Yaoyuan
0c6825bb20
Adjust visual behavior.
2016-11-06 05:35:35 +08:00
Huo Yaoyuan
c53298a3b1
Update font size (*1.25) to follow the design image.
2016-11-06 01:53:10 +08:00
Huo Yaoyuan
74000f77ad
Set font in music controller.
2016-11-06 01:50:38 +08:00
Huo Yaoyuan
a19bb1270d
Async workflow on music controller.
2016-11-06 00:46:09 +08:00
Huo Yaoyuan
859a59a8ab
Set children in constructor.
2016-11-06 00:24:03 +08:00
Huo Yaoyuan
5eed07db57
Update access of WorkingBeatmap.
2016-11-06 00:13:45 +08:00
Huo Yaoyuan
c470140d64
Merge branch 'master'
2016-11-06 00:11:30 +08:00
Dean Herbert
3c8f94dd0f
Merge pull request #136 from Tom94/general-fixes
...
Fix wrong initial state of beatmap panels.
2016-11-05 23:04:37 +09:00
Thomas Müller
7c7e2160ec
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
2016-11-05 14:05:42 +01:00
Thomas Müller
619d97c642
Fix indentation and typo.
2016-11-05 13:51:52 +01:00
Thomas Müller
07e74068e7
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-05 13:35:15 +01:00
Huo Yaoyuan
e69dac7745
Fix lock object.
2016-11-05 20:21:08 +08:00
Huo Yaoyuan
f2b37e1fe7
Add lock on each property of WorkingBeatmap.
2016-11-05 20:01:46 +08:00
Thomas Müller
ba39a9df8e
Fix wrong initial state of beatmap panels.
2016-11-05 12:24:15 +01:00
Dean Herbert
a11d534067
Add beatmap backgrounds.
2016-11-05 20:00:14 +09:00
Dean Herbert
7cc19d74c6
Add full Exo font set and bring song select panels closer to final design.
2016-11-05 18:22:09 +09:00
Dean Herbert
8fe63689a4
Fix thread safety issue when accessing files in beatmap (zip) files.
2016-11-05 18:19:01 +09:00
Dean Herbert
2ee5e2efb7
Bring framework up-to-date.
...
# Conflicts:
# osu-framework
2016-11-05 18:18:52 +09:00
Huo Yaoyuan
2d86cb1e81
Merge branch 'master'
2016-11-05 16:21:59 +08:00
Dean Herbert
10f2ed4387
Add explicit privates.
2016-11-04 16:12:35 +09:00
Dean Herbert
b17d219ace
Share Triangles logic.
2016-11-04 16:11:22 +09:00
Dean Herbert
108b7092c9
Fix regression in hitcircle appearance.
2016-11-04 16:08:04 +09:00
Dean Herbert
9df43c6d33
Fix draw order of hitobjects.
2016-11-04 15:43:53 +09:00
Dean Herbert
da18e2d4f6
Fix off-by-one colour retrieval.
2016-11-04 15:43:53 +09:00
Dean Herbert
b72e9221fd
Only add valid hitobjects.
2016-11-04 15:43:53 +09:00
Dean Herbert
74c655ebfc
Fix input not working.
2016-11-04 15:43:53 +09:00
Dean Herbert
b40ccccbe4
Add HitObject colours back in the mix.
2016-11-04 15:43:53 +09:00
Dean Herbert
92b85b251e
Fix scale more.
2016-11-04 15:43:53 +09:00
Dean Herbert
e939746159
Fix scale ratio of gamefield.
2016-11-04 15:43:53 +09:00
Dean Herbert
788cba6f4d
Add autoplay toggle (const).
2016-11-04 15:43:53 +09:00
Dean Herbert
f5f5aa9eac
Fix some incorrect default values.
2016-11-04 15:43:53 +09:00
Dean Herbert
a4e2f25065
Flush recursively, more transform tidying.
2016-11-04 15:43:53 +09:00
Dean Herbert
1854160321
Add hit time and the ability for an external operator to block hits.
2016-11-04 15:43:53 +09:00
Dean Herbert
fbaae94ba4
Limit state changes to apply only once.
2016-11-04 15:43:53 +09:00
Dean Herbert
8d4e7038b3
Part -> Layer.
2016-11-04 15:43:53 +09:00
Dean Herbert
bc53642cab
Fix some warnings.
2016-11-04 15:40:05 +09:00
Dean Herbert
10e5472624
Block mouse events from hitting things behind options.
2016-11-04 12:29:05 +09:00
Dean Herbert
2135b93791
Make options semi-transparent.
2016-11-04 12:28:00 +09:00
Dean Herbert
f3d461e318
Fix some events not firing correctly.
2016-11-04 12:27:43 +09:00
Drew DeVault
408173319b
Refactor options header and layout stuff
2016-11-03 23:01:11 -04:00
Drew DeVault
cb40b7079f
Rework how references are passed about
2016-11-03 22:43:00 -04:00
Drew DeVault
af8e4415c3
Split out [Sub]sections into seperate files
2016-11-03 19:06:22 -04:00
Drew DeVault
1d8c6db0a7
Add remaining options
2016-11-03 19:06:22 -04:00
Drew DeVault
c7fa0a5ab0
Add more options
2016-11-03 19:06:22 -04:00
Drew DeVault
7e77efcfdc
Add Graphics options
2016-11-03 19:06:22 -04:00
Drew DeVault
6c0cef894e
Add OsuButton with sane defaults
2016-11-03 19:06:22 -04:00
Drew DeVault
2aa85a4b18
Split up options into subclasses
2016-11-03 19:06:22 -04:00
Drew DeVault
2f990b884e
Tweak style to more closely match osu!next
2016-11-03 19:06:22 -04:00
Drew DeVault
40e667b2d8
Add default values from old osu
2016-11-03 19:06:22 -04:00
Drew DeVault
89d3f4c2be
Import enum from old osu
2016-11-03 19:06:22 -04:00
Drew DeVault
dd0cb5da01
Add options from old osu
2016-11-03 19:06:22 -04:00
Drew DeVault
9f78f8607b
Implement General options section
2016-11-03 19:06:22 -04:00
Drew DeVault
2aaff01675
Implement config persistence through BasicStorage
2016-11-03 19:06:22 -04:00
Huo Yaoyuan
9e0fbed748
Use PreLoad on music controller.
2016-11-03 22:38:10 +08:00
Huo Yaoyuan
f2a8cc0c29
Merge branch 'master'
2016-11-03 20:38:34 +08:00
Dean Herbert
439204b4fa
Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow
2016-11-03 16:44:49 +09:00
Dean Herbert
54dbb0a355
Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow
...
# Conflicts:
# osu.Game/Beatmaps/Drawable/Panel.cs
2016-11-02 16:43:35 +09:00
Dean Herbert
617a3f5c4f
Adjust glow colour slightly.
2016-11-02 10:22:46 +09:00
Dean Herbert
2811d55e13
Merge pull request #120 from Tom94/fix-beatmap-panel-border-alpha
...
Fix beatmap panel border alpha being way too large.
2016-11-02 09:57:32 +09:00
Thomas Müller
50de8528a5
Use better glow in beatmap selection.
2016-11-01 22:57:11 +01:00
Thomas Müller
128ec8f767
Fix beatmap panel border alpha being way too large.
2016-11-01 22:21:09 +01:00
Dean Herbert
3d611dd57b
Improve coodination of startup sequence.
2016-11-02 01:02:48 +09:00
Dean Herbert
c78e3efc66
Schedule some illegal calls.
2016-11-02 01:02:34 +09:00
Dean Herbert
774b47c1fe
Don't cache drawable for no reason.
2016-11-02 00:53:13 +09:00
Drew DeVault
0edfeaaff9
Move wedgeContainer transition to OnEntering
2016-11-01 09:22:49 -06:00
Dean Herbert
b86f308af6
Add async workflow.
2016-11-01 23:24:14 +09:00
Drew DeVault
e5f948dccc
Fade song select wedges in
2016-10-31 16:16:11 -06:00
Adonais Romero González
fd0900eb3c
I knew I forgot something >:(
2016-10-29 18:42:40 -05:00
Adonais Romero González
ef9d2b5b3c
Minor improvements to combo counters
2016-10-29 18:26:12 -05:00
Dean Herbert
d8ca11bf0d
Use Any instead of First to avoid potential throw.
2016-10-29 04:29:43 +09:00
Dean Herbert
a2f995ebe0
Remove forgotten parens.
2016-10-29 03:44:27 +09:00
Dean Herbert
d47924ff7b
Fix selection not collapsing when clicking set headers exclusively.
2016-10-29 03:43:52 +09:00
Dean Herbert
c969e0b4f0
Remove forced disposal of WorkingBeatmap.
2016-10-29 03:31:40 +09:00
Dean Herbert
eb30882b09
More comments.
2016-10-28 23:40:12 +09:00
Dean Herbert
f0e4a252a5
Add some warning comments.
2016-10-28 23:35:49 +09:00
Dean Herbert
42ad96778e
Tidy shit up; reduce number of unnecssesary events being fired.
2016-10-28 23:29:21 +09:00
Huo Yaoyuan
f1837b4822
Fix changed event and no longer auto play on load.
2016-10-28 21:57:23 +08:00
Huo Yaoyuan
7543d491ae
Add music controller into game.
2016-10-28 21:21:47 +08:00
Huo Yaoyuan
6aba03e1ca
OsuGameMode<-WorkingBeatMap->OsuGameBase.
2016-10-28 21:03:59 +08:00
Huo Yaoyuan
3858c77817
No longer holds OsuGame reference.
2016-10-28 20:47:27 +08:00
Huo Yaoyuan
9b76110605
Interaction with external changes.
2016-10-28 20:44:59 +08:00
Huo Yaoyuan
36cefcb956
Fix to work individually.
2016-10-28 20:34:22 +08:00
Huo Yaoyuan
aa107de162
Store a local copy of WorkingBeatmap.
2016-10-28 20:27:44 +08:00
Dean Herbert
5dc495e41d
Avoid accessing the beatmap too early.
2016-10-28 21:08:32 +09:00
Huo Yaoyuan
7d14e6e6cf
Make prev and next work again.
2016-10-28 20:08:27 +08:00
Huo Yaoyuan
b7ada4866e
Merge remote-tracking branch 'peppy/lets-play' into music-controller
2016-10-28 19:47:35 +08:00
Huo Yaoyuan
7d6e4a8ad2
Make music controller uses WorkingBeatmap.
2016-10-28 19:39:02 +08:00
Dean Herbert
10ef34b805
Lazy parse beatmap; Don't reload audio track if it hasn't changed.
2016-10-28 20:24:14 +09:00
Huo Yaoyuan
7e2350cb13
Merge remote-tracking branch 'refs/remotes/peppy/lets-play'
2016-10-28 19:07:29 +08:00
Dean Herbert
74f1a9622f
Add initial game-wide beatmap flow.
2016-10-28 19:55:48 +09:00
Dean Herbert
0f5614ffa2
Only allow osu! mode maps to be played for now.
2016-10-28 18:07:42 +09:00
Dean Herbert
209f09df91
Don't exception on inability to read audio track.
2016-10-28 18:03:26 +09:00
Dean Herbert
13b5fb0578
Update transforms to not accept clock.
2016-10-28 17:42:00 +09:00
Dean Herbert
0e39c5cc9c
Move Results to own namespace.
2016-10-28 16:10:10 +09:00
Dean Herbert
856e056515
Remove unnecessary finaliser.
2016-10-28 14:18:00 +09:00
Dean Herbert
feccb7286c
Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.
2016-10-28 14:14:45 +09:00
Dean Herbert
2cdda98b47
Add the ability to retrieve (fallback) metadata from a beatmap.
2016-10-28 14:13:52 +09:00
Dean Herbert
012c29addb
Minor fixes to player flow.
2016-10-27 22:27:45 +09:00
Huo Yaoyuan
eab8caaa0c
Ensure track is playing after seek.
2016-10-27 19:51:38 +08:00
Dean Herbert
d6ed055682
Don't hard-crash on failing to load a beatmap.
2016-10-27 20:37:01 +09:00
Dean Herbert
d9dfc324c1
Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible.
2016-10-27 19:52:48 +09:00
Huo Yaoyuan
73d1eeb272
Update MusicController using DragBar.
2016-10-27 18:15:43 +08:00
Huo Yaoyuan
35b1d0ae50
Seperated DragBar class.
2016-10-27 18:14:50 +08:00
Huo Yaoyuan
9c2d3990ce
Add spacing in code.
2016-10-27 17:04:41 +08:00
Huo Yaoyuan
3e30935d10
Allow to set database of music controller.
2016-10-27 16:58:40 +08:00
Dean Herbert
c828b1bc7b
Add comment about optional database parameter.
2016-10-27 17:53:47 +09:00
Dean Herbert
9074bc3396
Allow Player to load from BeatmapInfo.
2016-10-27 17:53:37 +09:00
Dean Herbert
a764a97602
Use memory database again, local to TestCasePlaySongSelect.
2016-10-27 17:35:00 +09:00
Dean Herbert
33ef55df88
Allow BeatmapDatabase to be constructed without a host.
2016-10-27 17:34:50 +09:00
Dean Herbert
f16cc430f8
Stop using memory database. Load sample data local to TestCase.
...
Also makes the connection private.
2016-10-27 17:08:53 +09:00
Huo Yaoyuan
6482184a09
Dispose ArchiveReader.
2016-10-27 13:34:54 +08:00
Huo Yaoyuan
fead1d4c6f
Seek by clicking and dragging on progress bar.
2016-10-27 13:34:53 +08:00
Huo Yaoyuan
d9fc04748e
Remove redundant class.
2016-10-27 13:34:52 +08:00
Huo Yaoyuan
0da78c19a2
TestCase reset.
2016-10-27 13:34:51 +08:00
Huo Yaoyuan
b671a33911
Transition fixes and clock for VisualTest.
2016-10-27 13:34:51 +08:00
Huo Yaoyuan
8e766a1f47
Show playing progress.
2016-10-27 13:34:50 +08:00
Huo Yaoyuan
1a3a5c544d
Button behavior fixes.
2016-10-27 13:34:49 +08:00
Huo Yaoyuan
a32f9eed51
Play control.
2016-10-27 13:34:48 +08:00
Huo Yaoyuan
d2495e34fb
Query from beatmap database.
2016-10-27 13:34:47 +08:00
Huo Yaoyuan
303bd41765
Background scale.
2016-10-27 13:34:46 +08:00
Huo Yaoyuan
b0d72c5f84
Button and text.
2016-10-27 13:34:45 +08:00
Huo Yaoyuan
0f2b5e8370
Layers.
2016-10-27 13:34:44 +08:00
Huo Yaoyuan
e1f6ab1a42
Create MusicController UI class and visual test.
2016-10-27 13:34:43 +08:00
Dean Herbert
debea59bab
Merge pull request #61 from SirCmpwn/song-select
...
Song select
2016-10-27 13:54:34 +09:00
Dean Herbert
456169f182
Move BeatmapGroupState to outside class definition.
2016-10-27 13:42:37 +09:00
Dean Herbert
abfad501b6
beatmapSet can be private.
2016-10-27 13:41:30 +09:00
Dean Herbert
ce73ae792f
Change panel selection logic to avoid looping.
2016-10-27 13:36:04 +09:00
Dean Herbert
ba5b2f2d73
Remove difficulty width offsets and tidy up flow of information.
2016-10-27 12:31:45 +09:00
Dean Herbert
f846505a92
Tidy namespaces.
2016-10-27 12:01:13 +09:00
Dean Herbert
104cedba19
Merge pull request #109 from peppy/volume-control-input-fix
...
Fix volume control input handling.
2016-10-27 11:45:09 +09:00
Drew DeVault
9c27c33e18
Use IStateful and improve collapse logic
2016-10-26 12:49:16 -04:00
Drew DeVault
55e5ec6fae
General cleanup per PR feedback
2016-10-26 10:52:40 -04:00
Drew DeVault
157512b45f
Merge branch 'master' into song-select
2016-10-26 10:37:18 -04:00
Dean Herbert
3f23900347
Framework & OpenTK updates.
2016-10-26 23:13:44 +09:00
Dean Herbert
ee8b678989
Fix volume controls handling mouse wheel at a higher level than anything else game-wide.
2016-10-26 18:45:48 +09:00
Drew DeVault
5e9495d21d
Fix performance issues with song select
2016-10-25 16:49:10 -04:00
Drew DeVault
063fdd9a2d
Add test data to db for VisualTests
...
Also fixes the broken IPC condition
2016-10-24 14:57:00 -04:00
Drew DeVault
a1019f91ba
Fix auto size on BeatmapSetBox difficulties
2016-10-24 11:39:53 -04:00
Drew DeVault
b0898a3ce0
Fix sizing of setList flow container
2016-10-24 11:39:53 -04:00
Drew DeVault
86bbe8688b
Fix issues with invisible beatmaps
2016-10-24 11:39:53 -04:00
Drew DeVault
ff1a5187cd
Implement fixes related to auto size changes
2016-10-24 11:39:53 -04:00
Drew DeVault
e5168f8da8
Implement handoff to Player
2016-10-24 11:39:53 -04:00
Drew DeVault
cfc920c9c1
Implement Play button, drop textures
2016-10-24 11:39:53 -04:00
Dean Herbert
d3a857edb9
Make importing work properly.
...
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
Dean Herbert
0c9e26e546
Return the populated item when calling GetChildren to write more elegant code.
2016-10-24 11:39:18 -04:00
Dean Herbert
6f80efdb29
Add a database reset method.
2016-10-24 11:39:18 -04:00
Dean Herbert
7650bb1707
Don't insert to database until we're completely finished importing a beatmap.
2016-10-24 11:39:18 -04:00
Dean Herbert
ee6c810df5
Fix cascading inserts.
2016-10-24 11:39:18 -04:00
Drew DeVault
42f8d19c73
Sort by difficulty and fix relationship
2016-10-24 11:39:18 -04:00
Drew DeVault
8d6431b35e
Add star counter to difficulty select
2016-10-24 11:39:18 -04:00
Drew DeVault
910a079bda
Add animation, selection indicator to difficulties
2016-10-24 11:39:18 -04:00
Drew DeVault
4b6a1486a6
Increase spacing to match mockups
2016-10-24 11:39:18 -04:00
Drew DeVault
61a7ccaece
Remove dependency on DeferredSprite
2016-10-24 11:39:18 -04:00
Drew DeVault
33fc60716d
Fix assertion failures
2016-10-24 11:39:18 -04:00
Drew DeVault
cfa637b763
Select first difficulty by default
2016-10-24 11:39:18 -04:00
Drew DeVault
51791bba7f
Tweak play button
2016-10-24 11:39:18 -04:00
Drew DeVault
4dcdc8638e
Add beatmap difficulty selection logic
2016-10-24 11:39:18 -04:00
Drew DeVault
941687e091
Add glow to beatmap groups
2016-10-24 11:39:18 -04:00
Drew DeVault
bc959f74a5
Add background textures to beatmap sets
...
Needs osu-framework#189
2016-10-24 11:39:18 -04:00
Drew DeVault
6da092ab30
Fix additional bugs, tweak L+F
2016-10-24 11:39:18 -04:00
Drew DeVault
8d4a211419
Fix initialization of BeatmapInfo
2016-10-24 11:39:18 -04:00
Drew DeVault
3ee0bf2b80
Fix cascade insert
2016-10-24 11:39:18 -04:00
Drew DeVault
641855c790
Fix issues with beatmap import file contention
2016-10-24 11:39:18 -04:00
Drew DeVault
c41b3d92c6
Fix up wrt upstream development
2016-10-24 11:39:18 -04:00
Drew DeVault
8e31965fb4
Refactor beatmap import secondary process
...
Doesn't launch a new game window and now supports several files at once.
2016-10-24 11:39:18 -04:00
Drew DeVault
9426629853
Don't crash if you leave and return to song select
...
During visual tests
2016-10-24 11:39:18 -04:00
Dean Herbert
9a66d766e9
Don't bail on no beatmaps in database.
2016-10-24 11:39:18 -04:00
Drew DeVault
9b88798274
Fix up padding on song select
...
@peppy btw scrolling beyond the ends of the ScrollContainer behaves
weirdly for this container
2016-10-24 11:39:18 -04:00
Drew DeVault
05d803483f
Fix width of beatmaps
2016-10-24 11:39:18 -04:00
Drew DeVault
07e44560be
Use beatmap author in listing
2016-10-24 11:39:18 -04:00
Drew DeVault
7a22c60c7c
Get some more of the design's layout in place
2016-10-24 11:39:18 -04:00
Drew DeVault
e13374ed23
Tweak layout of beatmap groups
2016-10-24 11:39:18 -04:00
Drew DeVault
3d53af155f
Add background to song select
2016-10-24 11:39:18 -04:00
Drew DeVault
71f58285fc
Add selection interactions
2016-10-24 11:39:18 -04:00
Drew DeVault
bc6e705e2b
Add test case for song selection
2016-10-24 11:39:18 -04:00
Drew DeVault
d21b7f0050
Fix up song select based on upstream changes
2016-10-24 11:39:18 -04:00
Drew DeVault
22fdb3e49a
Adjust PlaySongSelect to match UI standards
2016-10-24 11:39:11 -04:00
Drew DeVault
674f624bfc
Improve song selection layout, database loading
...
Also adds event that notifes the song select when a beatmap is added.
2016-10-24 11:39:11 -04:00
Drew DeVault
a14edc06c8
Pull beatmap list from db and render simple list
2016-10-24 11:39:11 -04:00
Dean Herbert
1ce16afa23
Update nuget package versions.
2016-10-24 22:46:44 +09:00
Dean Herbert
bd1a1644fd
Fix window size saving to config incorrectly.
2016-10-23 01:35:11 +09:00
Dean Herbert
e4c74f9c77
Merge remote-tracking branch 'upstream/master' into general-fixes
2016-10-22 23:54:12 +09:00
Dean Herbert
baf68ba593
Merge pull request #99 from Tom94/general-improvements
...
Fix secondary volume meters showing an incorrect volume until changed.
2016-10-22 23:51:14 +09:00
Thomas Müller
7ced6046d7
Fix secondary volume meters showing an incorrect volume until changed.
2016-10-22 14:33:43 +02:00
Dean Herbert
3ce93608fb
Fix one remaining FlowContainer.
2016-10-22 19:37:27 +09:00
Dean Herbert
808d5c75fb
Fix unused field warning.
2016-10-22 19:08:40 +09:00
Dean Herbert
9021042d93
Fix CircularContainer usage.
2016-10-22 18:40:04 +09:00
Dean Herbert
28a41dcca6
Fix FlowContainers.
2016-10-22 18:05:46 +09:00
Dean Herbert
cdef75c98b
Fix AutoSize references.
2016-10-22 17:50:42 +09:00
Dean Herbert
43f0409893
Start to structure flow of information in Player.
...
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
Dean Herbert
e78e0d37b4
Make playfield dark, not light. No masking either.
2016-10-19 18:15:49 +09:00
Dean Herbert
a1d961dc87
Make the Player class more friendly and add a test case.
2016-10-19 18:00:35 +09:00
Dean Herbert
94968a8b7c
Add initial implementation of osu! HitCircle.
2016-10-19 16:19:01 +09:00
Dean Herbert
ee463dc65c
Merge pull request #77 from NeoAdonis/counters-a
...
Rolling counters
2016-10-19 15:06:00 +09:00
Dean Herbert
c81c4cbbcd
Fix missing Metadata initialisation.
2016-10-19 12:28:48 +09:00
Dean Herbert
6705902710
Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes
2016-10-19 12:22:16 +09:00
Drew DeVault
7bdf1fe1bf
Drop BeatmapSet, only BeatmapSetInfo is necessary
2016-10-18 15:48:24 -04:00
Drew DeVault
768dd38fa0
s/AddBeatmap/ImportBeatmap/g
2016-10-18 15:42:07 -04:00
Drew DeVault
105bba6178
Rework duplicate detection in AddBeatmap
2016-10-18 15:41:46 -04:00
Drew DeVault
ad14462369
Add lifecycle management to BeatmapDatabase
2016-10-18 15:38:59 -04:00
Drew DeVault
8ca4a2067e
$(SolutionDir)
2016-10-18 13:58:24 -04:00
Drew DeVault
449f04c07b
Refactor the database code
2016-10-18 13:38:27 -04:00
Thomas Müller
68476eafb9
Use DrawSize instead of Size whereever Size was previously read due to framework changes.
...
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
Adonais Romero González
eeacd85073
Protect RollingCounter props
2016-10-17 21:40:50 -05:00
Dean Herbert
cce2094392
Framework update.
2016-10-18 11:20:16 +09:00
Adonais Romero González
5abc3ba898
Merge remote-tracking branch 'upstream/master' into counters-a
2016-10-17 20:36:04 -05:00
Dean Herbert
bfbc26738c
Merged branch master into round_masking
2016-10-17 12:08:31 +09:00
Lunar Dust
8e47d72f93
Reorder ToolbarButton instantiation for consistency
...
Might as start good standards now rather than later
2016-10-16 18:42:40 -05:00
Adonais Romero González
72c4dc344e
Misc. fixes and improvements
2016-10-16 18:30:25 -05:00
Adonais Romero González
a671765a4f
Modified ManiaComboCounter behavior
...
This to match more with the current behavior in osu!mania.
2016-10-16 17:45:37 -05:00
Adonais Romero González
2c06764b79
Better safe than sorry
2016-10-16 17:10:08 -05:00
Thomas Müller
53076f6446
Modify osu! logo to use new CircularContainer.
2016-10-16 19:26:56 +02:00
Thomas Müller
fec127eb8c
Merge branch 'master' of github.com:ppy/osu into unified_shader
...
# Conflicts:
# osu-framework
# osu.Game/Overlays/Options.cs
2016-10-16 15:17:24 +02:00
Dean Herbert
02dc8dc167
Change the way VolumeControl handles global input.
2016-10-16 21:57:15 +09:00
Thomas Müller
b3e531b98c
Remove implementation of WedgedBox and use Shear transformation instead.
2016-10-16 14:10:24 +02:00
