17949 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-22 19:39:20 +03:00
  a6b60a2fc2
• Fix hold for menu button's icon being incorrect (#4662)

  Fix hold for menu button's icon being incorrect
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-04-22 19:16:29 +09:00
  ffd8268076
• Standardise health adjustment process across all rulesets (#4660)

  Standardise health adjustment process across all rulesets
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-04-22 19:16:14 +09:00
  c1b649b0fb
• Merge branch 'master' into hp-rewind
  Dean Herbert · 2019-04-22 19:02:41 +09:00
  5313ba2938
• Merge branch 'master' into fix-hold-for-menu-icon
  Dan Balasescu · 2019-04-22 18:57:43 +09:00
  8fc0bf24c7
• Merge pull request #4661 from peppy/fix-pause-tests

  Fix pause tests and cursor visibility

  Dan Balasescu · 2019-04-22 18:56:41 +09:00
  63fd3034ca
• Fix hold for menu button's icon being incorrect
  Dean Herbert · 2019-04-22 18:47:28 +09:00
  48e82d4b1c
• Fix incorrect seek target
  Dean Herbert · 2019-04-22 18:45:58 +09:00
  6856571f17
• Remove delay on entering player
  Dean Herbert · 2019-04-22 18:29:58 +09:00
  55c5ef898d
• Fix pause tests
  Dean Herbert · 2019-04-22 18:29:51 +09:00
  908eee9942
• Rename method + add xmldoc
  smoogipoo · 2019-04-22 18:08:15 +09:00
  aeae759fcd
• Fix catch awarding too much hp
  smoogipoo · 2019-04-22 18:02:57 +09:00
  910b9df2d5
• Make hp work + cleanup
  smoogipoo · 2019-04-22 18:02:49 +09:00
  4edb17a88a
• Implement hp increase for osu!
  smoogipoo · 2019-04-22 17:24:42 +09:00
  144e6012dc
• Make catch provide some HP at DrainRate=10
  smoogipoo · 2019-04-22 17:24:22 +09:00
  78c844e259
• Implement hp increase for taiko
  smoogipoo · 2019-04-22 17:04:46 +09:00
  b59f23d094
• Implement hp increase for mania
  smoogipoo · 2019-04-22 17:04:18 +09:00
  4c5f41e40f
• Implement approximate hp increase for catch
  smoogipoo · 2019-04-22 16:59:14 +09:00
  d7919544fe
• Implement hp at base ScoreProcessor
  smoogipoo · 2019-04-22 16:51:38 +09:00
  fbb4e9df04
• Fix.
  iiSaLMaN · 2019-04-22 10:14:19 +03:00
  cfb3c38c3a
• Fix AppVeyor Errors
  iiSaLMaN · 2019-04-22 10:07:45 +03:00
  9030935030
• Fix AppVeyor Errors
  iiSaLMaN · 2019-04-22 09:59:51 +03:00
  64429aa968
• Fix AppVeyor Errors
  iiSaLMaN · 2019-04-22 09:58:29 +03:00
  7a385e56ec
• Remove whitespaces
  iiSaLMaN · 2019-04-22 06:15:37 +03:00
  c784bc4418
• Remove bindable and use property
  iiSaLMaN · 2019-04-22 06:14:14 +03:00
  de542ca202
• Remove bindable

  Bad usage

  iiSaLMaN · 2019-04-22 06:12:41 +03:00
  26f0b2a4fe
• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-22 05:56:55 +03:00
  699bdd0498
• Merge pull request #4658 from peppy/remove-black-box

  Remove black box blocking some visual tests from being visible

  Dan Balasescu · 2019-04-22 11:12:14 +09:00
  9d3d1fd10b
• Remove black box blocking some visual tests from being visible
  Dean Herbert · 2019-04-22 10:55:01 +09:00
  8ffb2f4224
• Fix issue
  iiSaLMaN · 2019-04-21 18:12:50 +03:00
  cff319e0d8
• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-21 18:06:12 +03:00
  c4b3aef931
• Fix issue
  iiSaLMaN · 2019-04-21 18:05:52 +03:00
  c5bf01cc5c
• Make AdjustRank Bindable and fix issue
  iiSaLMaN · 2019-04-21 17:55:01 +03:00
  b200142afb
• Make AdjustRank Bindable
  iiSaLMaN · 2019-04-21 17:48:50 +03:00
  77614189c9
• Ranks must be adjusted in Hidden Mod
  iiSaLMaN · 2019-04-21 15:58:40 +03:00
  4e07975e7c
• Adjust rank
  iiSaLMaN · 2019-04-21 15:58:19 +03:00
  73da423639
• nothing.
  iiSaLMaN · 2019-04-20 06:44:59 +03:00
  59da78b0d4
• Fix issue
  iiSaLMaN · 2019-04-20 06:41:09 +03:00
  8e485f3283
• Merge pull request #4648 from smoogipoo/appveyor-broken

  Fix appveyor temporarily

  Dan Balasescu · 2019-04-19 21:38:01 +09:00
  4e1a9e4228
• Fix appveyor temporarily
  smoogipoo · 2019-04-19 21:27:24 +09:00
  4cf234295c
• Merge pull request #4614 from smoogipoo/player-mod-reinstantiation

  Reinstantiate mods for each player instance
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-04-17 16:57:58 +08:00
  2019.418.0 f6cbae578b
• Merge branch 'master' into player-mod-reinstantiation
  Dean Herbert · 2019-04-17 16:42:57 +08:00
  2d7b3094ba
• Merge pull request #4540 from nyquillerium/facade-container

  Implement FacadeContainer for tracking logo positions in other containers

  Dan Balasescu · 2019-04-17 17:33:08 +09:00
  118f512d98
• Use .With() wherever possible
  smoogipoo · 2019-04-17 17:24:09 +09:00
  12b6bc48bd
• Remove usings
  smoogipoo · 2019-04-17 17:19:55 +09:00
  c145ce2d00
• Merge remote-tracking branch 'origin/master' into facade-container

  # Conflicts:
  #	osu.Game/Screens/Play/PlayerLoader.cs

  smoogipoo · 2019-04-17 17:17:33 +09:00
  09568be270
• Cleanup testcase
  smoogipoo · 2019-04-17 17:15:23 +09:00
  106e77c3d7
• Fix tracking position during 150ms state change delay
  smoogipoo · 2019-04-17 17:05:35 +09:00
  897bfa60db
• Rename facade + cleanup usage
  smoogipoo · 2019-04-17 17:05:33 +09:00
  4106da2430
• Throw exception when not relatively positioned
  smoogipoo · 2019-04-17 17:04:11 +09:00
  3a1587fa53