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

56 Commits

Author SHA1 Message Date
Dean Herbert 13f057f900
Give CursorTrail its own clock for the time being. 2017-04-13 14:14:12 +09:00
Dean Herbert 7ca0d6d117
Adjust cursor popin/out to make it less ugly. 2017-04-11 16:44:12 +09:00
Dean Herbert 7c74951454
Update bindables. 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
 2017-04-04 11:34:13 +09:00
Dean Herbert f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert cc5154dd12
Fix regression in mouse dragging behaviour. 2017-03-27 17:55:57 +09:00
Dean Herbert 681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert 54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert 537f0b9340
Fix menu cursor size not sticking on startup. 
Also tidied up bindables.
 2017-03-23 08:07:59 +09:00
Dean Herbert b00f86d809 Merge branch 'master' into seperateCursorSize 2017-03-22 08:11:45 +09:00
Jorolf 82d6129063 renamed CursorSize to MenuCursorSize 2017-03-21 17:16:23 +01:00
Dean Herbert 8f75032b64 Fix incorrect abs. 2017-03-18 22:37:50 +09:00
Dean Herbert 125936bad0 Fix double-assignment. 2017-03-18 22:23:53 +09:00
Dean Herbert 919ec2d3a5 Spend more when wound up. 2017-03-18 22:17:23 +09:00
Thomas Müller f636f59289 Nicer cursor orientation when dragging 2017-03-18 12:47:49 +01:00
Jorolf 8568e1536c Separated menu and gameplay cursor size 2017-03-17 18:40:03 +01:00
smoogipooo 77067b7e64 Re-style. 2017-03-18 02:04:23 +09:00
Dean Herbert 317dc94b4c
Adjust appearance. 2017-03-17 21:09:31 +09:00
Dean Herbert f9f31ca092
Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
Dean Herbert 292de44a0b
WIP menu cursor. 2017-03-17 20:45:27 +09:00
Dean Herbert ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09: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
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 8040d6a03f
Fix CursorTrail corruption by resetting on load. 2017-03-02 16:08:10 +09: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 6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert 50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert 9b9ed32245
Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +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 1e8dc780ab Use new framework-level triangles. 2016-12-01 19:12:35 +01:00
Dean Herbert 6909dbf60c Increase cursor trail density a bit. 2016-12-01 20:44:17 +09:00
Thomas Müller b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Thomas Müller bd872f6ab8 Explicitly make various member variabled of CursorTrail private. 2016-11-27 15:04:56 +01:00
Thomas Müller 069a19a916 Make CursorTrail efficient and add colouring and transparency support. 2016-11-26 18:01:24 +01:00
Thomas Müller 23d0e52d4f Optimize draw portion of cursor trail. 2016-11-26 14:08:43 +01:00
Dean Herbert be0cc7badc Code tidying. 2016-11-26 19:25:58 +09: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