RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-27 01:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,189 Commits 6 Branches 0 Tags 363 MiB
73532b9172
Commit Graph

1189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
1e037b3eaa Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth 2016-11-30 12:21:12 +09:00
Dean Herbert
e49f312f3f Merge pull request #207 from Tom94/fix-back-button-hover 
Fix being able to hover the back button from outside of its shape.
 2016-11-30 12:20:34 +09:00
Dean Herbert
b56dec8f98 Merge pull request #208 from Tom94/fix-multi-segment-sliders 
Add treatment of slider segments encoded by the same vertex appearing…
 2016-11-30 12:20:27 +09:00
Thomas Müller
e2f279bda4 Merge branch 'master' of github.com:ppy/osu into fix-multi-segment-sliders 
# Conflicts:
#	osu.Game.Mode.Osu/Objects/Slider.cs
 2016-11-29 22:28:48 +01:00
Thomas Müller
d56e23195d Add treatment of slider segments encoded by the same vertex appearing twice in succession. 2016-11-29 21:31:01 +01:00
Thomas Müller
a456eb6f1b Fix being able to hover the back button from outside of its shape. 
Could alternatively done by shearing the entire button, but then you would need a positional x-offset depending on whether the anchor is top or bottom.
 2016-11-29 21:12:49 +01:00
Thomas Müller
d0065d2d20 Merge pull request #205 from peppy/scoring 
Wire up basic scoring.
 2016-11-29 20:56:53 +01:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Dean Herbert
53df2932ad Merge pull request #199 from stanriders/back-button 
Add stable-alike BackButton
 2016-11-30 03:20:03 +09:00
stanriders
988a9bbaad Switch to relative sizes 2016-11-29 20:27:59 +03:00
Dean Herbert
74e3a87f78 Add *very* basic ranking screen. 2016-11-29 23:59:56 +09:00
Dean Herbert
30e62eb53c Adjust slider fadeout slightly. 2016-11-29 22:14:56 +09:00
Dean Herbert
ca0bea7534 Rename MaximumCombo to HighestCombo. 2016-11-29 22:05:21 +09:00
Dean Herbert
d71b284642 Make ScoreProcessor abstract and avoid making AddJudgement virtual. 2016-11-29 22:02:37 +09:00
Dean Herbert
eb70ae788c Store max combo in ScoreProcessor. 2016-11-29 21:57:53 +09:00
Dean Herbert
18d331f869 Add combo info to JudgementInfo. 2016-11-29 21:46:30 +09:00
Dean Herbert
f8c1f4dd58 Add basic slider judgement handling. 2016-11-29 21:40:24 +09:00
Dean Herbert
a0503bd13f Tidy up Slider class. 2016-11-29 21:29:53 +09:00
Dean Herbert
2947121e48 Hook up ScoreProcessor to Scoreoverlay etc. 2016-11-29 21:28:43 +09:00
Dean Herbert
9b243ccc23 Remove Hit500. 2016-11-29 21:28:22 +09:00
Dean Herbert
9d2a69f1e2 Add concept of ScoreProcessor. 2016-11-29 20:30:16 +09:00
Thomas Müller
aea3df257c Merge pull request #204 from peppy/general-fixes 
General fixes
 2016-11-29 11:55:29 +01:00
Dean Herbert
fbf35c904d Fix Config regression with DI. 2016-11-29 18:49:03 +09:00
Dean Herbert
fa80cc84f8 Fix volume control fill being incorrect on first display. 2016-11-29 18:35:59 +09:00
Dean Herbert
139fe873f3 Remove silly weld weld weld. 2016-11-29 18:35:40 +09:00
Dean Herbert
9871960112 Basic score flow. 2016-11-29 17:34:16 +09:00
Dean Herbert
a47507fff3 Remove redundant property assignments. 2016-11-29 16:54:54 +09:00
Dean Herbert
1c2770ab36 Reset framework to sane version. 2016-11-29 16:25:06 +09:00
Dean Herbert
3526c299ec Reformat code. 2016-11-29 16:24:37 +09:00
Dean Herbert
bb37e5d955 Merge pull request #203 from peppy/slider-loading 
Add interactivity to sliders, follow circle, (non-buffered) paths etc.
 2016-11-29 13:06:00 +09:00
stanriders
2ecf72d0d7 More consts, less crap (probably) 2016-11-29 05:36:48 +03:00
Thomas Müller
0b8e37fb1d Improve slider rendering by using a buffered container (with depth attachment) and proper alpha blending. 2016-11-29 11:14:01 +09:00
Dean Herbert
a506e91b7c Fix compile issues. 2016-11-28 23:05:05 +09:00
Dean Herbert
49470318f2 Remove silly static using statement. 2016-11-28 22:48:28 +09:00
Dean Herbert
785ae892f4 Cast less. 2016-11-28 22:47:50 +09:00
Dean Herbert
9114c9dec4 Change double to int. 2016-11-28 22:46:52 +09:00
Dean Herbert
ce13d813b7 Remove unnecessary null check. 2016-11-28 22:46:07 +09:00
Dean Herbert
f224960429 Update framework. 2016-11-28 20:09:20 +09:00
Dean Herbert
ad761eb66a Make tracking area larger. 2016-11-28 19:51:50 +09:00
Dean Herbert
c7ffd56a10 Add interactivity to sliders, follow circle etc. 2016-11-28 19:42:45 +09:00
Dean Herbert
907e8e83ce Delay snaking slightly. 2016-11-28 18:53:59 +09:00
Dean Herbert
187a8bbfa7 Don't store beatmap reference in hitobjects. 2016-11-28 18:45:50 +09:00
Dean Herbert
c376f8436c Centralise common state setting for osu HitObjects. 2016-11-28 18:40:54 +09:00
Dean Herbert
15096c2f00 Improve snaking logic. 2016-11-28 18:40:38 +09:00
Dean Herbert
899c341fd3 Fix incorrect slider duration calculation. 2016-11-28 17:55:19 +09:00
Dean Herbert
9eb3e1168e Refactor SliderBody into its own class. 2016-11-28 17:05:30 +09:00
Dean Herbert
622c90daf7 Add basic snaking. 2016-11-28 16:52:57 +09:00
Dean Herbert
2616d05767 Adjust velocity calculation. 2016-11-28 16:31:31 +09:00
Dean Herbert
b1f141e1a0 Add basic slider ball logic. 2016-11-28 16:31:19 +09:00
Dean Herbert
b999d92ffb Improve curve visualisation. 2016-11-28 16:28:47 +09:00