1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 11:12:57 +08:00
Commit Graph

56 Commits

Author SHA1 Message Date
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Jorolf
5df33ad2d7 use Length instead of Count() 2017-07-02 13:33:42 +02:00
Jorolf
c9784f57d3 fix mod button samples 2017-07-02 13:16:22 +02:00
Dean Herbert
a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
Dean Herbert
64682a741c Update framework 2017-06-08 17:05:25 +09:00
John Neijzen
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
Jorolf
a43890ffb4 update osu to use the framework's TooltipContainer 2017-06-03 14:50:35 +02:00
Dan Balasescu
e4b876ff5b Update ModButton.cs 2017-05-29 18:10:02 +09:00
Dean Herbert
7960b5cf26 More refactoring
Also allows rotation when reaching the end of the available mods.
2017-05-29 18:03:40 +09:00
Dean Herbert
31cc6917bc Tidy up code, improve transition, add directionality 2017-05-29 17:20:55 +09:00
Jorolf
e86ccf61b3 use recursion 2017-05-27 10:11:59 +02:00
Jorolf
db1dde72de change constant names 2017-05-26 16:29:15 +02:00
Jorolf
64612ef34b add multimod animation 2017-05-26 16:10:28 +02:00
DrabWeb
995a573b9c @"" -> string.Empty 2017-05-20 03:22:37 -03:00
DrabWeb
bfedd42ca4 Add mod tooltips 2017-05-19 23:56:48 -03:00
Dean Herbert
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Dean Herbert
2f4fad9d41 Refactor colour selection. 2017-05-08 11:33:22 +09:00
Dean Herbert
6298b3effd Refactor ModSection and ModIcon to avoid null mods. 2017-05-05 12:16:41 +09:00
EVAST9919
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
EVAST9919
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
smoogipooo
c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
Huo Yaoyuan
9007409072 Follow appveyor's code style check. 2017-03-09 16:44:45 +08:00
Dean Herbert
0c4c1689b6 Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Huo Yaoyuan
b19405c987 Allow null in mod list to generate a placeholder ModButton. 2017-03-07 19:52:51 +08:00
Huo Yaoyuan
8979b28496 Remove usages of the 'new' keyword. 2017-03-07 16:17:51 +08:00
Huo Yaoyuan
b56d6c767b Merge branch 'master' into modselect 2017-03-07 16:10:53 +08:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections. 2017-03-07 13:52:47 +09:00
Dean Herbert
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
2017-03-07 13:42:50 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Huo Yaoyuan
5cd859ecf1 Fix missed color during loading. 2017-03-07 00:46:36 +08:00
Huo Yaoyuan
564b3f0706 Refactor icon management of ModButton. 2017-03-06 19:03:26 +08:00
Huo Yaoyuan
a91d897282 Handle left and right mouse button only. 2017-03-06 18:02:51 +08:00
Huo Yaoyuan
f6f20cafd3 Merge remote-tracking branch 'peppy/less-mods-enum' into modselect 2017-03-06 17:35:15 +08:00
Dean Herbert
12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
Huo Yaoyuan
ad75ead665 selectedMod -> selectedIndex 2017-03-06 17:21:25 +08:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
DrabWeb
37ed1b3d09 Moved key press select mods to ModSection 2017-03-02 01:24:32 -04:00
DrabWeb
1eee587c18 CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
DrabWeb
c3a81127f2 Updated to work with latest framework 2017-02-28 02:25:38 -04:00
DrabWeb
a67bfacb19 Made requested changes 2017-02-23 07:57:58 -04:00
Dean Herbert
9f367bcc0e
Fix line endings. 2017-02-23 11:16:23 +09:00