RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,426 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

116 Commits

Author SHA1 Message Date
Dean Herbert 609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo 6a957ad27f Fix pause triggered when already paused 2019-05-10 15:51:12 +09:00
Dean Herbert 0693290ad4 Merge remote-tracking branch 'upstream/master' into refactor-select-footer 2019-05-08 18:43:21 +09:00
Dean Herbert bace829629 Add ability to avoid expand animation in ModDisplay 2019-05-08 18:42:26 +09:00
Dean Herbert 8bc313fb33
Merge branch 'master' into fix-new-inspections 2019-05-07 14:14:40 +09:00
Dean Herbert f7a570d67a Fix double confirmation 2019-05-07 13:34:06 +09:00
smoogipoo d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections 
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
 2019-05-07 13:20:17 +09:00
Dean Herbert 3e3f12f277 Use more local bindables 2019-05-04 17:53:17 +09:00
Dean Herbert b9a39fb788 Fix instant pausing when game becomes inactive 
Resolves #4685.
 2019-05-04 14:54:29 +09:00
Dean Herbert d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
Dean Herbert 48e82d4b1c Fix hold for menu button's icon being incorrect 2019-04-22 18:47:28 +09:00
smoogipoo 0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo 772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability 
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
 2019-04-08 23:01:12 +09:00
Dean Herbert f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert 612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert 1be4c7b813 Fix excess newline 2019-03-12 02:23:23 +09:00
Dean Herbert 38e75421ab Fix HoldForMenuButton getting stuck in a confirming state 
Closes #4446.
 2019-03-12 02:21:34 +09:00
Dean Herbert 58ef397f4f Move all clock related gameplay logic inside GameplayClockContainer 2019-03-07 16:02:24 +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 d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert 3fe4b8fd1c Update variable names 
Also cleans up some weird code
 2019-02-22 17:51:39 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo 4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
chrisny286 fb51578df3 Update PlayerSettingsOverlay.cs 
Framework renamed this variable so it needs to be renamed here too.
 2019-01-21 17:19:40 +01:00
smoogipoo d93421b796 Merge remote-tracking branch 'Joehuu/master' into timeshift-wip 
# Conflicts:
#	osu.Game/Screens/Play/HUD/ModDisplay.cs
 2018-12-22 14:02:45 +09:00
Dean Herbert aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
smoogipoo 170955110f Add mods to the match info 2018-12-12 14:38:03 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert 970ea928ae Fix hold for menu button occasionally disappearing 2018-11-19 12:06:47 +09:00
Roman Kapustin ecf8a89f26 Set AccentColour and GlowColour in StandardHealthDisplay 2018-11-16 19:30:58 +03:00
Dean Herbert 7f73fc2d39 Require holding back button to quit gameplay 
Avoids accidental presses and streamlines logic with on-screen element.
 2018-11-07 01:49:21 +09:00
ekrctb b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb 50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb 99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert 4a68b14447 Fix crash when selecting mods after entering play mode 
Closes #3260.
 2018-08-21 00:15:51 +09:00
smoogipoo 3619290c34 Split out judgement definition from judgement result 2018-08-02 20:35:54 +09:00
Dean Herbert 0f37758314 Update framework 2018-07-21 16:21:53 +09:00
ekrctb d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
smoogipoo 0e122468db Fix progress easing to 0 if aborting after confirmation 2018-05-22 18:06:40 +09:00
Dean Herbert 436067c01f Handle scale back in a nicer way 2018-05-22 16:44:37 +09:00
Dean Herbert 7b770d03c5 Use OnMouseMove instead of Update logic 2018-05-22 16:26:59 +09:00