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 |
|
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
|
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 |
|
Thomas Müller
|
7e895f66e0
|
Don't obtain DependencyContainer via DI
|
2017-07-22 11:43:52 +02:00 |
|
Thomas Müller
|
e469a114a6
|
Update dependency caching according to framework
|
2017-07-21 19:03:43 +02: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 |
|
John Neijzen
|
431d225a60
|
Keyword Spacing and Brackets Fixing
|
2017-06-08 14:35:10 +08:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
smoogipooo
|
8e88d86639
|
Fix naming confusion.
|
2017-05-02 18:00:37 +09:00 |
|
smoogipooo
|
9ca8295149
|
Oops.
|
2017-05-02 17:09:16 +09:00 |
|
smoogipooo
|
40d2fee1dc
|
Split up adding of local store from the ctor.
|
2017-05-02 16:55:04 +09:00 |
|
smoogipooo
|
91e000fd44
|
Back to sanity.
|
2017-05-02 14:21:22 +09:00 |
|
smoogipooo
|
f17046abaf
|
Add ability to load Drawings flags from osu/Drawings/Flags.
|
2017-05-02 13:28:35 +09:00 |
|
smoogipooo
|
e856abe59a
|
Let's not use Country for drawings-specific stuff...
|
2017-05-02 13:02:14 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
Dean Herbert
|
8983bbcaad
|
Merge branch 'master' into leaderboards
|
2017-03-22 08:24:49 +09:00 |
|
Dean Herbert
|
0b2bb2ea0e
|
Fix typo in font name declaration.
|
2017-03-21 22:51:49 +09:00 |
|
DrabWeb
|
0834b5b794
|
Made requested changes
|
2017-03-17 18:16:59 -03:00 |
|
DrabWeb
|
dbc8d513f9
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-13 09:36:16 -03:00 |
|
DrabWeb
|
9912f5f9e1
|
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
|
2017-03-13 09:33:25 -03:00 |
|
Dean Herbert
|
da751804b6
|
Reduce error count.
|
2017-03-09 14:24:16 +09:00 |
|
Thomas Müller
|
a3f1cb2232
|
Merge branch 'master' into update-flow
|
2017-03-04 15:35:53 +01:00 |
|
smoogipooo
|
112545f135
|
Fix unnecessarily throwing exception if there's no last drawings results file.
|
2017-03-04 23:24:32 +09:00 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
Dean Herbert
|
38a9e820e6
|
GroupsContainer -> GroupContainer.
|
2017-03-03 20:46:07 +09:00 |
|
Dean Herbert
|
bc01935a89
|
Move around some namespaces.
|
2017-03-03 20:42:22 +09:00 |
|
Dean Herbert
|
2ac248c7d0
|
Use OsuSpriteText.
|
2017-03-03 20:29:39 +09:00 |
|