18470 Commits

This Branch

This Branch

All Branches

• Allow chaining of loadComponentSingleFile
  Dean Herbert · 2019-05-15 17:36:29 +09:00
  e46a61febf
• Fix message display / html stripping
  Dean Herbert · 2019-05-15 16:42:12 +09:00
  5ddd28bf30
• Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
  Dean Herbert · 2019-05-15 14:24:45 +09:00
  88528e797f
• Merge pull request #4800 from peppy/move-screen-dependencies

  Move OsuScreenDependencies to GameBase

  Dan Balasescu · 2019-05-15 13:18:12 +09:00
  bcac52d1c7
• Move OsuScreenDependencies to GameBase
  Dean Herbert · 2019-05-15 13:00:11 +09:00
  1fd44d7945
• Merge pull request #4782 from Altenhh/noObjectsFix

  Fix hard crash if beatmap does not have any objects

  Dan Balasescu · 2019-05-15 11:27:52 +09:00
  5a9f8e5820
• Remove redundant else statement
  smoogipoo · 2019-05-15 10:55:02 +09:00
  cbf662eb56
• Merge branch 'master' into noObjectsFix
  Alten · 2019-05-14 16:52:46 -04:00
  5e1f80ceb5
• Shorten code
  Alten · 2019-05-14 16:18:46 -04:00
  37ec722a1d
• Merge pull request #4784 from peppy/remember-fps-display-state

  Remember FPS display state after changing via Ctrl+F11 hotkey

  Dan Balasescu · 2019-05-14 20:23:36 +09:00
  2019.514.0 c04cdd170a
• Merge branch 'master' into remember-fps-display-state
  Dean Herbert · 2019-05-14 19:19:46 +09:00
  2200959dd0
• Merge pull request #4790 from smoogipoo/fix-loader-test

  Increase loader animation wait time

  Dean Herbert · 2019-05-14 18:56:15 +09:00
  b6c20bc63d
• Merge branch 'master' into remember-fps-display-state
  Dean Herbert · 2019-05-14 18:54:04 +09:00
  456e6a6601
• Merge pull request #4765 from peppy/exit-hide-music-controller

  Hide music controller when exiting via Alt-F4

  Dan Balasescu · 2019-05-14 18:46:43 +09:00
  94b564f7df
• Apply minimal changes to make framework compile
  Dean Herbert · 2019-05-14 18:39:56 +09:00
  4c221e43a9
• Increase loader animation test wait
  smoogipoo · 2019-05-14 18:39:03 +09:00
  d5e25c05b3
• Update framework
  Dean Herbert · 2019-05-14 18:35:35 +09:00
  f2e5beec11
• Merge remote-tracking branch 'upstream/master' into remember-fps-display-state
  Dean Herbert · 2019-05-14 18:35:19 +09:00
  5308a68103
• Define toolbarElements
  Dean Herbert · 2019-05-14 18:34:25 +09:00
  ec5b024fa6
• Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller
  Dean Herbert · 2019-05-14 18:14:57 +09:00
  a0c03d7fc3
• Tidy up colour references and texture assignment in ChangelogHeader
  Dean Herbert · 2019-05-14 18:03:54 +09:00
  eece4d878f
• Merge pull request #4786 from peppy/fullscreen-overlay

  Centralise full screen overlay logic into a base class

  Dan Balasescu · 2019-05-14 17:59:24 +09:00
  c9e5d30744
• Merge branch 'master' into fullscreen-overlay
  Dan Balasescu · 2019-05-14 17:40:20 +09:00
  d3d20773ee
• Merge branch 'master' into exit-hide-music-controller
  Dan Balasescu · 2019-05-14 17:36:38 +09:00
  bffde7de08
• Update ChangelogOverlay to use FullScreenOverlay
  Dean Herbert · 2019-05-14 17:35:21 +09:00
  31e7f2fa87
• Merge branch 'master' into HoutarouOreki-changelog-overlay
  Dean Herbert · 2019-05-14 17:35:14 +09:00
  0fc43afd34
• Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay
  Dean Herbert · 2019-05-14 17:33:30 +09:00
  aff239a4fb
• Add null check in disposal clause
  Dean Herbert · 2019-05-14 17:08:54 +09:00
  fad9e73999
• Merge pull request #4774 from peppy/tidy-osu-game

  Centralise caching of components at OsuGame level

  Dan Balasescu · 2019-05-14 17:02:48 +09:00
  b2fe9dd1a0
• Merge branch 'master' into tidy-osu-game
  Dan Balasescu · 2019-05-14 16:52:56 +09:00
  d040fe9635
• Fix commented line check not working with whitespace (#4788)

  Fix commented line check not working with whitespace

  Dean Herbert · 2019-05-14 16:47:46 +09:00
  a52690ed9a
• Fix commented line check not working with whitespace
  smoogipoo · 2019-05-14 16:16:55 +09:00
  f1c9073338
• Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations

  Reduce unnecessary allocations

  Dean Herbert · 2019-05-14 16:03:04 +09:00
  9aef4abf75
• Merge branch 'master' into fullscreen-overlay
  Dean Herbert · 2019-05-14 15:22:23 +09:00
  c312a2e53c
• Move shadow fade logic
  Dean Herbert · 2019-05-14 15:19:23 +09:00
  e893925417
• Add simple test case for FullscreenOverlay
  Dean Herbert · 2019-05-14 15:14:00 +09:00
  a765f2502d
• Remove unnecessary DI
  Dean Herbert · 2019-05-14 15:07:18 +09:00
  29bdc97ab7
• Rename incorrectly named test cases
  Dean Herbert · 2019-05-14 14:58:36 +09:00
  ca2662e941
• Centralise fullscreen overlay logic
  Dean Herbert · 2019-05-14 14:20:53 +09:00
  cb2b14e501
• Merge pull request #4785 from peppy/add-new-colours

  Add new colour palette

  Dan Balasescu · 2019-05-14 13:38:04 +09:00
  3d30ecc440
• Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay
  Dean Herbert · 2019-05-14 13:36:17 +09:00
  cc558cf073
• Add new colour palette
  Dean Herbert · 2019-05-14 13:28:16 +09:00
  4abe987e11
• Remember FPS display state after changing via Ctrl+F11 hotkey
  Dean Herbert · 2019-05-14 13:13:51 +09:00
  0d57cf6599
• Reduce unnecessary allocations
  smoogipoo · 2019-05-14 13:04:49 +09:00
  93b26cd026
• Fix hard crash
  Alten · 2019-05-13 23:29:24 -04:00
  ad5ad8ccb5
• Merge branch 'master' into tidy-osu-game
  Dan Balasescu · 2019-05-14 12:19:39 +09:00
  157ba01d60
• Add smoothing to flashlight movement (#4771)

  Add smoothing to flashlight movement
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-14 11:28:40 +09:00
  ebfcc8b3ec
• Move constant local (and break line)
  Dean Herbert · 2019-05-14 11:11:57 +09:00
  be6da833f8
• Add tests for cached types in OsuGame and OsuGameBase
  Dean Herbert · 2019-05-14 11:05:53 +09:00
  a98accb4d4
• Fix incorrect DI reference and update naming of SettingsOverlay classes
  Dean Herbert · 2019-05-14 10:45:05 +09:00
  7553e2da25