24822 Commits

This Branch

This Branch

All Branches

• Remove linq usage in BreakOverlay update
  Dean Herbert · 2019-08-08 12:58:20 +09:00
  7d42561da9
• Merge branch 'master' into use-bindable-break-time-in-player
  Salman Ahmed · 2019-08-08 05:36:45 +03:00
  3f9f9e7bc9
• Add a bindable for checking if the gameplay is currently in a b… (#5467)

  Add a bindable for checking if the gameplay is currently in a break
  
  Co-authored-by: Shane Woolcock <samahnub@gmail.com>
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-08-08 11:14:00 +09:00
  94206f0aaa
• Remove redundant comment
  Dean Herbert · 2019-08-08 10:42:54 +09:00
  99f5ca07ce
• Move IsLoaded check to more correct place
  Dean Herbert · 2019-08-08 10:41:23 +09:00
  40a33b3382
• Merge branch 'master' into add-bindable-for-break-times
  Dean Herbert · 2019-08-08 10:13:14 +09:00
  a2e3ab6463
• Fix storyboard not showing on disabled user dim
  iiSaLMaN · 2019-08-07 22:18:10 +03:00
  d5b26b86da
• Disallow adding to score after the player has failed
  iiSaLMaN · 2019-08-07 19:58:26 +03:00
  c77e6074f6
• add special skin hit "animations"
  jorolf · 2019-08-07 18:12:11 +02:00
  167a81f40a
• Expose break fade duration and add it in the calculation
  iiSaLMaN · 2019-08-07 16:59:35 +03:00
  ba269a49ee
• Simplify final check for break time
  iiSaLMaN · 2019-08-07 16:28:16 +03:00
  d3657d82cd
• Use IsBreakTime for checking if currently in a break

  Rather than iterating over all breaks to find which is in current time

  iiSaLMaN · 2019-08-07 16:15:53 +03:00
  c2b3c28c79
• Merge master with conflicts resolved
  Andrei Zavatski · 2019-08-07 16:05:28 +03:00
  d9fd054102
• Fix incorrect implementation of old stacking algorithm (#5632)

  Fix incorrect implementation of old stacking algorithm

  Dean Herbert · 2019-08-07 21:53:33 +09:00
  2019.807.0 73cd7b0cc2
• Merge pull request #5633 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-08-07 21:52:28 +09:00
  ad64e719c4
• Fix code format
  DTSDAO · 2019-08-07 20:27:39 +08:00
  9f72e92e0e
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-08-07 21:27:02 +09:00
  ab252b27d5
• Fix code format
  DTSDAO · 2019-08-07 20:16:22 +08:00
  37e4301773
• Merge pull request #5631 from peppy/fix-cursor-scale

  Fix cursor scale not matching osu-stable

  Dan Balasescu · 2019-08-07 20:49:58 +09:00
  cbb227757f
• Move static method to Game class
  DTSDAO · 2019-08-07 19:32:48 +08:00
  411916d4a3
• Merge branch 'master' into fix-cursor-scale
  Dan Balasescu · 2019-08-07 20:05:24 +09:00
  1454c1320f
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-08-07 19:58:37 +09:00
  754fbf3acf
• Merge pull request #5629 from EVAST9919/mod-icon-improvements

  Change Highlighted property in ModIcon to a Bindable

  Dan Balasescu · 2019-08-07 19:57:08 +09:00
  07983877db
• Update framework
  Dean Herbert · 2019-08-07 19:56:17 +09:00
  2ab2889027
• show exception message
  David Zhao · 2019-08-07 19:45:29 +09:00
  bde89adcb7
• Merge branch 'master' into mod-icon-improvements
  Dan Balasescu · 2019-08-07 19:43:52 +09:00
  df784e1d8e
• Fix incorrect path position being used for old stacking algorithm
  smoogipoo · 2019-08-07 19:35:39 +09:00
  bc3a340286
• Log to runtime instead
  David Zhao · 2019-08-07 19:33:54 +09:00
  b8ccba02f2
• Fix incorrect hitobject indices
  smoogipoo · 2019-08-07 19:33:35 +09:00
  42de5934f6
• Output stacked positions for conversion values
  smoogipoo · 2019-08-07 19:33:20 +09:00
  994c1f21ec
• Just assert doesn't throw and don't catch at LegacyDecoder
  David Zhao · 2019-08-07 19:25:40 +09:00
  15a592e25e
• Merge pull request #5630 from peppy/move-quadbatch-local

  Dispose flashlight quad batch

  Dean Herbert · 2019-08-07 18:49:30 +09:00
  6df671ff7f
• Add further xmldoc
  Dean Herbert · 2019-08-07 18:45:56 +09:00
  ec13143ab3
• return on storyboard side
  David Zhao · 2019-08-07 18:40:58 +09:00
  da15e19912
• Fix cursor scale not matching osu-stable
  Dean Herbert · 2019-08-07 18:35:07 +09:00
  38df49995c
• Merge branch 'master' into move-quadbatch-local
  Dan Balasescu · 2019-08-07 18:01:56 +09:00
  18ac5b31a1
• Dispose instead
  Dean Herbert · 2019-08-07 17:33:30 +09:00
  b0e0659715
• Merge branch 'beatmap-events' of https://github.com/nyquillerium/osu into beatmap-events
  David Zhao · 2019-08-07 17:09:07 +09:00
  c65505df62
• mention that the event was the type
  David Zhao · 2019-08-07 17:08:41 +09:00
  7bcec31ea3
• Expand GetUser and GetUserScores requests by adding RulesetInfo… (#5621)

  Expand GetUser and GetUserScores requests by adding RulesetInfo parameter

  Dean Herbert · 2019-08-07 16:58:36 +09:00
  801f458684
• Move QuadBatch to a local variable to stop resharper complaining
  Dean Herbert · 2019-08-07 16:56:22 +09:00
  c6d481238d
• Don't consider type for storyboards either
  David Zhao · 2019-08-07 16:49:53 +09:00
  c0d3d47c29
• Don't consider the type
  David Zhao · 2019-08-07 16:25:38 +09:00
  669c2462ec
• Fix twitter link shortener being used
  Dean Herbert · 2019-08-07 16:07:41 +09:00
  606e977e2d
• Add Testing
  Andrei Zavatski · 2019-08-07 09:31:07 +03:00
  487979b016
• Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded
  Andrei Zavatski · 2019-08-07 09:08:58 +03:00
  67e009b000
• Explicity dispose osuGame instances
  David Zhao · 2019-08-07 14:51:24 +09:00
  cf9a5baafa
• CI fix
  Andrei Zavatski · 2019-08-07 08:49:04 +03:00
  a99d6536c2
• ModIcon improvements
  Andrei Zavatski · 2019-08-07 08:46:27 +03:00
  1d42f0959a
• Initial implementation
  Andrei Zavatski · 2019-08-07 08:42:43 +03:00
  87974850dd