75266 Commits

This Branch

This Branch

All Branches

• Fixed wrong action message color
  MrTheMake · 2017-09-22 14:33:20 +02:00
  dc5c046d4b
• Merge branch 'master' into storyboard_integration

  # Conflicts:
  #	osu.Game/Configuration/OsuConfigManager.cs
  #	osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs

  Damnae · 2017-09-22 12:45:34 +02:00
  2c245f4c22
• Fix chat message style for non action messages
  MrTheMake · 2017-09-22 11:35:07 +02:00
  3e8941f8e1
• Updated design
  MrTheMake · 2017-09-22 11:30:01 +02:00
  dce577f92a
• Merge pull request #1283 from gabixdev/master

  Add option to disable cursor rotation.

  Dean Herbert · 2017-09-22 15:43:09 +08:00
  d82b7575e1
• Merge branch 'master' into master
  Dean Herbert · 2017-09-22 15:19:23 +08:00
  98c22e8111
• Merge remote-tracking branch 'refs/remotes/ppy/master'
  Shawdooow · 2017-09-22 00:37:17 -04:00
  a83fc51a2b
• Initial implementation of chat commands
  MrTheMake · 2017-09-22 01:47:24 +02:00
  31e26364a6
• Add arrows overlay
  EVAST9919 · 2017-09-22 01:16:05 +03:00
  56bde64839
• some more unused stuff
  Jorolf · 2017-09-21 22:28:15 +02:00
  9ee824ee66
• Merge branch 'ranks-section' of github.com:Jorolf/osu into ranks-section
  Jorolf · 2017-09-21 22:15:51 +02:00
  b65f4cc397
• remove some redundant stuff
  Jorolf · 2017-09-21 22:15:42 +02:00
  14b8e9fd77
• Fix formatting ;_;
  gabixdev · 2017-09-21 22:11:35 +02:00
  8438ea1267
• Merge branch 'master' into ranks-section
  jorolf · 2017-09-21 22:11:22 +02:00
  e4ee0a2b91
• make pagination work and remove duplication in RanksSection
  Jorolf · 2017-09-21 22:07:23 +02:00
  72141935e8
• Remove useless clock assignment
  EVAST9919 · 2017-09-21 22:58:49 +03:00
  5383e33f3d
• Apply suggested changes
  EVAST9919 · 2017-09-21 22:54:46 +03:00
  22ab2c5e5d
• Change type check to safe cast.
  DrabWeb · 2017-09-21 14:53:42 -03:00
  01e70f9bef
• Fix preview button potential null ref.
  DrabWeb · 2017-09-21 14:46:51 -03:00
  46af17f00c
• Merge https://github.com/ppy/osu into online-beatmap-set-overlay
  DrabWeb · 2017-09-21 14:25:34 -03:00
  cb4818e84e
• Remove using
  EVAST9919 · 2017-09-21 01:56:50 +03:00
  9667270336
• Fix wrong arrows position on startup
  EVAST9919 · 2017-09-21 01:51:40 +03:00
  e051bcc6df
• Add arrows
  EVAST9919 · 2017-09-21 01:44:30 +03:00
  c79568135a
• Move every class to it's own file
  EVAST9919 · 2017-09-20 22:33:07 +03:00
  18a714df74
• CI fixes
  EVAST9919 · 2017-09-20 20:58:20 +03:00
  581689a84d
• Add info container
  EVAST9919 · 2017-09-20 20:50:14 +03:00
  4699a44608
• Add remaining time counter
  EVAST9919 · 2017-09-20 19:45:38 +03:00
  8d7db52200
• Remove useless usings
  EVAST9919 · 2017-09-20 16:03:31 +03:00
  eb93706c26
• Add remaining time container
  EVAST9919 · 2017-09-20 15:58:28 +03:00
  0f04d8c6a7
• Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
  EVAST9919 · 2017-09-20 15:36:54 +03:00
  1d978d3617
• Remove redundant usings
  smoogipooo · 2017-09-20 18:40:41 +09:00
  e65a17ad96
• Improve layout of bottom bar in the Editor
  smoogipooo · 2017-09-20 18:16:03 +09:00
  7168e8fd99
• CI fixes
  smoogipooo · 2017-09-20 17:16:12 +09:00
  58b09a161f
• Add SummaryTimeline to Editor
  smoogipooo · 2017-09-20 17:09:38 +09:00
  7588f1b6ca
• Move SummaryTimeline into /Edit/Components/SummaryTimeline
  smoogipooo · 2017-09-20 16:59:03 +09:00
  f9568619e7
• CI fixes
  smoogipooo · 2017-09-20 16:53:01 +09:00
  3da3ef1a50
• Mini -> Summary
  smoogipooo · 2017-09-20 16:48:30 +09:00
  5978668d2b
• Generate a set beatmap instead of using the available beatmaps
  smoogipooo · 2017-09-20 16:40:37 +09:00
  967bfa404e
• Merge branch 'master' into editor-timing-timeline

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-09-20 16:19:08 +09:00
  6a9572db6c
• Cleanup + commenting
  smoogipooo · 2017-09-20 15:55:23 +09:00
  01d84893a0
• EditorTimingTimeline -> EditorMiniTimeline
  smoogipooo · 2017-09-20 15:50:32 +09:00
  fd278256ad
• Actually load a beatmap for TestCaseEditorTimingTimeline
  smoogipooo · 2017-09-20 15:40:42 +09:00
  252121968d
• Make EditorTimingTimeline support beatmap changes
  smoogipooo · 2017-09-20 15:40:27 +09:00
  01c3818ea0
• Ensure only one dialog is being displayed by the SongSelect footer at a time

  Fixes #1208

  Dean Herbert · 2017-09-20 14:32:15 +09:00
  120446e4a7
• Merge pull request #1297 from peppy/deploy-multiple-targets

  Allow deploy script to deploy multiple project targets

  Dan Balasescu · 2017-09-20 12:57:24 +09:00
  278e51eebc
• Merge branch 'master' of git://github.com/ppy/osu into ranks-section
  Jorolf · 2017-09-19 21:26:05 +02:00
  5b90f45691
• Merge branch 'master' into direct-previews
  jorolf · 2017-09-19 19:25:41 +02:00
  ce4a44000f
• Merge branch 'master' into storyboard_integration
  Damnae · 2017-09-19 17:36:29 +02:00
  fcaabf7fdf
• Allow deploy script to deploy multiple project targets
  Dean Herbert · 2017-09-19 23:44:46 +09:00
  2923af1946
• Move testcase to the correct project
  EVAST9919 · 2017-09-19 17:37:34 +03:00
  4cf88c72bf