1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 20:07:26 +08:00
Commit Graph

23 Commits

Author SHA1 Message Date
Dean Herbert
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Dean Herbert
58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Dean Herbert
47997c20ad
Weld -> BindWith. 2017-02-27 12:24:53 +09:00
Dean Herbert
c227eb1be5
Welded bindables. 2017-02-26 22:08:21 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Dean Herbert
d5b7a8ce9e
Add pink glow to cursor because I can't fucking see it against white. 2017-02-10 16:24:40 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Thomas Müller
8271b139e9 Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01. 2017-02-05 09:40:58 +01:00
Dean Herbert
d97f02a219 Cursor becomes vector. 2017-02-04 22:56:56 +09:00
Andrey Zavadskiy
16dc1460ad Cursor scale 2017-02-02 14:44:56 +03:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Thomas Müller
069a19a916 Make CursorTrail efficient and add colouring and transparency support. 2016-11-26 18:01:24 +01:00
Dean Herbert
c978a4c091 Tidy up code. Make trail smooth. 2016-11-26 19:22:56 +09: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
Drew DeVault
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Dean Herbert
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
Dean Herbert
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
Dean Herbert
2db962dc33 Add basic tweening mouse cursor.
# Conflicts:
#	osu-framework
2016-09-29 23:46:33 +09:00