Commit Graph

76 Commits

Author SHA1 Message Date
Dean Herbert 3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert 3c1654e5e4 Fix many instances of non-osu-prefixed text classes being used
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Aergwyn 6a8fd74e05 fix failing tests
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01: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
Aergwyn 0b5614e4ee fix result screen not showing name of mapper 2017-11-18 22:12:15 +01:00
Dean Herbert 6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert 4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08: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 64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
Thomas Müller 87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller 19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller 032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +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 71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Dean Herbert 54f6befd67 Merge branch 'master' into fix-track-rotation 2017-07-12 13:18:16 +09:00
Thomas Müller 9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Dean Herbert 9bbcc0526d Disable beatmap changes in specified screens 2017-07-11 18:39:10 +09:00
Thomas Müller 40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
Thomas Müller 1bca9ca0e9 Update framework with better children list 2017-06-24 12:56:35 +02:00
paparony03 62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert 3efe8629d6 Fix hacky tabs 2017-06-12 18:39:22 +09:00
smoogipooo ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen 4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
John Neijzen 431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
Huo Yaoyuan d929de466a DateDisplay -> DateTimeDisplay for more exactly. 2017-05-16 21:16:52 +08:00
Huo Yaoyuan d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Dean Herbert efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
smoogipooo c95a6fbd09 Use single line for GetUnicodePreference. 2017-04-28 14:14:14 +09:00
Dan Balasescu 658ff61e8a Merge branch 'master' into locale 2017-04-28 13:51:36 +09:00
Dean Herbert 94c259bd59 Remove most usages of DelayReset
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09:00
Huo Yaoyuan 4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Dean Herbert 5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert c7411c47d6
Update User API stuff. 2017-04-20 19:51:28 +09:00
Dean Herbert 6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary). 2017-04-20 11:03:11 +09:00
Dean Herbert 015eacb3b8
Merge branch 'results-screen' into score-statistics 2017-04-19 20:51:23 +09:00
Dean Herbert 7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen
# Conflicts:
#	osu.Game/Users/User.cs
2017-04-19 20:51:05 +09:00
Dean Herbert 1f7ed72dc6
Update font/size. 2017-04-19 17:32:30 +09:00
Dean Herbert 3b95fbab7d
Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
Dean Herbert 2f53f2e248
Add license headers. 2017-04-18 22:35:21 +09:00
Dean Herbert 49f4981f1c
Fix CI issues. 2017-04-18 22:28:16 +09:00
Dean Herbert 2bf560a371
Disable page three for now. 2017-04-18 22:22:14 +09:00
Dean Herbert e8d55b5bb5
Add back button. 2017-04-18 22:22:14 +09:00
Dean Herbert 4a3fc710c4
Add temporary combo/accuracy display. 2017-04-18 22:22:14 +09:00
Dean Herbert f1bd64a74d
Adjust colour metrics. 2017-04-18 22:22:14 +09:00
Dean Herbert 32df625d82
Adjust text size and padding. 2017-04-18 22:22:14 +09:00