61410 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into visual-test-framework
  Dean Herbert · 2016-09-24 20:41:07 +09:00
  32b67023f3
• Remove unnecessary testcases.
  Dean Herbert · 2016-09-24 20:29:41 +09:00
  307224a07d
• Merge pull request #36 from huoyaoyuan/manifest

  Enhanced app.manifest for Windows 10.

  Dean Herbert · 2016-09-24 19:46:19 +09:00
  75b430515b
• Enhanced app.manifest for Windows 10.
  Huo Yaoyuan · 2016-09-24 18:37:28 +08:00
  e75b559eb3
• Remove app.manifest reference.
  Dean Herbert · 2016-09-24 19:29:23 +09:00
  dc283e2d08
• Add basic implementation of VisualTest framework for osu! project.

  Comes with one complimentary test.

  Dean Herbert · 2016-09-24 15:47:17 +09:00
  7bdb2fcfc7
• Merge pull request #34 from peppy/general-fixes

  General fixes

  Dean Herbert · 2016-09-24 15:46:11 +09:00
  1705914093
• Update framework.
  Dean Herbert · 2016-09-24 15:42:19 +09:00
  52c604d718
• Fix indentation.
  Dean Herbert · 2016-09-24 15:35:27 +09:00
  9891e72114
• Remove silly textboxes.
  Dean Herbert · 2016-09-24 00:09:59 +09:00
  c64dfca82e
• Add back TextAwesome and osu!font.
  Dean Herbert · 2016-09-24 00:05:09 +09:00
  f936618156
• Update resources.
  Dean Herbert · 2016-09-24 00:03:20 +09:00
  b9aead06ad
• Update framework.
  Dean Herbert · 2016-09-24 00:02:08 +09:00
  d9b77db537
• Merge pull request #28 from peppy/general-fixes

  Framework updates.

  Dean Herbert · 2016-09-21 17:39:36 +09:00
  edcc48c49b
• Update framework again.
  Dean Herbert · 2016-09-21 17:37:33 +09:00
  997c6f45f6
• Use children for initialisation.
  Dean Herbert · 2016-09-21 13:25:23 +09:00
  33e46facec
• Add back Playfield masking.
  Dean Herbert · 2016-09-21 13:21:55 +09:00
  3a5f37444c
• Add proper HitObject expiration.
  Dean Herbert · 2016-09-21 13:12:15 +09:00
  1712a142a5
• Bring framework up-to-date.
  Dean Herbert · 2016-09-21 13:12:05 +09:00
  f1688499e4
• 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

  Dean Herbert · 2016-09-20 16:36:42 +09:00
  e0c06a4f19
• Fix window size.
  Dean Herbert · 2016-09-20 16:26:07 +09:00
  b2e7f290f2
• Framework updates.
  Dean Herbert · 2016-09-20 14:41:55 +09:00
  b9de26aa26
• Merge pull request #27 from RemieRichards/update_to_new_children_syntax

  Updates to latest osu-framework, Updates Load()s to use new Children syntax

  Dean Herbert · 2016-09-19 10:12:54 +09:00
  9a5874b063
• Reverts a small bandaid fix that's no longer necessary relating to the order in which osulogo is initialised.
  Remie Richards · 2016-09-19 01:57:15 +01:00
  3b1ef0b991
• Fixes invalid button scaling, Fixes invalid button location (they were oddly shifted to the right)
  Remie Richards · 2016-09-19 01:47:14 +01:00
  3c297064b6
• Fixes over-scaling, Brings osu! logo back to the front
  Remie Richards · 2016-09-19 01:35:50 +01:00
  320f76d860
• Missed an extra set of () on an object initialiser
  Remie Richards · 2016-09-18 20:49:01 +01:00
  80dfad9af9
• Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency
  Remie Richards · 2016-09-18 20:41:53 +01:00
  314b0dfc04
• An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end.
  Remie Richards · 2016-09-18 16:42:59 +01:00
  4732a4db19
• Updates to latest stable framework version.
  Remie Richards · 2016-09-18 16:29:05 +01:00
  30db97d72d
• Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs
  Remie Richards · 2016-09-17 22:11:27 +01:00
  f2fa9f611a
• Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface
  Remie Richards · 2016-09-17 21:54:52 +01:00
  4754c0e2d1
• Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax
  Remie Richards · 2016-09-17 21:33:46 +01:00
  1a5c2b5221
• Fix osu! playfield (was using inheriting sizemode when it shouldn't).
  Dean Herbert · 2016-09-15 23:58:02 +09:00
  36ae4dd271
• Merge pull request #26 from peppy/general-fixes

  Bring framework up-to-date.

  Thomas Müller · 2016-09-11 10:33:06 +02:00
  b52c3074ef
• Bring framework up-to-date.
  Dean Herbert · 2016-09-11 17:23:43 +09:00
  375406bc97
• Merge pull request #25 from peppy/general-fixes

  Update to latest framework version.

  Thomas Müller · 2016-09-10 20:08:31 +02:00
  be962e681d
• Update to latest framework version.
  Dean Herbert · 2016-09-11 03:04:47 +09:00
  4a85d8627d
• Framework updates.
  Dean Herbert · 2016-09-11 02:27:42 +09:00
  851ef4fbbf
• Merge branch 'general-fixes' into beatmap_framework

  Conflicts:
  	osu-framework

  Dean Herbert · 2016-09-11 02:24:15 +09:00
  b6bbea392b
• Update to latest framework version.
  Dean Herbert · 2016-09-11 02:23:26 +09:00
  842fb1892f
• Merge pull request #23 from peppy/general-fixes

  Framework updates

  Dean Herbert · 2016-09-07 17:51:51 +09:00
  e27eb996bc
• And again.
  smoogipooo · 2016-09-07 18:20:54 +09:30
  f29bf8e914
• Update to use new transform logic.
  Dean Herbert · 2016-09-06 21:42:45 +09:00
  753a67fb3d
• Add remaining HitRenderers.

  Many general improvements.

  Dean Herbert · 2016-09-06 21:42:45 +09:00
  9e76feb159
• Make OsuPlayfield box a bit larger.
  Dean Herbert · 2016-09-06 21:42:45 +09:00
  97d101310d
• Move playfields to own class.
  Dean Herbert · 2016-09-06 21:42:45 +09:00
  024ae1d1c2
• Add basic TaikoHitRenderer.
  Dean Herbert · 2016-09-06 21:42:45 +09:00
  93744f7372
• Add basic box background to OsuPlayfield.
  Dean Herbert · 2016-09-06 21:42:45 +09:00
  677a1b0e56
• Add basic HitRenderer framework.
  Dean Herbert · 2016-09-06 21:42:45 +09:00
  2ea5a5c675