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 |
|