MrTheMake
|
7a9d430a28
|
Applied suggested changes
|
2017-06-21 12:17:59 +02:00 |
|
MrTheMake
|
667e6a2d6b
|
Applied suggested changes
|
2017-06-19 18:06:39 +02:00 |
|
MrTheMake
|
13df0e0b04
|
Fixed test case
|
2017-06-19 14:52:36 +02:00 |
|
MrTheMake
|
5450499415
|
Implement OsuScreen::CanBeatmapChange and use it in the music controller
|
2017-06-19 14:32:53 +02:00 |
|
Dean Herbert
|
1b0e96f411
|
Fix some discrepancies when changing settings
|
2017-06-08 20:57:21 +09:00 |
|
Dean Herbert
|
028364b2d9
|
Add on-screen display support for RawInput and CursorSensitivity
Also allows resetting both at once using Ctrl+Alt+R.
- Depends on https://github.com/ppy/osu-framework/pull/807
|
2017-06-08 17:58:57 +09:00 |
|
Dean Herbert
|
bf45155ed5
|
Merge branch 'master' into master
|
2017-06-08 12:55:25 +09:00 |
|
John Neijzen
|
9b0e1c26a3
|
Clean Up Code
|
2017-06-07 19:53:37 +08:00 |
|
Dean Herbert
|
97db4856fc
|
Add toolbar toggle button
Also ensure chat is hidden when social is displayed and vice-versa.
|
2017-06-07 20:15:58 +09:00 |
|
Seth
|
0e087994a1
|
Merge branch 'master' into social-browser
|
2017-05-28 15:11:00 -03:00 |
|
smoogipooo
|
330bd4e11d
|
Fix osu!direct hotkey overriding drawings hotkey (for now).
|
2017-05-27 20:24:23 +09:00 |
|
DrabWeb
|
5831da6978
|
Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls
|
2017-05-26 02:32:01 -03:00 |
|
DrabWeb
|
63313045d9
|
Add SocialOverlay to OsuGame
|
2017-05-26 00:58:18 -03:00 |
|
Dean Herbert
|
15ee2b802e
|
Hide direct overlay when requested
|
2017-05-24 13:41:07 +09:00 |
|
Dean Herbert
|
4ee11764b8
|
Merge branch 'master' into osu-direct
|
2017-05-24 12:16:34 +09:00 |
|
Dean Herbert
|
fe7ac20e29
|
Read menu music from osz resource
|
2017-05-23 16:38:43 +09:00 |
|
DrabWeb
|
8c77f85667
|
Fix DirectOverlay expanding under the Toolbar
|
2017-05-21 18:52:30 -03:00 |
|
DrabWeb
|
9ba356f2c6
|
Added osu!direct header and filter control
|
2017-05-17 05:58:34 -03:00 |
|
Dean Herbert
|
0feaa407f2
|
Merge branch 'margin-padding-namespace' into on-screen-display
|
2017-05-16 16:40:06 +09:00 |
|
Dean Herbert
|
5e5ad9a899
|
Add basic on-screen display
|
2017-05-16 15:03:03 +09:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
Dean Herbert
|
622b155fda
|
OsuConfig -> OsuSetting
|
2017-05-15 10:56:27 +09:00 |
|
Dean Herbert
|
eaaba11586
|
Change all instances of options to settings where applicable
|
2017-05-15 10:55:29 +09:00 |
|
Dean Herbert
|
cf239f4d9c
|
Move chat into main content
Also changes the way parallax is applied to OsuScreens game-wide.
|
2017-05-12 19:03:21 +09:00 |
|
Dean Herbert
|
9a1c662d1f
|
Update framework
|
2017-05-11 21:25:43 +09:00 |
|
Dean Herbert
|
5aa90df819
|
Allow OsuScreens to decide whether ruleset switching should be allowed.
Tidies up ToolbarModeSelector a lot by using DI.
|
2017-04-21 16:03:59 +09:00 |
|
Dean Herbert
|
093abd6872
|
Add chat toggle button.
|
2017-04-19 19:54:03 +09:00 |
|
Dean Herbert
|
fbd26a1d5e
|
Mode -> Ruleset.
|
2017-04-18 16:05:58 +09:00 |
|
Dean Herbert
|
af13f97435
|
Fix regressions and test cases.
|
2017-04-17 19:44:03 +09:00 |
|
Dean Herbert
|
a4e2f34ee7
|
Make a RulesetDatabase.
|
2017-04-17 17:43:48 +09:00 |
|
smoogipooo
|
6dbc75283c
|
Re-implement config value.
|
2017-04-15 05:52:58 +09:00 |
|
smoogipooo
|
0a1376c2db
|
Remove PlayMode game-wide.
|
2017-04-15 05:22:41 +09:00 |
|
Dean Herbert
|
7d7bea7198
|
Fix crash on restart after update.
Also make update process more graceful.
|
2017-04-11 18:40:39 +09:00 |
|
Dean Herbert
|
4aafc172ca
|
Allow playfield to specify whether it has a cursor or not.
|
2017-04-05 17:38:57 +09:00 |
|
Dean Herbert
|
6f1fff4ee7
|
Update async load usage to new style.
|
2017-04-02 15:56:12 +09:00 |
|
Dean Herbert
|
fa7c72a099
|
Refactor ReplayInputHandler creation for more flexibility.
|
2017-03-31 15:59:53 +09:00 |
|
Dean Herbert
|
fa7fd6efe3
|
Fix mode selector not invoking a re-filter.
|
2017-03-29 19:48:13 +09:00 |
|
Dean Herbert
|
f7dc7e9bb9
|
Update references.
|
2017-03-28 21:26:20 +09:00 |
|
smoogipooo
|
b225ae82be
|
GetInputHandler -> CreateInputHandler.
|
2017-03-24 13:59:05 +09:00 |
|
smoogipooo
|
2074812f46
|
Move ScoreProcessor and Score to Scoring/.
|
2017-03-24 09:51:52 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
Andrey Zavadskiy
|
4fa6db6cfa
|
Hide options when entering the game
|
2017-03-21 18:20:15 +03:00 |
|
smoogipooo
|
77067b7e64
|
Re-style.
|
2017-03-18 02:04:23 +09:00 |
|
Dean Herbert
|
f9f31ca092
|
Add statefulness to MenuCursor.
|
2017-03-17 20:45:27 +09:00 |
|
Huo Yaoyuan
|
e1bd168c16
|
Remaining GameMode -> Screen.
|
2017-03-14 07:22:46 +08:00 |
|
Dean Herbert
|
4430255ec4
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
|
2017-03-07 13:50:08 +09:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Dan Balasescu
|
bc74f453aa
|
Merge branch 'master' into replay
|
2017-03-07 11:41:16 +09:00 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
Thomas Müller
|
6e9c4a4251
|
Merge branch 'master' into options-footer
|
2017-03-06 20:01:51 +01:00 |
|