h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 15:12:54 +08:00
Code Issues Releases Wiki Activity
3,663 Commits 3 Branches 657 Tags 357 MiB
09195a03a2
Commit Graph

163 Commits

Author SHA1 Message Date
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-04-14 11:25:00 +09:00
Dan Balasescu
6ab274abc0 Trim whitespace 2017-04-12 15:06:46 +09:00
smoogipooo
f8076ec792 Better comment. 2017-04-12 15:04:11 +09:00
smoogipooo
0c90ef79fa Make TestCaseTaikoPlayfield work again. 2017-04-12 12:37:02 +09:00
smoogipooo
a922e67754 Because Ruleset only exposes HitRenderer, we need to have AspectAdjust in the base class. 2017-04-12 12:06:56 +09:00
Dean Herbert
b9ce98efd6
Add AspectAdjust to HitRenderer to allow playfield to consume ful HitRenderer size when needed. 2017-04-10 19:22:27 +09:00
Dean Herbert
960ea27684
Make all Playfields completely relative. 2017-04-10 19:22:27 +09:00
Dean Herbert
06a655af5d
Move initial position of KeyCounter upwards. 2017-04-07 20:51:37 +09:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Modes/UI/HudOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
 2017-04-07 09:22:18 +09:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Dean Herbert
2bb99eac72 fix typo 2017-04-06 14:27:23 +09:00
Dean Herbert
efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
Andrey Zavadskiy
bec4bf36ac hud->content and style fixes 2017-04-04 17:47:41 +03:00
Andrey Zavadskiy
009909dd4b Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 17:39:53 +03:00
Dean Herbert
c6216dbde1
Remove outdated todo. 2017-04-04 11:34:45 +09:00
Dean Herbert
7c74951454
Update bindables. 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
 2017-04-04 11:34:13 +09:00
Andrey Zavadskiy
5baa887f55 Fixes 2017-04-03 14:58:38 +03:00
Andrey Zavadskiy
c1b48c6cbf FadeIn/Out 2017-04-03 12:17:53 +03:00
Andrey Zavadskiy
e1d3befaed Added bool to ensure the notification is only displayed once per game execution 2017-04-03 12:03:21 +03:00
Andrey Zavadskiy
63a1eef6e4 Removed unnecessary line 2017-04-03 11:54:50 +03:00
Andrey Zavadskiy
e51fdd3c86 Added container whose visibility will be changable 2017-04-03 11:41:17 +03:00
Andrey Zavadskiy
ed476a79f8 Move posting notification in HudOverlay 2017-04-02 16:18:01 +03:00
Andrey Zavadskiy
9d027a61cd Move input to HudOverlay 2017-04-01 14:46:45 +03:00
Andrey Zavadskiy
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
Dean Herbert
50c328f1b4
Merge remote-tracking branch 'upstream/master' into partial-judgements 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2017-03-31 16:46:40 +09:00
Dean Herbert
3f080ab424
Add some commenting. 2017-03-31 16:01:48 +09:00
Dean Herbert
cf87330f80
Allow SetReplay to receive null. 2017-03-31 16:00:40 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
Dean Herbert
79031b9e74
Update framework. 2017-03-31 12:58:54 +09:00
smoogipooo
3050039972 Implement partial judgements + make Result non-nullable. 2017-03-29 18:35:28 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
DrabWeb
befbc63c35 Merge https://github.com/ppy/osu into song-progress-graph 2017-03-23 23:42:06 -03:00
smoogipooo
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
DrabWeb
ca2816f9c8 Formatting 2017-03-23 07:24:43 -03:00
DrabWeb
546a3d0914 Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph 2017-03-23 07:15:53 -03:00
Dean Herbert
2cb801317d
JudgementInfo -> Judgement. 
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
 2017-03-23 19:00:18 +09:00
DrabWeb
0337f18fb9 Cleaning 2017-03-23 06:37:12 -03:00
Dean Herbert
4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
DrabWeb
e4af30bd15 Line endings 2017-03-22 09:38:40 -03:00
DrabWeb
8703e5a962 More formatting 2017-03-22 09:35:08 -03:00
DrabWeb
818bdd8e88 SongProgress in HudOverlay 2017-03-22 09:27:04 -03:00
smoogipooo
66752af81f Late-add the HitObjects container in the Playfield. 
Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.
 2017-03-21 16:46:43 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert
5474710c13 Merge branch 'master' into better_hitobject_defaults 2017-03-17 02:51:15 +09:00
smoogipooo
88dfdf3f85 Add xmldoc. 2017-03-17 02:22:52 +09:00
smoogipooo
52c1cd407c Minor re-ordering to make Playfield OnJudgement be called before ScoreProcessor's. 2017-03-17 01:26:12 +09:00
smoogipooo
faacac331d Fix post-rebase issues. 2017-03-17 00:38:40 +09:00
smoogipooo
9f6f581b64 Pass through method instead of instantiating object. 2017-03-17 00:36:10 +09:00