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 |
|
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
|
33e46facec
|
Use children for initialisation.
|
2016-09-21 13:25:23 +09:00 |
|
Dean Herbert
|
3a5f37444c
|
Add back Playfield masking.
|
2016-09-21 13:21:55 +09:00 |
|
Dean Herbert
|
1712a142a5
|
Add proper HitObject expiration.
|
2016-09-21 13:12:15 +09:00 |
|
Dean Herbert
|
f1688499e4
|
Bring framework up-to-date.
|
2016-09-21 13:12:05 +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 |
|
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 |
|
Remie Richards
|
320f76d860
|
Fixes over-scaling, Brings osu! logo back to the front
|
2016-09-19 01:35:50 +01:00 |
|
Remie Richards
|
80dfad9af9
|
Missed an extra set of () on an object initialiser
|
2016-09-18 20:49:01 +01:00 |
|
Remie Richards
|
314b0dfc04
|
Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency
|
2016-09-18 20:41:53 +01:00 |
|
Remie Richards
|
4732a4db19
|
An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end.
|
2016-09-18 16:42:59 +01:00 |
|
Remie Richards
|
30db97d72d
|
Updates to latest stable framework version.
|
2016-09-18 16:29:05 +01: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 |
|