1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 23:07:44 +08:00
Commit Graph

105 Commits

Author SHA1 Message Date
Dean Herbert
c2fcb2f9c7 Fix info wedge not displaying 2017-11-21 18:45:12 +09:00
Dean Herbert
bd616c1307 Simplify some property access 2017-11-21 12:42:28 +09:00
Dean Herbert
be9c99ade3 Remove AsyncLoadWrapper dependence 2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
0846414c5b Simplify state changes 2017-07-19 15:16:51 +09:00
Dean Herbert
632d2e8ba5 Dummy beatmap has dummy ruleset 2017-07-19 15:16:48 +09:00
Dean Herbert
21984ba764 Move DummyWorkingBeatmap to a more global level (OsuScreen) 2017-07-19 15:16:39 +09:00
Dean Herbert
e47faf4e85 Add a dummy beatmap provider for use in BeatmapInfoWedge 2017-07-19 15:16:33 +09:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
Dean Herbert
2ece1cbd07 CI Fixes. 2017-04-28 22:26:51 +09:00
Dean Herbert
70e81115f4 Refactor BeatmapInfoWedge to suck a little less. 2017-04-28 21:16:37 +09:00
Dan Balasescu
f329587bd4 Fix mismatched braces. 2017-04-25 08:02:09 +09:00
Dean Herbert
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
Dean Herbert
c7b789424b Update BeatmapInfoWedge design
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00
Dean Herbert
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
Dean Herbert
928550b1a8 Merge branch 'master' into remove-playmode 2017-04-17 21:01:10 +09:00
Huo Yaoyuan
c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
smoogipooo
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
Dan Balasescu
a3906820ec Merge branch 'master' into beatmap_parsing 2017-03-15 19:29:45 +09:00
smoogipooo
72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
Huo Yaoyuan
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
smoogipooo
854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
smoogipooo
f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00