Commit Graph

11775 Commits

Author SHA1 Message Date
e46a61febf Allow chaining of loadComponentSingleFile 2019-05-15 17:36:29 +09:00
5ddd28bf30 Fix message display / html stripping 2019-05-15 16:42:12 +09:00
88528e797f Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 14:24:45 +09:00
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
456e6a6601 Merge branch 'master' into remember-fps-display-state 2019-05-14 18:54:04 +09:00
4c221e43a9 Apply minimal changes to make framework compile 2019-05-14 18:39:56 +09:00
f2e5beec11 Update framework 2019-05-14 18:35:35 +09:00
5308a68103 Merge remote-tracking branch 'upstream/master' into remember-fps-display-state 2019-05-14 18:35:19 +09:00
ec5b024fa6 Define toolbarElements 2019-05-14 18:34:25 +09:00
a0c03d7fc3 Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller 2019-05-14 18:14:57 +09:00
eece4d878f Tidy up colour references and texture assignment in ChangelogHeader 2019-05-14 18:03:54 +09:00
d3d20773ee Merge branch 'master' into fullscreen-overlay 2019-05-14 17:40:20 +09:00
bffde7de08 Merge branch 'master' into exit-hide-music-controller 2019-05-14 17:36:38 +09:00
31e7f2fa87 Update ChangelogOverlay to use FullScreenOverlay 2019-05-14 17:35:21 +09:00
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
aff239a4fb Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay 2019-05-14 17:33:30 +09:00
fad9e73999 Add null check in disposal clause 2019-05-14 17:08:54 +09:00
d040fe9635 Merge branch 'master' into tidy-osu-game 2019-05-14 16:52:56 +09:00
a52690ed9a Fix commented line check not working with whitespace (#4788)
Fix commented line check not working with whitespace
2019-05-14 16:47:46 +09:00
f1c9073338 Fix commented line check not working with whitespace 2019-05-14 16:16:55 +09:00
9aef4abf75 Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations
Reduce unnecessary allocations
2019-05-14 16:03:04 +09:00
c312a2e53c Merge branch 'master' into fullscreen-overlay 2019-05-14 15:22:23 +09:00
e893925417 Move shadow fade logic 2019-05-14 15:19:23 +09:00
29bdc97ab7 Remove unnecessary DI 2019-05-14 15:07:18 +09:00
cb2b14e501 Centralise fullscreen overlay logic 2019-05-14 14:20:53 +09:00
cc558cf073 Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay 2019-05-14 13:36:17 +09:00
4abe987e11 Add new colour palette 2019-05-14 13:28:16 +09:00
0d57cf6599 Remember FPS display state after changing via Ctrl+F11 hotkey 2019-05-14 13:13:51 +09:00
93b26cd026 Reduce unnecessary allocations 2019-05-14 13:04:49 +09:00
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
66df784e9a Adjust header image sizing 2019-05-13 17:32:49 +09:00
d66a26cd11 Add JsonProperty hinting 2019-05-13 17:26:50 +09:00
8ecd1912e1 Split out web response classes into own files 2019-05-13 17:24:33 +09:00
27ca094421 Update outdated licence headers 2019-05-13 17:14:52 +09:00
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
50c440de8d Add toolbar button 2019-05-13 17:01:17 +09:00
e9c3f54307 Share web request between builds and streams 2019-05-13 16:44:43 +09:00
37a8d9eb80 Remove chart references for now 2019-05-13 16:27:54 +09:00
219c590b8a Initial pass to make work with real API 2019-05-13 16:24:32 +09:00
5ea87d9467 Merge remote-tracking branch 'upstream/master' into use-volumemute-icon 2019-05-13 07:24:39 +09:00
8110d6768c Inherit OsuButton 2019-05-13 07:24:34 +09:00
c119a6a135 Use VolumeMute icon for mute button 2019-05-12 09:30:43 -07:00
f14690e3b8 Swap profile play styles and last visit positions 2019-05-12 09:04:11 -07:00
31b72f168d Fix deprecated calls and code styling (partly) 2019-05-13 00:46:22 +09:00
34f54aa945 Resolve compile-time issues 2019-05-13 00:36:05 +09:00
943e1574a4 Merge branch 'master' into changelog-overlay 2019-05-13 00:24:18 +09:00
da2338581b Merge branch 'master' into dev 2019-05-12 23:13:46 +09:00
487a56549e Fix CI issues 2019-05-12 22:53:12 +09:00
41e13aef23 Use more standard parsing method 2019-05-12 22:53:03 +09:00
65097fddc1 Hide music controller when exiting via Alt-F4
Closes #4764.
2019-05-12 22:34:58 +09:00