Commit Graph

2028 Commits

Author SHA1 Message Date
0bcb463acf ParallaxContainer should always know the mouse position. 2017-03-23 22:42:40 +09:00
96fc8eef30 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 17:23:22 +09:00
e9a061c709 Merge branch 'master' into beatmap-detail-tabs 2017-03-23 17:13:02 +09:00
644e9ae9d5 Increase padding to make flyte happy. 2017-03-23 16:36:52 +09:00
6bcbd116c8 Only get APIAccess from DI (it's all we need). 2017-03-23 16:32:35 +09:00
3ae7d0cb98 Better handle the passing of Beatmap and updating of scores.
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
2017-03-23 16:31:08 +09:00
a561611125 Set default tab to global scores.
This will need to be saved to the config file eventually.
2017-03-23 16:29:10 +09:00
022fd625df Remove transitions for now
If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.
2017-03-23 16:28:45 +09:00
0863efb2c8 Remove unused variable. 2017-03-23 15:35:42 +09:00
02fba000bc Tidy up and tweak transitions of DrawableJudgementInfo. 2017-03-23 15:07:45 +09:00
88d878e1d5 Formatting 2017-03-23 02:47:27 -03:00
3d1dad8185 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 14:40:06 +09:00
b8129526a4 Typo 2017-03-23 02:29:23 -03:00
d441114011 Merge branch 'master' into taiko_playfield_2 2017-03-23 14:28:42 +09:00
e77229b34b Merge branch 'master' into beatmap-detail-tabs 2017-03-23 14:26:00 +09:00
681ed38941 Use const whenever possible. 2017-03-23 13:52:38 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
b8b45262c5 Formatting 2017-03-23 01:35:55 -03:00
67421cdf1c Even though it was 5 minutes ago what was I thinking 2017-03-23 01:34:06 -03:00
677b8afc1f Integration 2017-03-23 01:19:29 -03:00
aa2b22ff12 Fix usings. 2017-03-23 13:02:34 +09:00
c9fe9e681d Make judgement text generic to be used between game modes. 2017-03-23 12:49:28 +09:00
87b8015e8f Cleanup 2017-03-23 00:29:28 -03:00
c173c4b7ee Tab control 2017-03-23 00:22:31 -03:00
8b71d70633 Add a way to get the score string from JugementInfo. 2017-03-23 12:21:09 +09:00
39134d79a8 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 11:03:42 +09:00
1d9da8facd Merge pull request #520 from smoogipooo/use_equilateral_triangles
Update framework + use EquilateralTriangle in Triangles.
2017-03-23 10:27:21 +09:00
859ee5d316 Tidy up DatabaseWorkingBeatmap. 2017-03-23 10:07:26 +09:00
9601e143d4 Merge branch 'master' into working-beatmap 2017-03-23 09:37:21 +09:00
e7f32fcbce Merge pull request #525 from huoyaoyuan/controls
DropDown update
2017-03-23 09:26:26 +09:00
b0340f77d8 Remove nested types completely. 2017-03-23 08:57:14 +09:00
ff57d3800f Merge branch 'master' into use_equilateral_triangles 2017-03-23 08:51:43 +09:00
02dc6fb213 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 08:50:57 +09:00
3dee39346f U -> T1. 2017-03-23 08:49:29 +09:00
ba32d50456 Consolidate nested classes. 2017-03-23 08:44:52 +09:00
9247017c9a Use EquilateralTriangle in Triangles. 2017-03-23 08:34:39 +09:00
537f0b9340 Fix menu cursor size not sticking on startup.
Also tidied up bindables.
2017-03-23 08:07:59 +09:00
0dbc232ebf Rename all DropDown -> Dropdown. 2017-03-22 22:32:32 +08:00
6a4ca08578 Merge branch 'master' into controls 2017-03-22 22:28:19 +08:00
2d75c60463 Fix checkbox dependency in LoginOptions 2017-03-22 17:21:24 +03:00
2e1f596b2a Move DatabaseWorkingBeatmap out of partial class 2017-03-22 06:50:48 -04:00
fbe08436d2 Fix usages of CircularContainer in line with framework changes. 2017-03-22 19:35:03 +09:00
2b1d31e69c Address linting issues 2017-03-22 06:25:49 -04:00
267238dc27 Simplify derived classes of WorkingBeatmap 2017-03-22 06:15:32 -04:00
cc2b4c5c5b Refactor WorkingBeatmap
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
2017-03-22 05:57:08 -04:00
aa8780797e Abstract class + move AccentColour to base. 2017-03-22 15:22:02 +09:00
e217c67bcf Merge branch 'master' into controls 2017-03-22 08:54:03 +08:00
4f3ab879de Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded.
UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
2017-03-22 09:43:44 +09:00
bee7b43a37 Make avatar fallback work on failed load. 2017-03-22 09:20:37 +09:00
b06eb0122c Fix for colours and members rename. 2017-03-22 08:15:31 +08:00