Dean Herbert
|
e46a61febf
|
Allow chaining of loadComponentSingleFile
|
2019-05-15 17:36:29 +09:00 |
|
Dean Herbert
|
5ddd28bf30
|
Fix message display / html stripping
|
2019-05-15 16:42:12 +09:00 |
|
Dan Balasescu
|
a1b4d7aafd
|
Merge pull request #4795 from UselessToucan/rename_test_case
Rename test cases to test scenes inline with the framework change
|
2019-05-15 16:09:42 +09:00 |
|
smoogipoo
|
5f56c38475
|
Merge remote-tracking branch 'origin/master' into rename_test_case
|
2019-05-15 15:52:06 +09:00 |
|
Dean Herbert
|
00ae9ed9af
|
Use framework-based Logger for squirrel update logs (#4798)
Use framework-based Logger for squirrel update logs
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-15 14:44:32 +09:00 |
|
Dean Herbert
|
88528e797f
|
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
|
2019-05-15 14:24:45 +09:00 |
|
Dean Herbert
|
7004f8c507
|
Merge branch 'master' into squirrel-log-safety
|
2019-05-15 14:19:11 +09:00 |
|
Dean Herbert
|
501eaa072e
|
Use local logger
|
2019-05-15 14:12:59 +09:00 |
|
Dan Balasescu
|
bcac52d1c7
|
Merge pull request #4800 from peppy/move-screen-dependencies
Move OsuScreenDependencies to GameBase
|
2019-05-15 13:18:12 +09:00 |
|
Dean Herbert
|
1fd44d7945
|
Move OsuScreenDependencies to GameBase
|
2019-05-15 13:00:11 +09:00 |
|
smoogipoo
|
c01841d7d7
|
Use Logger for squirrel update logs
|
2019-05-15 11:28:22 +09:00 |
|
Dan Balasescu
|
5a9f8e5820
|
Merge pull request #4782 from Altenhh/noObjectsFix
Fix hard crash if beatmap does not have any objects
|
2019-05-15 11:27:52 +09:00 |
|
smoogipoo
|
cbf662eb56
|
Remove redundant else statement
|
2019-05-15 10:55:02 +09:00 |
|
Alten
|
5e1f80ceb5
|
Merge branch 'master' into noObjectsFix
|
2019-05-14 16:52:46 -04:00 |
|
Alten
|
37ec722a1d
|
Shorten code
|
2019-05-14 16:18:46 -04:00 |
|
Roman Kapustin
|
459a285cd8
|
Rename test cases to test scenes inline with the framework change
|
2019-05-14 22:37:25 +03:00 |
|
Lucas A
|
2d966682dc
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-14 18:09:58 +02:00 |
|
Dan Balasescu
|
c04cdd170a
|
Merge pull request #4784 from peppy/remember-fps-display-state
Remember FPS display state after changing via Ctrl+F11 hotkey
|
2019-05-14 20:23:36 +09:00 |
|
Dean Herbert
|
2200959dd0
|
Merge branch 'master' into remember-fps-display-state
|
2019-05-14 19:19:46 +09:00 |
|
Dean Herbert
|
b6c20bc63d
|
Merge pull request #4790 from smoogipoo/fix-loader-test
Increase loader animation wait time
|
2019-05-14 18:56:15 +09:00 |
|
Dean Herbert
|
456e6a6601
|
Merge branch 'master' into remember-fps-display-state
|
2019-05-14 18:54:04 +09:00 |
|
Dan Balasescu
|
94b564f7df
|
Merge pull request #4765 from peppy/exit-hide-music-controller
Hide music controller when exiting via Alt-F4
|
2019-05-14 18:46:43 +09:00 |
|
Dean Herbert
|
4c221e43a9
|
Apply minimal changes to make framework compile
|
2019-05-14 18:39:56 +09:00 |
|
smoogipoo
|
d5e25c05b3
|
Increase loader animation test wait
|
2019-05-14 18:39:03 +09:00 |
|
Dean Herbert
|
f2e5beec11
|
Update framework
|
2019-05-14 18:35:35 +09:00 |
|
Dean Herbert
|
5308a68103
|
Merge remote-tracking branch 'upstream/master' into remember-fps-display-state
|
2019-05-14 18:35:19 +09:00 |
|
Dean Herbert
|
ec5b024fa6
|
Define toolbarElements
|
2019-05-14 18:34:25 +09:00 |
|
Dean Herbert
|
a0c03d7fc3
|
Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller
|
2019-05-14 18:14:57 +09:00 |
|
smoogipoo
|
77263bd56e
|
Linkify more user links
|
2019-05-14 18:11:32 +09:00 |
|
Dean Herbert
|
eece4d878f
|
Tidy up colour references and texture assignment in ChangelogHeader
|
2019-05-14 18:03:54 +09:00 |
|
Dan Balasescu
|
c9e5d30744
|
Merge pull request #4786 from peppy/fullscreen-overlay
Centralise full screen overlay logic into a base class
|
2019-05-14 17:59:24 +09:00 |
|
Dan Balasescu
|
d3d20773ee
|
Merge branch 'master' into fullscreen-overlay
|
2019-05-14 17:40:20 +09:00 |
|
Dan Balasescu
|
bffde7de08
|
Merge branch 'master' into exit-hide-music-controller
|
2019-05-14 17:36:38 +09:00 |
|
Dean Herbert
|
31e7f2fa87
|
Update ChangelogOverlay to use FullScreenOverlay
|
2019-05-14 17:35:21 +09:00 |
|
Dean Herbert
|
0fc43afd34
|
Merge branch 'master' into HoutarouOreki-changelog-overlay
|
2019-05-14 17:35:14 +09:00 |
|
Dean Herbert
|
aff239a4fb
|
Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay
|
2019-05-14 17:33:30 +09:00 |
|
Dean Herbert
|
fad9e73999
|
Add null check in disposal clause
|
2019-05-14 17:08:54 +09:00 |
|
Dan Balasescu
|
b2fe9dd1a0
|
Merge pull request #4774 from peppy/tidy-osu-game
Centralise caching of components at OsuGame level
|
2019-05-14 17:02:48 +09:00 |
|
Dan Balasescu
|
d040fe9635
|
Merge branch 'master' into tidy-osu-game
|
2019-05-14 16:52:56 +09:00 |
|
Dean Herbert
|
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 |
|
smoogipoo
|
f1c9073338
|
Fix commented line check not working with whitespace
|
2019-05-14 16:16:55 +09:00 |
|
Dean Herbert
|
9aef4abf75
|
Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations
Reduce unnecessary allocations
|
2019-05-14 16:03:04 +09:00 |
|
Dean Herbert
|
c312a2e53c
|
Merge branch 'master' into fullscreen-overlay
|
2019-05-14 15:22:23 +09:00 |
|
Dean Herbert
|
e893925417
|
Move shadow fade logic
|
2019-05-14 15:19:23 +09:00 |
|
Dean Herbert
|
a765f2502d
|
Add simple test case for FullscreenOverlay
|
2019-05-14 15:14:00 +09:00 |
|
Dean Herbert
|
29bdc97ab7
|
Remove unnecessary DI
|
2019-05-14 15:07:18 +09:00 |
|
Dean Herbert
|
ca2662e941
|
Rename incorrectly named test cases
|
2019-05-14 14:58:36 +09:00 |
|
Dean Herbert
|
cb2b14e501
|
Centralise fullscreen overlay logic
|
2019-05-14 14:20:53 +09:00 |
|
Dan Balasescu
|
3d30ecc440
|
Merge pull request #4785 from peppy/add-new-colours
Add new colour palette
|
2019-05-14 13:38:04 +09:00 |
|
Dean Herbert
|
cc558cf073
|
Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay
|
2019-05-14 13:36:17 +09:00 |
|