62006 Commits

This Branch

This Branch

All Branches

• Completed StarCounter

  More complex than the other counters, but hopefully functional.
  I subestimated you and your silly bouncing animations.
  >.>

  Adonais Romero González · 2016-10-09 14:02:44 -05:00
  707effb591
• VolumeControl: add controls for Effects and Music
  TocoToucan · 2016-10-09 20:45:34 +03:00
  89d7de31ee
• Merge pull request #2 from ppy/master

  Actualize fork

  UselessToucan · 2016-10-09 20:34:18 +03:00
  b004961d07
• Merge branch 'master' of github.com:ppy/osu into general-improvements
  Thomas Müller · 2016-10-09 16:02:35 +02:00
  c62f29dcae
• Update Framework version.
  Thomas Müller · 2016-10-09 16:02:25 +02:00
  5861e782e5
• No need to enforce scheduling of task anymore.
  Thomas Müller · 2016-10-09 15:40:32 +02:00
  9ed0748d73
• Post-merge fixes.
  Dean Herbert · 2016-10-09 22:21:44 +09:00
  cb5e4287e2
• Merge branch 'master' into stateful-drawables

  Conflicts:
  	osu.Game/GameModes/Menu/Intro.cs

  Dean Herbert · 2016-10-09 22:08:32 +09:00
  25de055802
• Update framework version.
  Thomas Müller · 2016-10-09 13:31:16 +02:00
  934523e347
• Merge pull request #55 from Tom94/better-addtarget

  Better addtarget

  Dean Herbert · 2016-10-09 20:13:30 +09:00
  de24c86c81
• Use AddInternal instead of AddTopLevel.
  Thomas Müller · 2016-10-09 20:06:23 +09:00
  dd04b33232
• Don't rely on return value of Container.Add.
  Thomas Müller · 2016-10-09 20:06:20 +09:00
  bcb5a02221
• Don't call Container.Add within KeyCounterCollection.Reset.
  Thomas Müller · 2016-10-09 20:06:15 +09:00
  36bb4a3988
• Update framework.
  Dean Herbert · 2016-10-09 20:06:07 +09:00
  0a10bf9a51
• Use AddInternal instead of AddTopLevel.
  Thomas Müller · 2016-10-09 11:56:41 +02:00
  d9486e790a
• Don't rely on return value of Container.Add.
  Thomas Müller · 2016-10-09 11:55:52 +02:00
  99c8f618af
• Don't call Container.Add within KeyCounterCollection.Reset.
  Thomas Müller · 2016-10-09 11:55:38 +02:00
  916bb742da
• Update Framework.
  Thomas Müller · 2016-10-09 11:55:11 +02:00
  c997e16cfb
• Merge pull request #53 from Tom94/use_drawable_scheduler

  Use drawable scheduler

  Dean Herbert · 2016-10-09 15:25:22 +09:00
  76f1653090
• Update framework version.
  Thomas Müller · 2016-10-09 08:16:51 +02:00
  9d54d4f9bb
• Minor fix with StarCounter width
  Adonais Romero González · 2016-10-08 22:15:25 -05:00
  67d3d772f6
• Merge branch 'master' into counters
  Adonais Romero González · 2016-10-08 22:02:43 -05:00
  37115c8c9f
• More styling.
  Adonais Romero González · 2016-10-08 21:58:53 -05:00
  accf365fd1
• StarCounter styling using absolute positioning.
  Adonais Romero González · 2016-10-08 21:45:01 -05:00
  0d18680eeb
• Refactor + Stars Counter (initial)

  Moved a few things to allow using common transforms
  for a star counter. This implementation is basic and
  hacky, but good enough as proof of concept.

  Adonais Romero González · 2016-10-08 19:11:01 -05:00
  5ebb2fc289
• Code formatting and slight changes to transitions.
  Dean Herbert · 2016-10-08 23:27:53 +09:00
  926c46dbd4
• Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem
  Dean Herbert · 2016-10-08 23:27:46 +09:00
  9594b7193c
• Update osu-framework and specify game name
  Drew DeVault · 2016-10-08 10:26:35 -04:00
  eb7486f109
• Use PaddingContainer for better layout.
  Dean Herbert · 2016-10-08 23:25:38 +09:00
  97c2dcf590
• Add in-game chat display, along with a global hotkey handling method.
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  47faf8f40d
• osuLogo handles less keys.
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  1e9e52aecc
• Toolbar stores its current state locally (just for conformity).
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  adba72d293
• General improvements to chat querying and logic organisation.
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  3067c890ce
• Merge pull request #48 from peppy/general-fixes

  General fixes

  Thomas Müller · 2016-10-08 12:21:17 +02:00
  965cd6539f
• Fix typo in comment.
  Dean Herbert · 2016-10-08 19:18:50 +09:00
  5ff3767038
• Fix event not being unbound.
  Dean Herbert · 2016-10-08 19:12:31 +09:00
  5a507838d6
• Use own Scheduler instead of Game.Scheduler.
  Thomas Müller · 2016-10-08 11:33:24 +02:00
  0c793dfe69
• Add proper toolbar state handling.
  Dean Herbert · 2016-10-08 15:54:09 +09:00
  556420ee58
• Ensure the correct background state is restored when skipping multiple levels
  Dean Herbert · 2016-10-08 15:54:09 +09:00
  27a26cfaaf
• Fix welcome sound being played twice.
  Dean Herbert · 2016-10-08 15:54:08 +09:00
  93f326bb9b
• Block window closing while intro is playing.
  Dean Herbert · 2016-10-08 15:54:07 +09:00
  243d2cdec5
• BackgroundModes shouldn't handle the escape key themselves.
  Dean Herbert · 2016-10-08 15:54:07 +09:00
  f2f3b69eee
• Make sure intro can't be exited unless the main menu has displayed once.
  Dean Herbert · 2016-10-08 15:54:06 +09:00
  08728b84d1
• Unify and smiplify exit logic. Now only OsuGame calls the final Exit.
  Dean Herbert · 2016-10-08 15:54:05 +09:00
  c5228b63cb
• Add the ability to exit the game using escape.
  Dean Herbert · 2016-10-08 15:54:05 +09:00
  c5ac851ba9
• Add basic intro sequence.
  Dean Herbert · 2016-10-08 15:54:04 +09:00
  b2d899feb5
• Never Prefer32bit.
  Dean Herbert · 2016-10-08 15:54:04 +09:00
  656aee41e2
• Remove "Deploy" configuration.
  Dean Herbert · 2016-10-08 15:54:03 +09:00
  4f2bb25853
• Update namespace references.
  Dean Herbert · 2016-10-08 15:54:02 +09:00
  a5adbc0615
• Fix the initial state of VolumeControl being wrong.
  Dean Herbert · 2016-10-08 15:54:01 +09:00
  065b193b15