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

356 Commits

Author SHA1 Message Date
smoogipoo 9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo 4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo 77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo 1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Dean Herbert 8bf25542cb Add PlayerLoader TestCase and fix dummy beatmap load procedure 2018-04-20 17:30:27 +09:00
smoogipoo 03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo 66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
FreezyLemon 46d859a660 exit player earlier if a dummy map is loaded 2018-03-25 13:25:48 +02:00
FreezyLemon a3d8048aca abort loading and exit player for dummy maps 2018-03-22 21:46:35 +01:00
Dean Herbert 9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
Dean Herbert 13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo 33c721bcbb Fix post-merge errors 2018-03-12 09:51:32 +09:00
smoogipoo 6e51b74890 Merge remote-tracking branch 'origin/master' into rewrite-break-overlay 2018-03-12 09:47:05 +09:00
Dean Herbert 487a03d0d7
Merge branch 'master' into cursor-trail 2018-03-11 02:07:05 +09:00
Dean Herbert 6d91889ca6 Move player-specific configuration bindables back to player 2018-03-08 22:16:47 +09:00
TocoToucan 2cb197d0c4 Replace ConfigureBackgroundUpdate with OnEntering 2018-03-08 11:35:00 +03:00
Dean Herbert 6a768e378a
Merge branch 'master' into rewrite-break-overlay 2018-03-07 17:00:34 +09:00
TocoToucan 697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
Dean Herbert 792a3ac469 SkipButton -> SkipOverlay 2018-03-06 00:10:53 +09:00
Dean Herbert c6c55c40ed Rewrite BreakOverlay 
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
 2018-03-04 00:51:24 +09:00
Dean Herbert bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
Dean Herbert bda673e6fe
Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
Dean Herbert f9faf8e3d8 Localise offset clock usage out of Player as much as possible 2018-02-28 22:01:52 +09:00
Dean Herbert 01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dean Herbert dd6cf1379e Reduce parallax effect during gameplay 
This also cleans up some shared code in OsuScreen.
 2018-02-28 11:42:47 +09:00
Dean Herbert f64afc738d Fix incorrect exit block conditional 
Resolves #2130.
 2018-02-27 23:59:34 +09:00
Dean Herbert cff17f1864 Update in line with inverse ShoudProcessClock default 2018-02-27 17:23:38 +09:00
Dean Herbert 8e78a7b114 Fix HUD using incorrect clock for time display 2018-02-27 17:23:38 +09:00
Dean Herbert 37d2a2c3cc Rename clock types to match across classes 2018-02-27 17:23:38 +09:00
Dean Herbert 3d52ead213 Rename sourceClock 2018-02-27 17:23:38 +09:00
Dean Herbert fee258f2f2 Rework PauseContainer to better pause 2018-02-27 17:23:38 +09:00
Dean Herbert d4f1723ae6 Remove unnecessary secondary argument from HUDOverlay 2018-02-27 17:23:38 +09:00
Dean Herbert 0635ae2293 Include missing offset 2018-02-27 17:23:38 +09:00
Dean Herbert 9c0dfb7c8c Avoid creating an extra framed clock in SkipButton 2018-02-27 17:23:38 +09:00
Dean Herbert e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
Dean Herbert 9760f30ce9 Tidy things up to make more sense 2018-02-16 12:08:36 +09:00
Dean Herbert f22f9b5de0
Merge branch 'master' into PlayerBase 2018-02-16 11:26:57 +09:00
TocoToucan c57e8785e2 Move all storyboard loading to Player itself 2018-02-15 23:57:53 +03:00
TocoToucan 86f200e257 Fix possible nullref 2018-02-09 22:04:39 +03:00
TocoToucan a86a4f49cf Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay 2018-02-09 21:20:49 +03:00
TocoToucan a860dd7208 Preview visual settings at the “loading” screen 2018-02-09 00:06:24 +03:00
TocoToucan d437c1d7ec Introduce PlayerBase class 2018-02-08 23:28:42 +03:00
Dean Herbert df65443f07 Merge branch 'master' 
Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs
 2018-01-30 18:31:03 +09:00
smoogipoo 8d11596b2f Minor cleanups 2018-01-24 17:48:42 +09:00
Michael Manis 794ae5380a Intverted conditionals. 2018-01-22 01:06:27 -05:00
Michael Manis 530e0afa2c Use IsCurrentScreen instead of a bool for both checks now. 2018-01-21 22:27:15 -05:00
Michael Manis 964c6da9a4 Use IsCurrentScreen instead of a bool 2018-01-21 22:00:18 -05:00
Michael Manis 806da21760 Removed rreduntant initialization. 2018-01-21 20:24:19 -05:00
Michael Manis ad2df8d8df Fixed tilde-key crash at end of beatmap. 2018-01-21 20:09:44 -05:00