Commit Graph

188 Commits

Author SHA1 Message Date
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
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
2ece1cbd07 CI Fixes. 2017-04-28 22:26:51 +09:00
70e81115f4 Refactor BeatmapInfoWedge to suck a little less. 2017-04-28 21:16:37 +09:00
f329587bd4 Fix mismatched braces. 2017-04-25 08:02:09 +09:00
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
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
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
fbd26a1d5e Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
727086c0b2 Updates in-line with framework. 2017-04-18 15:34:53 +09:00
928550b1a8 Merge branch 'master' into remove-playmode 2017-04-17 21:01:10 +09:00
c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
a4e2f34ee7 Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
4042b94e01 Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
a3906820ec Merge branch 'master' into beatmap_parsing 2017-03-15 19:29:45 +09:00
72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
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
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
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
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
e356758a7d Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
e8b027130f Remove unused variable. 2017-02-27 23:17:21 +09:00
afdb95f4d5 Fix even more test regressions. 2017-02-27 20:39:04 +09:00
7c602a2af3 Update framework. 2017-02-27 15:55:57 +09:00
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
c5552dfb27 Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
d570a6d308 Handle cases where HitObjects were not parsed. 2017-02-15 12:38:10 +09:00
aaaf7163e0 Update framework. 2017-02-13 17:46:50 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00