17935 Commits

This Branch

This Branch

All Branches

• Fix gameplay cursor being hidden in tests/replays
  smoogipoo · 2019-04-23 13:32:44 +09:00
  6add395288
• Fix possible exit from non-current screen (#4663)

  Fix possible exit from non-current screen
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-04-23 09:52:20 +09:00
  b8712b36ec
• Merge branch 'master' into fix-multiplayer-crash
  Dean Herbert · 2019-04-23 09:28:03 +09:00
  c88a11a38f
• Fix possible exit from non-current screen
  smoogipoo · 2019-04-22 19:24:57 +09:00
  414d555484
• 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
• 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
• 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
• Add xmldoc
  smoogipoo · 2019-04-17 16:34:53 +09:00
  9f92b3a8ba
• Fix post-merge errors
  smoogipoo · 2019-04-17 16:11:59 +09:00
  5a3d6a0258
• Merge remote-tracking branch 'origin/master' into player-mod-reinstantiation
  smoogipoo · 2019-04-17 12:59:23 +09:00
  ad720cedeb
• Merge pull request #4630 from peppy/update-framework

  Update framework

  Dan Balasescu · 2019-04-17 10:23:16 +09:00
  a10d265a90
• Update framework
  Dean Herbert · 2019-04-16 22:51:57 +08:00
  b684cd49e6
• Merge branch 'master' into player-mod-reinstantiation
  Dean Herbert · 2019-04-16 22:35:21 +08:00
  bb539af1a0
• Merge pull request #4624 from smoogipoo/fix-rewinding-60fps

  Fix replay rewinding not respecting 60fps playback

  Dean Herbert · 2019-04-16 21:03:03 +08:00
  63f840fc11
• Fix replay rewinding not respecting 60fps playback
  smoogipoo · 2019-04-16 17:47:00 +09:00
  ac2eabc9bf
• Merge pull request #4613 from smoogipoo/no-workingbeatmap-mods

  Remove mods from WorkingBeatmap

  Dean Herbert · 2019-04-15 16:53:01 +08:00
  ed1f05333a
• Fix testcases
  smoogipoo · 2019-04-10 17:54:57 +09:00
  1db2d49696
• Make mods IReadOnlyList<Mod> gamewide

  Prevents potential multiple evaluations of enumerable.

  smoogipoo · 2019-04-10 17:20:36 +09:00
  0222424aef
• Cache mods as array in DrawableRuleset
  smoogipoo · 2019-04-10 17:20:36 +09:00
  7845d542e3
• Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods

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

  smoogipoo · 2019-04-10 12:06:51 +09:00
  85d3ff4846
• Rename SelectedMods -> Mods
  smoogipoo · 2019-04-10 12:03:57 +09:00
  4310f07a5c