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

133 Commits

Author SHA1 Message Date
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
Dean Herbert 167b559a95 Move toolbar to own namespace. 2016-12-01 14:22:29 +09:00
Dean Herbert c6b7e90739 Merge branch 'refs/heads/master' into online-improvements 2016-12-01 12:51:45 +09:00
Dean Herbert 18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00
Dean Herbert 481b9d3208 Make opening options shift the rest of the screen as per design. 2016-11-30 18:28:18 +09:00
Thomas Müller b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Drew DeVault 69cb9cf4de Fix up volume encapsulation 2016-11-25 00:21:42 -05: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 867797a089 Change volume control mouse wheel behaviour to not gain full-screen focus. 2016-11-15 15:22:14 +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 1d51e6af2a Merge pull request #168 from huoyaoyuan/fixes 
Fixes for music controller
 2016-11-14 16:11:31 +09:00