Commit Graph

66 Commits

Author SHA1 Message Date
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
3015d40f8f Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
a35d9178f0 Quick rename 2018-12-22 16:20:29 +09:00
e404a0bc20 Clean-ups and renames 2018-12-22 15:51:00 +09:00
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
4b604bf055 Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
5be46307fd Fix results screen parallax being cut off
Alternative to / closes #2549.

Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09:00
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
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
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
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
9bbcc0526d Disable beatmap changes in specified screens 2017-07-11 18:39:10 +09: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
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
94c259bd59 Remove most usages of DelayReset
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09:00
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
49f4981f1c Fix CI issues. 2017-04-18 22:28:16 +09:00
2bf560a371 Disable page three for now. 2017-04-18 22:22:14 +09:00
e8d55b5bb5 Add back button. 2017-04-18 22:22:14 +09:00
4a3fc710c4 Add temporary combo/accuracy display. 2017-04-18 22:22:14 +09:00
f1bd64a74d Adjust colour metrics. 2017-04-18 22:22:14 +09:00
886ac1fb40 Add progress graph background and update ruleset references. 2017-04-18 22:22:14 +09:00
968d46a10f whitespace. 2017-04-18 22:22:14 +09:00
49fc91cf37 Add an exit transition. 2017-04-18 22:22:14 +09:00
72fcc09a98 Add beatmap info and score date.
Also adjusts design metrics.
2017-04-18 22:22:14 +09:00
d51b37cb44 Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
fbd26a1d5e Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00