Commit Graph

185 Commits

Author SHA1 Message Date
9021042d93 Fix CircularContainer usage. 2016-10-22 18:40:04 +09:00
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
43f0409893 Start to structure flow of information in Player.
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
e78e0d37b4 Make playfield dark, not light. No masking either. 2016-10-19 18:15:49 +09:00
a1d961dc87 Make the Player class more friendly and add a test case. 2016-10-19 18:00:35 +09:00
94968a8b7c Add initial implementation of osu! HitCircle. 2016-10-19 16:19:01 +09:00
ee463dc65c Merge pull request #77 from NeoAdonis/counters-a
Rolling counters
2016-10-19 15:06:00 +09:00
68476eafb9 Use DrawSize instead of Size whereever Size was previously read due to framework changes.
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
eeacd85073 Protect RollingCounter props 2016-10-17 21:40:50 -05:00
5abc3ba898 Merge remote-tracking branch 'upstream/master' into counters-a 2016-10-17 20:36:04 -05:00
72c4dc344e Misc. fixes and improvements 2016-10-16 18:30:25 -05:00
a671765a4f Modified ManiaComboCounter behavior
This to match more with the current behavior in osu!mania.
2016-10-16 17:45:37 -05:00
2c06764b79 Better safe than sorry 2016-10-16 17:10:08 -05:00
53076f6446 Modify osu! logo to use new CircularContainer. 2016-10-16 19:26:56 +02:00
b3e531b98c Remove implementation of WedgedBox and use Shear transformation instead. 2016-10-16 14:10:24 +02:00
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
15c6a563be Moved ComboResultCounter to right namespace 2016-10-15 22:24:03 -05:00
862dc1d7c7 Tidying code and restricting methods 2016-10-15 19:07:07 -05:00
84dcb63ad2 Changed ComboCounter format...
...to improve value management.
2016-10-15 18:06:31 -05:00
0ceb72ba42 More refactoring 2016-10-15 15:16:02 -05:00
a15f4cda44 Tidying 2016-10-15 15:03:51 -05:00
c268500f89 Minor variable change 2016-10-15 14:01:11 -05:00
9241287c79 Merge branch 'master' into counters-a 2016-10-15 13:45:55 -05:00
1d8ff5fe46 Use circular hover region for osu! logo. 2016-10-15 15:31:16 +02:00
6bd3eaf37d Changes according to review + Refactor 2016-10-14 18:23:27 -05:00
123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up
Strongly type specifications
2016-10-14 18:57:42 +09:00
cb54d33c6e Make converter instance per-convert. 2016-10-14 17:48:07 +08:00
254cc87578 Use name ToggleVisibility. 2016-10-14 05:02:13 +08:00
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
c93a440d3b Make Options:IStateful. 2016-10-13 22:27:37 +08:00
ac66c08991 Make converter per-instance. 2016-10-13 21:55:49 +08:00
45a9249306 Move implementation of HitRender.Converter to base class using an abstract Converter property. 2016-10-13 21:14:18 +08:00
2566d6bfe0 Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
aa96d98822 Merge branch 'master' into limit-game-access
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
29d223dc41 Update framework and simplify some references. 2016-10-12 19:52:49 +09:00
b2c31d3047 Updates post-master-merge. 2016-10-12 16:01:23 +09:00
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
af76dc09d3 Move direction declaration to usage. 2016-10-12 15:33:04 +09:00
f737090c6b Make CentreTarget public. 2016-10-12 15:28:28 +09:00
79b62d4373 Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	osu-framework
	osu.Desktop.VisualTests/Program.cs
2016-10-12 15:20:23 +09:00
c0ea061bd4 Update framework; amend ToolbarButton to use padding and Children initialiser. 2016-10-12 12:24:07 +09:00
c62f29dcae Merge branch 'master' of github.com:ppy/osu into general-improvements 2016-10-09 16:02:35 +02:00
9ed0748d73 No need to enforce scheduling of task anymore. 2016-10-09 15:40:32 +02:00
25de055802 Merge branch 'master' into stateful-drawables
Conflicts:
	osu.Game/GameModes/Menu/Intro.cs
2016-10-09 22:08:32 +09:00
dd04b33232 Use AddInternal instead of AddTopLevel. 2016-10-09 20:06:23 +09:00
bcb5a02221 Don't rely on return value of Container.Add. 2016-10-09 20:06:20 +09:00
d9486e790a Use AddInternal instead of AddTopLevel. 2016-10-09 11:56:41 +02:00
99c8f618af Don't rely on return value of Container.Add. 2016-10-09 11:55:52 +02:00
76f1653090 Merge pull request #53 from Tom94/use_drawable_scheduler
Use drawable scheduler
2016-10-09 15:25:22 +09:00