1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 01:22:54 +08:00
Commit Graph

2747 Commits

Author SHA1 Message Date
Dean Herbert
357c94ed8a Add OsuGameMode. Standardise naming of classes. 2016-09-30 13:30:55 +09:00
Dean Herbert
643ae0cefe Merge remote-tracking branch 'upstream/master' into beatmap_framework 2016-09-30 00:13:08 +09:00
Dean Herbert
2db962dc33 Add basic tweening mouse cursor.
# Conflicts:
#	osu-framework
2016-09-29 23:46:33 +09:00
Dean Herbert
ae6fb0553d Add contains override to allow correct rendering by CursorContainer on window bounds. 2016-09-29 23:46:30 +09:00
Dean Herbert
7dcf2c6269 Add TestCase for main menu ButtonSystem. 2016-09-29 23:46:24 +09:00
Dean Herbert
eaab1b718e Merge branch 'refs/heads/master' into beatmap_framework
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2016-09-28 16:09:26 +09:00
Huo Yaoyuan
25fecfca06 Relative size and position for text layer. 2016-09-26 16:56:39 +08:00
Huo Yaoyuan
bb13da2b32 Add ResetCount method for Counter. 2016-09-26 14:23:22 +08:00
Huo Yaoyuan
b4bb3d6317 Update private methods implementation. 2016-09-26 14:21:40 +08:00
Huo Yaoyuan
756e7a6a67 Add missing lincense header, remove unnecessary comment and field. 2016-09-26 14:21:25 +08:00
Dean Herbert
58ed5c00e4 Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework
# Conflicts:
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/OsuGame.cs
2016-09-25 13:40:06 +09:00
Huo Yaoyuan
63535df6dc Fix typo and missnaming. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ec2bc4720d Comma seperator in numbers. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ed4fae53cb Add FadeTime and allow setting custom styles directly from container. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
f4ac1f630d Adjust visual tree of counter. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
0da0d4f35e Avoid accessing container in each counter. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
c70bf53486 Rename counter classes to avoid confusing. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
16f1dff849 Make counter public. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
d8666deaa0 IsLit Adjustment. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ba19fe1b97 Move IsCounting to KeyCounter. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
409bb0d068 Counter animation. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
81f269ee69 MouseCount and KeyBoardCount, input handling. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
e5ef3e1d02 Adjust children position of Counter. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
55a1a3827a Implement KeyCounter and base Count class. 2016-09-24 19:46:10 +08:00
Dean Herbert
7bdb2fcfc7 Add basic implementation of VisualTest framework for osu! project.
Comes with one complimentary test.
2016-09-24 15:47:17 +09:00
Dean Herbert
f936618156 Add back TextAwesome and osu!font. 2016-09-24 00:05:09 +09:00
Dean Herbert
e0c06a4f19 Merge branch 'refs/heads/general-fixes' into beatmap_framework
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/FieldTest.cs
#	osu.Game/GameModes/FontTest.cs
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/Graphics/UserInterface/TextBox.cs
#	osu.Game/OsuGame.cs
#	osu.Game/osu.Game.csproj
2016-09-20 16:36:42 +09:00
Remie Richards
f2fa9f611a Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs 2016-09-17 22:11:27 +01:00
Remie Richards
4754c0e2d1 Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface 2016-09-17 21:54:52 +01:00
Remie Richards
1a5c2b5221 Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax 2016-09-17 21:33:46 +01:00
Dean Herbert
375406bc97 Bring framework up-to-date. 2016-09-11 17:23:43 +09:00
Dean Herbert
4a85d8627d Update to latest framework version. 2016-09-11 03:04:47 +09:00
Dean Herbert
b6bbea392b Merge branch 'general-fixes' into beatmap_framework
Conflicts:
	osu-framework
2016-09-11 02:24:15 +09:00
Dean Herbert
842fb1892f Update to latest framework version. 2016-09-11 02:23:26 +09:00
Dean Herbert
3098204dda Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00
Dean Herbert
23111821f5 Update naming conventions. 2016-09-04 18:31:58 +09:00
smoogipooo
dde748b8c1 Fix loaded not being set on textbox Load. 2016-09-03 21:18:07 +09:30
Dean Herbert
7d9cb85289 Hook up new TextInputSource to TextBox. 2016-09-02 14:41:42 +09:00
Dean Herbert
49a4d64fad Fix TextBox always taking keyboard focus. 2016-09-01 22:55:02 +09:00
Dean Herbert
600223a65c Add proper keyboard sound effects back. 2016-09-01 22:51:45 +09:00
Dean Herbert
923fc228e9 Fix cursor horizontal position. 2016-09-01 22:51:03 +09:00
Dean Herbert
a2fc339a45 Update Transforms to new style. 2016-09-01 22:51:03 +09:00
Dean Herbert
41c03ab255 Move ctor content to Load(). Schedule some prop updates. 2016-09-01 22:51:03 +09:00
Dean Herbert
7f0212f93f TextSize -> SpaceWidth (temporary). 2016-09-01 22:51:03 +09:00
Dean Herbert
b3e2339175 Make TextBox rendering work again. 2016-09-01 22:51:03 +09:00
Dean Herbert
81f9ce657f License -> Licence. 2016-08-26 17:27:49 +09:00
Dean Herbert
6cbbeaaac0 Initial commit. 2016-08-26 14:41:47 +09:00