Dean Herbert
|
f705589bf2
|
Rename NotificationManager to NotificationOverlay
|
2017-07-28 15:03:42 +09:00 |
|
Dean Herbert
|
5f53426a9a
|
*Database -> *Store
Welcome back BeatmapManager
|
2017-07-27 16:56:41 +09:00 |
|
Dean Herbert
|
9e20a02c0a
|
Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
|
2017-07-26 16:31:34 +09:00 |
|
Dean Herbert
|
fce580d717
|
Reshuffle namespaces
|
2017-07-26 13:22:46 +09:00 |
|
Thomas Müller
|
e68675f970
|
Rename EasingTypes to Easing
|
2017-07-22 20:53:53 +02:00 |
|
Thomas Müller
|
750fc0db0e
|
Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
|
2017-07-22 11:34:27 +02:00 |
|
Thomas Müller
|
e469a114a6
|
Update dependency caching according to framework
|
2017-07-21 19:03:43 +02:00 |
|
Thomas Müller
|
2cd8f6b30c
|
Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
# osu-framework
|
2017-07-21 11:15:26 +02:00 |
|
Thomas Müller
|
4d8261fe0b
|
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
|
2017-07-18 15:16:02 +03:00 |
|
Dean Herbert
|
ae58e18178
|
Reorder code based on depth (and avoid possible conflicts)
|
2017-07-18 10:41:52 +09:00 |
|
Jorolf
|
689866f5dd
|
minor improvements
|
2017-07-17 20:25:57 +02:00 |
|
Thomas Müller
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Thomas Müller
|
032e9df67b
|
ApplyDelay -> AddDelay
|
2017-07-16 17:47:29 +03:00 |
|
Thomas Müller
|
71105bb9ee
|
Delay -> ApplyDelay; DelayReset -> ResetDelay
|
2017-07-16 14:06:46 +03:00 |
|
Huo Yaoyuan
|
6cf36da389
|
Merge branch 'master' into profile
|
2017-07-14 22:52:19 +08:00 |
|
Dean Herbert
|
939e167d6a
|
Correct offset settings vertically based on toolbar visibility
|
2017-07-13 17:09:12 +09:00 |
|
Dean Herbert
|
3a4150c6c3
|
Merge remote-tracking branch 'upstream/master' into profile
# Conflicts:
# osu.Game/Graphics/Containers/SectionsContainer.cs
|
2017-07-13 13:44:21 +09:00 |
|
Thomas Müller
|
9d523ea012
|
Update framework
|
2017-07-12 11:06:13 +09:00 |
|
Huo Yaoyuan
|
35bec7ddc0
|
Hide profile when not showing overlays.
|
2017-06-22 21:43:58 +08:00 |
|
Huo Yaoyuan
|
3883f4a746
|
Show profile when click on user panel.
|
2017-06-16 16:23:20 +08:00 |
|
Huo Yaoyuan
|
13d9f3b9bb
|
Move namespace and setup for DI.
|
2017-06-15 17:53:12 +08: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 |
|
Dean Herbert
|
c24a4f57d9
|
Raise errors on unnecessary using statements.
|
2017-03-06 19:15:47 +09:00 |
|
Dean Herbert
|
5ec2db6558
|
Fix crash on opening options before intro has played.
|
2017-03-06 17:32:10 +09:00 |
|
Dean Herbert
|
0ee38571a6
|
Move version-related properties to OsuGameBase.
|
2017-03-06 17:30:44 +09:00 |
|
Dean Herbert
|
a5d044067c
|
Cancel previous load attempts before starting a new score load.
|
2017-03-04 21:35:12 +09:00 |
|
Dean Herbert
|
95e2e2b027
|
Replay loading via drag-drop huzzah!
|
2017-03-04 19:02:43 +09:00 |
|
Dean Herbert
|
b294386077
|
Remove misleading beatmap import method.
|
2017-03-04 16:47:37 +09:00 |
|
Dean Herbert
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
DrabWeb
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
Andrey Zavadskiy
|
e06b3ecf2d
|
Input fix
|
2017-02-27 18:18:12 +03:00 |
|
Andrey Zavadskiy
|
9444ffd849
|
Removed redundant qualifiers
|
2017-02-27 17:37:38 +03:00 |
|
Dean Herbert
|
27d31d1d30
|
Merge remote-tracking branch 'upstream/master' into better-container
|
2017-02-26 11:23:06 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
5ff4028c29
|
Make beatmap importing async.
|
2017-02-24 18:12:50 +09:00 |
|
Thomas Müller
|
2689de0c0c
|
Update framework and add "Async" suffix to asynchronous methods
|
2017-02-23 22:32:10 +01:00 |
|
Dean Herbert
|
bf33cc6f53
|
Make disclaimer actually be a thing.
|
2017-02-18 14:16:46 +09: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 |
|
Dean Herbert
|
366e95dd4f
|
Remove outdated comment.
|
2017-02-17 17:33:41 +09:00 |
|
Dean Herbert
|
9e8b4d43dd
|
Improve exit procedure.
|
2017-02-17 17:25:28 +09:00 |
|
Dean Herbert
|
753232533a
|
Display Important/Error logging in notifications for now.
|
2017-02-15 12:37:57 +09:00 |
|
Dean Herbert
|
870aa2750f
|
Don't attempt to import command line arguments as beatmaps.
|
2017-02-12 14:53:33 +09:00 |
|
Dean Herbert
|
8ec927899f
|
Implement notifications.
|
2017-02-10 16:30:23 +09:00 |
|
Dean Herbert
|
2e119cd74f
|
Handle toolbar offsets better.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
3cee23fc00
|
Toggle toolbar with Ctrl-T.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
default0
|
299c4923c3
|
Implement Beatmap Import via drag&drop
|
2017-02-05 13:32:08 +01:00 |
|
Dean Herbert
|
64f4098791
|
Move MusicController beneath Toolbar.
|
2017-01-31 17:05:54 +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 |
|
Dean Herbert
|
cbd6fe3f36
|
Move definition of MusicController's position out of itself.
|
2017-01-30 22:54:33 +09:00 |
|
Dean Herbert
|
1853bbdda8
|
Move window/volume configuration to framework level.
|
2017-01-25 18:44:51 +09:00 |
|
Dean Herbert
|
ae464fcace
|
Move Intro logic to OnEntering in line with framework changes.
|
2017-01-20 16:30:24 +08:00 |
|
Dean Herbert
|
4d27101aca
|
Add ability to adjust game clock's speed (pgup/pgdn).
A bit hacky, probably need to expose rate better.
|
2016-12-05 19:33:38 +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 |
|