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

118 Commits

Author SHA1 Message Date
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
smoogipoo
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
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
2018-07-24 11:37:43 +02:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Aergwyn
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147 Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +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
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09: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
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Dean Herbert
831bd24b00 Merge branch 'master' into easing 2017-07-23 13:46:35 +09:00
Dean Herbert
c6250e1da5 Supress compiler warning
I don't think this is a sustainable solution if we start doing this in more places.
2017-07-23 11:34:09 +09:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
750fc0db0e Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms 2017-07-22 11:34:27 +02:00
Thomas Müller
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
dae0f61b2b Don't obtain DependencyContainer via DI 2017-07-22 11:09:13 +02:00
Thomas Müller
e469a114a6 Update dependency caching according to framework 2017-07-21 19:03:43 +02:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +03: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
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
Dean Herbert
7baa2b7421 Fix CI issues 2017-06-25 14:46:59 +09:00
smoogipooo
fc0e44b214 Update framework. 2017-06-21 11:28:27 +09:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
John Neijzen
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00