23651 Commits

This Branch

This Branch

All Branches

• Fix regression causing multi-line (wrapped) chat messages to overlap.
  Dean Herbert · 2016-10-13 03:06:06 +09:00
  8707c7f746
• Update code in accordance with the code review
  TocoToucan · 2016-10-12 20:45:42 +03:00
  00db36fdbe
• Merge pull request #4 from ppy/master

  Actualize master

  UselessToucan · 2016-10-12 20:14:24 +03:00
  7db9e1a8bf
• Merge VolumeControl.cs
  TocoToucan · 2016-10-12 19:17:53 +03:00
  ce391301fa
• Update AddBeatmap accordingly
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  c9a057b510
• Refactor database to reuse existing types
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  e9a45de51f
• Implement OszArchiveReader
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  23bc26ddac
• Initial support code for beatmap loading
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  bc69aa1455
• Use PlayMode instead of GameMode
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  768c3bc31e
• Drop GameMode
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  005dc9e8cb
• Use @strings
  Drew DeVault · 2016-10-12 11:32:40 -04:00
  e8de245032
• MetadataID -> BeatmapMetadataID
  Drew DeVault · 2016-10-12 11:32:27 -04:00
  f6b6446a9c
• Move control of databases into osu-framework
  Drew DeVault · 2016-10-12 11:32:27 -04:00
  72c4a26aea
• Add initial DB schema and support code
  Drew DeVault · 2016-10-12 11:32:07 -04:00
  2d810f72fa
• Change "Master" volume if particular meter is not selected.
  TocoToucan · 2016-10-12 17:36:42 +03:00
  06288d3f7c
• Merge pull request #63 from peppy/limit-game-access

  Limit game access

  Drew DeVault · 2016-10-12 09:54:00 -04:00
  8dadc2b215
• Merge branch 'master' into limit-game-access

  Conflicts:
  	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
  	osu.Game/GameModes/Menu/ButtonSystem.cs
  	osu.Game/Online/Chat/Display/ChatLine.cs
  	osu.Game/OsuGame.cs
  	osu.Game/Overlays/ToolbarButton.cs

  Dean Herbert · 2016-10-12 20:44:33 +09:00
  aa96d98822
• Update framework and simplify some references.
  Dean Herbert · 2016-10-12 19:52:49 +09:00
  29d223dc41
• Merge pull request #52 from peppy/stateful-drawables

  Stateful drawables & chat control

  Drew DeVault · 2016-10-12 04:55:03 -04:00
  fd55199114
• Make stuff compile again (but StarCounter hits assertions).
  Dean Herbert · 2016-10-12 16:11:40 +09:00
  61d5c7c56d
• Merge remote-tracking branch 'upstream/master' into limit-game-access
  Dean Herbert · 2016-10-12 16:03:03 +09:00
  e800649633
• Updates post-master-merge.
  Dean Herbert · 2016-10-12 16:01:23 +09:00
  b2c31d3047
• Remove all non-load Game access.
  Dean Herbert · 2016-10-12 15:47:08 +09:00
  4052a665bf
• Move direction declaration to usage.
  Dean Herbert · 2016-10-12 15:33:04 +09:00
  af76dc09d3
• Make CentreTarget public.
  Dean Herbert · 2016-10-12 15:28:28 +09:00
  f737090c6b
• Centralise the maximum chat history variable.
  Dean Herbert · 2016-10-12 15:25:07 +09:00
  1c0b769451
• Remove upwards reference.
  Dean Herbert · 2016-10-12 15:23:22 +09:00
  24771a62cf
• getter on single line.
  Dean Herbert · 2016-10-12 15:22:03 +09:00
  9276244d6a
• Merge remote-tracking branch 'refs/remotes/upstream/master'

  Conflicts:
  	osu-framework
  	osu.Desktop.VisualTests/Program.cs

  Dean Herbert · 2016-10-12 15:20:23 +09:00
  79b62d4373
• Fix some display regressions in ChatConsole.
  Dean Herbert · 2016-10-12 13:35:21 +09:00
  05031d18ef
• Update framework; amend ToolbarButton to use padding and Children initialiser.
  Dean Herbert · 2016-10-12 12:24:07 +09:00
  c0ea061bd4
• Merge pull request #49 from NeoAdonis/counters

  Rolling counters (initial)

  Drew DeVault · 2016-10-11 15:04:46 -04:00
  5306141f5f
• Change volume in VolumeMeter
  TocoToucan · 2016-10-10 17:19:05 +03:00
  f3c1c60ab7
• Merge pull request #59 from peppy/general-fixes

  Update framework to fix draw order.

  Thomas Müller · 2016-10-10 08:16:52 +02:00
  48bd998f46
• Update framework to fix draw order.
  Dean Herbert · 2016-10-10 15:12:21 +09:00
  4ac2c9ad90
• Merge pull request #54 from SirCmpwn/specify-game-name

  Update osu-framework and specify game name

  Dean Herbert · 2016-10-10 15:03:01 +09:00
  8706027155
• Bring framework up-to-date with upstream master.
  Dean Herbert · 2016-10-10 14:36:27 +09:00
  3f83ffcb99
• Merge remote-tracking branch 'upstream/master' into SirCmpwn/specify-game-name

  Conflicts:
  	osu-framework

  Dean Herbert · 2016-10-10 14:35:43 +09:00
  0b0e79d29f
• Merge pull request #56 from Tom94/general-improvements

  General improvements

  Dean Herbert · 2016-10-10 14:20:17 +09:00
  8b06778746
• Update framework.
  Dean Herbert · 2016-10-10 14:18:06 +09:00
  0b08c8ba15
• Misc. fixes
  Adonais Romero González · 2016-10-09 15:19:35 -05:00
  2954c19345
• StarAnimationEasing
  Adonais Romero González · 2016-10-09 14:55:50 -05:00
  4d0c8ed441
• Hide VisibleCount from transformStar
  Adonais Romero González · 2016-10-09 14:53:06 -05:00
  fd1cbfd8fa
• More line wrapping
  Adonais Romero González · 2016-10-09 14:48:24 -05:00
  01da3ca474
• Not animate stars over MaxStars
  Adonais Romero González · 2016-10-09 14:09:07 -05:00
  841707b61f
• 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