75266 Commits

This Branch

This Branch

All Branches

• Use explicit cast to OsuGame rather than in-between derived classes.

  # Conflicts:
  #	osu.Game/GameModes/Menu/MainMenu.cs

  Dean Herbert · 2016-10-01 17:02:57 +09:00
  5afb038025
• Add parallax to ButtonSystem.
  Dean Herbert · 2016-10-01 17:02:20 +09:00
  40e5a449bf
• Adjust scale and outwards transition of ButtonSystem.
  Dean Herbert · 2016-10-01 17:02:01 +09:00
  4ad618abc9
• Improve the transition and look of white-boxed game modes.
  Dean Herbert · 2016-10-01 17:01:09 +09:00
  665352f706
• Merge pull request #16 from peppy/beatmap_framework

  Beatmap framework

  Dean Herbert · 2016-10-01 16:53:58 +09:00
  24837a0af3
• Ensure we always remain fully visible on any aspect ratio (including very tall ones).
  Dean Herbert · 2016-09-30 18:46:34 +09:00
  0178e23b73
• Add basic background display system.
  Dean Herbert · 2016-09-30 18:45:55 +09:00
  cc14aeb802
• Add template toolbar.
  Dean Herbert · 2016-09-30 18:45:27 +09:00
  d93718d953
• Add delay for exit process.
  Dean Herbert · 2016-09-30 13:31:05 +09:00
  463f606004
• Add OsuGameMode. Standardise naming of classes.
  Dean Herbert · 2016-09-30 13:30:55 +09:00
  357c94ed8a
• Merge remote-tracking branch 'upstream/master' into beatmap_framework
  Dean Herbert · 2016-09-30 00:13:08 +09:00
  643ae0cefe
• Merge remote-tracking branch 'upstream/master' into api-channels-messages

  Conflicts:
  	osu.Game/Online/Chat/Message.cs

  Dean Herbert · 2016-09-29 23:54:33 +09:00
  b4c9dca54b
• Add null check.
  Dean Herbert · 2016-09-29 23:52:51 +09:00
  a114463678
• Basic white-boxing of all game modes.
  Dean Herbert · 2016-09-29 23:51:17 +09:00
  154226b9a3
• Merge pull request #39 from peppy/general-fixes

  General fixes

  Thomas Müller · 2016-09-29 16:50:12 +02:00
  8470961c2a
• Add basic tweening mouse cursor.

  # Conflicts:
  #	osu-framework

  Dean Herbert · 2016-09-29 23:46:33 +09:00
  2db962dc33
• Add contains override to allow correct rendering by CursorContainer on window bounds.
  Dean Herbert · 2016-09-29 23:46:30 +09:00
  ae6fb0553d
• Fix a few warnings.
  Dean Herbert · 2016-09-29 23:46:27 +09:00
  a69c5b4fc0
• Add TestCase for main menu ButtonSystem.
  Dean Herbert · 2016-09-29 23:46:24 +09:00
  7dcf2c6269
• Update framework.
  Dean Herbert · 2016-09-29 23:46:10 +09:00
  27b96ab6c9
• Move initialisation of ChatLine to Load.
  Dean Herbert · 2016-09-28 16:33:20 +09:00
  7c98ef1b3d
• Merge branch 'refs/heads/master' into api-channels-messages

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

  Dean Herbert · 2016-09-28 16:30:00 +09:00
  8650e951e5
• Merge branch 'refs/heads/master' into beatmap_framework

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

  Dean Herbert · 2016-09-28 16:09:26 +09:00
  eaab1b718e
• Merge pull request #31 from huoyaoyuan/key-counter

  Key Counter

  Dean Herbert · 2016-09-28 15:56:25 +09:00
  cca5de2203
• Remove getter on Objects.
  Dean Herbert · 2016-09-28 15:49:47 +09:00
  aad58532ec
• Add missing SizeMode.
  Dean Herbert · 2016-09-28 14:40:27 +09:00
  3755ca0501
• Improve formatting of chat lines.
  Dean Herbert · 2016-09-27 20:45:26 +09:00
  67652a6d8e
• Simple chat message display functionality.
  Dean Herbert · 2016-09-27 19:22:22 +09:00
  754d9c78bd
• Fix API scheduling.
  Dean Herbert · 2016-09-27 19:22:08 +09:00
  154b914a3a
• Add clear to ensure no pile-up of messages.
  Dean Herbert · 2016-09-27 18:41:58 +09:00
  b4e65e7011
• Add back basic API support for channel/message retrieval.
  Dean Herbert · 2016-09-27 18:33:52 +09:00
  28045b7136
• Relative size and position for text layer.
  Huo Yaoyuan · 2016-09-26 16:56:39 +08:00
  25fecfca06
• Add ResetCount method for Counter.
  Huo Yaoyuan · 2016-09-26 14:23:22 +08:00
  bb13da2b32
• Update private methods implementation.
  Huo Yaoyuan · 2016-09-26 14:21:40 +08:00
  b4bb3d6317
• Add missing lincense header, remove unnecessary comment and field.
  Huo Yaoyuan · 2016-09-26 14:21:25 +08:00
  756e7a6a67
• Use the old naming style for now.
  Dean Herbert · 2016-09-26 15:07:29 +09:00
  f0284ce57c
• Merge branch 'master' into key-counter
  Huo Yaoyuan · 2016-09-26 13:46:51 +08:00
  3d23dda3b4
• Merge pull request #37 from peppy/general-fixes

  Fix OpenTK reference in VisualTests.

  Dean Herbert · 2016-09-26 14:42:24 +09:00
  cd57661aa2
• Move PlayTest to the VisualTests project.
  Dean Herbert · 2016-09-25 13:59:38 +09:00
  ae100e3137
• Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework

  # Conflicts:
  #	osu.Game/GameModes/Menu/ButtonSystem.cs
  #	osu.Game/OsuGame.cs

  Dean Herbert · 2016-09-25 13:40:06 +09:00
  58ed5c00e4
• Fix OpenTK reference in VisualTests.
  Dean Herbert · 2016-09-25 13:32:53 +09:00
  9491bd7f59
• Fix typo and missnaming.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  63535df6dc
• Comma seperator in numbers.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  ec2bc4720d
• Add FadeTime and allow setting custom styles directly from container.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  ed4fae53cb
• Adjust visual tree of counter.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  f4ac1f630d
• Avoid accessing container in each counter.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  0da0d4f35e
• Rename counter classes to avoid confusing.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  c70bf53486
• Visual test for KeyCounter.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  4b459b4f67
• Make counter public.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  16f1dff849
• IsLit Adjustment.
  Huo Yaoyuan · 2016-09-24 19:46:10 +08:00
  d8666deaa0