1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 22:52:54 +08:00
Commit Graph

113 Commits

Author SHA1 Message Date
Dean Herbert
154226b9a3 Basic white-boxing of all game modes. 2016-09-29 23:51:17 +09:00
Thomas Müller
8470961c2a Merge pull request #39 from peppy/general-fixes
General fixes
2016-09-29 16:50:12 +02: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
a69c5b4fc0 Fix a few warnings. 2016-09-29 23:46:27 +09:00
Dean Herbert
7dcf2c6269 Add TestCase for main menu ButtonSystem. 2016-09-29 23:46:24 +09:00
Dean Herbert
27b96ab6c9 Update framework. 2016-09-29 23:46:10 +09:00
Dean Herbert
cca5de2203 Merge pull request #31 from huoyaoyuan/key-counter
Key Counter
2016-09-28 15:56:25 +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
Huo Yaoyuan
3d23dda3b4 Merge branch 'master' into key-counter 2016-09-26 13:46:51 +08:00
Dean Herbert
cd57661aa2 Merge pull request #37 from peppy/general-fixes
Fix OpenTK reference in VisualTests.
2016-09-26 14:42:24 +09:00
Dean Herbert
9491bd7f59 Fix OpenTK reference in VisualTests. 2016-09-25 13:32:53 +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
4b459b4f67 Visual test for KeyCounter. 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
8a168f2d29 Merge pull request #35 from peppy/visual-test-framework
Add basic implementation of VisualTest framework for osu! project.
2016-09-24 20:44:37 +09:00
Dean Herbert
32b67023f3 Merge branch 'master' into visual-test-framework 2016-09-24 20:41:07 +09:00
Dean Herbert
307224a07d Remove unnecessary testcases. 2016-09-24 20:29:41 +09:00
Dean Herbert
75b430515b Merge pull request #36 from huoyaoyuan/manifest
Enhanced app.manifest for Windows 10.
2016-09-24 19:46:19 +09:00
Huo Yaoyuan
e75b559eb3 Enhanced app.manifest for Windows 10. 2016-09-24 18:37:28 +08:00
Dean Herbert
dc283e2d08 Remove app.manifest reference. 2016-09-24 19:29:23 +09: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
1705914093 Merge pull request #34 from peppy/general-fixes
General fixes
2016-09-24 15:46:11 +09:00
Dean Herbert
52c604d718 Update framework. 2016-09-24 15:42:19 +09:00
Dean Herbert
9891e72114 Fix indentation. 2016-09-24 15:35:27 +09:00
Dean Herbert
c64dfca82e Remove silly textboxes. 2016-09-24 00:09:59 +09:00
Dean Herbert
f936618156 Add back TextAwesome and osu!font. 2016-09-24 00:05:09 +09:00
Dean Herbert
b9aead06ad Update resources. 2016-09-24 00:03:20 +09:00
Dean Herbert
d9b77db537 Update framework. 2016-09-24 00:02:08 +09:00
Dean Herbert
edcc48c49b Merge pull request #28 from peppy/general-fixes
Framework updates.
2016-09-21 17:39:36 +09:00
Dean Herbert
997c6f45f6 Update framework again. 2016-09-21 17:37:33 +09:00
Dean Herbert
b2e7f290f2 Fix window size. 2016-09-20 16:26:07 +09:00
Dean Herbert
b9de26aa26 Framework updates. 2016-09-20 14:41:55 +09:00
Dean Herbert
9a5874b063 Merge pull request #27 from RemieRichards/update_to_new_children_syntax
Updates to latest osu-framework, Updates Load()s to use new Children syntax
2016-09-19 10:12:54 +09:00
Remie Richards
3b1ef0b991 Reverts a small bandaid fix that's no longer necessary relating to the order in which osulogo is initialised. 2016-09-19 01:57:15 +01:00
Remie Richards
3c297064b6 Fixes invalid button scaling, Fixes invalid button location (they were oddly shifted to the right) 2016-09-19 01:47:14 +01:00