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

5187 Commits

Author SHA1 Message Date
DrabWeb
065f4faa70 Fix ruleset toggle buttons not updating when changing from the toolbar 2017-05-18 16:34:34 -03:00
DrabWeb
0b480fe327 ModeToggleButton -> RulesetToggleButton 2017-05-18 16:17:16 -03:00
DrabWeb
c2880676db Added displaying sets 2017-05-18 16:15:49 -03:00
DrabWeb
c3fb1ab7c6 Mapper -> Author, use BeatmapSetInfo for metadata 2017-05-18 15:01:01 -03:00
EVAST9919
f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
DrabWeb
ab1401054d Added result counts (visually) 2017-05-18 14:08:14 -03:00
DrabWeb
9f36a39c59 More cleanup 2017-05-18 13:57:19 -03:00
EVAST9919
a1b90ee70e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 18:26:38 +03:00
Dean Herbert
9b8d7745c7 Merge pull request #791 from peppy/spinner-refresh
Spinner design refresh
2017-05-18 22:37:45 +09:00
Dean Herbert
3004a44b98 Further colour adjustments 2017-05-18 22:21:41 +09:00
Dean Herbert
c78dfb4a13 Oops colours were wrong 2017-05-18 21:56:19 +09:00
Dean Herbert
e3ae2bca6d Design improvements
paired with smoogi
2017-05-18 21:38:19 +09:00
Dean Herbert
4100c4fe9f Fix order of methods 2017-05-18 21:04:09 +09:00
Huo Yaoyuan
ff5854d6bf Merge branch 'master' into generic-interface 2017-05-18 19:19:40 +08:00
Dean Herbert
ae676b48b2 Fix whitespace 2017-05-18 19:51:45 +09:00
Dan Balasescu
e52b87bc58 Fix incorrect comment. 2017-05-18 19:47:16 +09:00
Dean Herbert
9cd41c0e87 Spinner design refresh 2017-05-18 19:42:20 +09:00
Dean Herbert
f112546085 Don't load a mode when opening TestCaseHitObjects 2017-05-18 19:42:20 +09:00
Dan Balasescu
b5674c8f30 Update DistanceObjectPatternGenerator.cs 2017-05-18 19:33:02 +09:00
smoogipooo
1f6939f57b Add IHasEndTime object pattern generation. 2017-05-18 19:31:56 +09:00
smoogipooo
a239411808 Fix warnings/errors. 2017-05-18 19:10:32 +09:00
smoogipooo
78453c7ce3 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-18 19:06:27 +09:00
smoogipooo
4e8ead9cf4 Fix possible nullref. 2017-05-18 19:05:03 +09:00
smoogipooo
c80e2e8f0a Attempt to solve warnings... 2017-05-18 18:46:50 +09:00
smoogipooo
35bd608a4a Simplify method parameters, make conversion work again. 2017-05-18 18:41:44 +09:00
smoogipooo
a30e49d21b Add hold end samples. 2017-05-18 18:19:29 +09:00
smoogipooo
53a2f34f8b Set siblings, removing warning. 2017-05-18 18:15:09 +09:00
smoogipooo
2c97313a20 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion 2017-05-18 18:14:11 +09:00
smoogipooo
af129b3eab Add siblings, will be used in generator branches. 2017-05-18 18:13:08 +09:00
smoogipooo
eae4f8b412 Fix compilation due to previously-removed function. 2017-05-18 18:11:09 +09:00
smoogipooo
2af025e630 Add IHasDistance object pattern generation. 2017-05-18 18:09:13 +09:00
smoogipooo
afd3eb4b8d Implement things a bit more to remove warnings. 2017-05-18 18:04:32 +09:00
EVAST9919
640c940fce Make field readonly 2017-05-18 11:50:15 +03:00
EVAST9919
1d80555d3b Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 11:47:52 +03:00
smoogipooo
873ff34487 This function can't be used for all pattern generations. So let's not use it. 2017-05-18 17:43:59 +09:00
EVAST9919
83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
smoogipooo
af34777f44 Trim whitespace. 2017-05-18 17:00:11 +09:00
Dan Balasescu
f7a1b21e77 Merge branch 'master' into mania-beatmap-conversion 2017-05-18 15:44:32 +09:00
smoogipooo
164a1bb743 Remove distance object pattern generator for now (next PR). 2017-05-18 15:38:15 +09:00
Dean Herbert
dc5a9eb740 Merge pull request #775 from smoogipooo/fast-random
Add FastRandom class for use in beatmap conversion.
2017-05-18 15:38:14 +09:00
Dean Herbert
521a0d8d04 Merge branch 'master' into fast-random 2017-05-18 15:33:00 +09:00
smoogipooo
1fa1897d71 Define the concept of patterns + additional comments. 2017-05-18 15:05:45 +09:00
smoogipooo
618c162535 Move more functions to ObjectConversion + resharper cleanup. 2017-05-18 14:17:23 +09:00
smoogipooo
de8271ad6b Fix out of range exceptions due to out-of-order hitobjects. 2017-05-18 14:08:48 +09:00
smoogipooo
6dae5cbacf Fix distance object conversion not calculating end time. 2017-05-18 14:08:32 +09:00
smoogipooo
6010243736 Fix incorrect uint_to_real factor. 2017-05-18 14:07:57 +09:00
smoogipooo
7c48fb2b92 General fixes. 2017-05-18 13:37:22 +09:00
smoogipooo
c1a44ea6b4 Renaming + commenting. 2017-05-18 13:25:55 +09:00
EVAST9919
d07d94d606 better resizing 2017-05-18 07:09:36 +03:00
smoogipooo
16eda2467f Make compile. 2017-05-18 12:50:12 +09:00