23651 Commits

This Branch

This Branch

All Branches

• Add intro and begin to create central logic nest.
  Dean Herbert · 2016-10-08 15:53:56 +09:00
  d6042bd689
• Expose CursorContainer.
  Dean Herbert · 2016-10-08 15:53:55 +09:00
  9b76a0ffb8
• Remove unusable "tests" button from main menu system.
  Dean Herbert · 2016-10-08 15:53:54 +09:00
  a23ca25e7d
• Add main menu music back.
  Dean Herbert · 2016-10-08 15:53:53 +09:00
  75c97a62e3
• Bring up-to-date with latest framework.
  Dean Herbert · 2016-10-08 15:53:52 +09:00
  e5dc8bad2f
• Update framework version.
  Dean Herbert · 2016-10-08 15:50:46 +09:00
  9ed4da556e
• TestCase buttons + minor fixes
  Adonais Romero González · 2016-10-07 17:15:36 -05:00
  a3b4a34a1a
• Reflection to simplify transforms + some refactoring
  Adonais Romero González · 2016-10-07 16:59:52 -05:00
  7277cf5af1
• Line wrapping
  Adonais Romero González · 2016-10-07 16:14:35 -05:00
  965e542eaf
• Merge pull request #46 from peppy/background-stack

  Game Mode Backgrounds & More

  Dean Herbert · 2016-10-07 23:29:15 +09:00
  eca76c2a81
• Bring framework up-to-date.
  Dean Herbert · 2016-10-07 22:54:37 +09:00
  2ca7a74e63
• Licence added
  Adonais Romero González · 2016-10-07 02:24:46 -05:00
  35325fab95
• Rolling counters (initial)
  Adonais Romero González · 2016-10-07 02:05:02 -05:00
  00cfc51004
• Make play modes display playfield.
  Dean Herbert · 2016-10-05 20:49:31 +09:00
  b588f28856
• Improve white-boxed game modes.
  Dean Herbert · 2016-10-05 20:08:58 +09:00
  c0f25a2683
• Remove unused button state.
  Dean Herbert · 2016-10-05 20:07:15 +09:00
  4eb310c3a5
• Fix width of toolbar buttons with text.
  Dean Herbert · 2016-10-05 20:07:10 +09:00
  698c1ef1ae
• Add BackgroundMode stack.
  Dean Herbert · 2016-10-05 20:06:55 +09:00
  03aea04a00
• Merge pull request #43 from peppy/toolbar

  Basic toolbar implementation

  Drew DeVault · 2016-10-04 14:30:42 -04:00
  3c01f59e00
• Framework update.
  Dean Herbert · 2016-10-05 03:27:29 +09:00
  a768e4ec16
• Fix being able to click two toolbar buttons at once.
  Dean Herbert · 2016-10-04 20:00:55 +09:00
  3891f467a3
• Clean up a bit.
  Dean Herbert · 2016-10-04 19:57:32 +09:00
  836083667f
• Implement mode selector highlight line.
  Dean Herbert · 2016-10-04 19:41:18 +09:00
  cc52580568
• Add osu! prefix to mode descriptions.
  Dean Herbert · 2016-10-04 19:40:56 +09:00
  c2d4672b8d
• Make Home, Settings and PlayMode buttons work.
  Dean Herbert · 2016-10-04 17:15:03 +09:00
  11403a922a
• Merge pull request #1 from ppy/master

  Actualize fork

  UselessToucan · 2016-10-03 18:41:10 +03:00
  2f588a2d2c
• Remove performance overlay.
  Dean Herbert · 2016-10-03 23:56:25 +09:00
  51cf13460f
• Add basic layout for toolbar.
  Dean Herbert · 2016-10-03 20:39:32 +09:00
  ddcd5ec286
• Merge pull request #41 from peppy/game-modes-layout

  Basic white-boxing of all game modes.

  Dean Herbert · 2016-10-01 19:33:03 +09:00
  2b905df58c
• Bring framework and resources up-to-date.
  Dean Herbert · 2016-10-01 19:05:26 +09:00
  ac16bffe49
• Move toolbar to OsuGame.
  Dean Herbert · 2016-10-01 18:01:52 +09:00
  7db555be5d
• Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout

  # Conflicts:
  #	osu.Game/OsuGame.cs
  #	osu.Game/OsuGameBase.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2016-10-01 17:10:27 +09:00
  f0681f35c4
• Merge pull request #40 from peppy/api-channels-messages

  API: channels & messages

  Dean Herbert · 2016-10-01 17:07:05 +09:00
  cdbc47ef7a
• Merge branch 'refs/heads/master' into api-channels-messages

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

  Dean Herbert · 2016-10-01 17:05:56 +09:00
  b110a879a7
• Remove unused variable.
  Dean Herbert · 2016-10-01 17:03:47 +09:00
  af91341704
• 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