Dan Balasescu
|
67ac76aae7
|
Merge branch 'master' into move-tooltip-text
|
2019-05-21 15:00:09 +09:00 |
|
Dan Balasescu
|
73cfe1381d
|
Merge pull request #4831 from peppy/new-colours-osu-colour
Use OsuColour for profile overlay
|
2019-05-21 15:00:03 +09:00 |
|
Dan Balasescu
|
ab183949df
|
Merge branch 'master' into new-colours-osu-colour
|
2019-05-21 14:49:25 +09:00 |
|
Dan Balasescu
|
1fe082a0c3
|
Merge pull request #4835 from peppy/fix-spritetext-usage
Fix usages of SpriteText (instead of OsuSpriteText)
|
2019-05-21 14:33:48 +09:00 |
|
Dan Balasescu
|
de08bab0a1
|
Merge branch 'master' into move-tooltip-text
|
2019-05-21 14:25:38 +09:00 |
|
Dean Herbert
|
4ac2acbfc0
|
Fix usages of SpriteText (instead of OsuSpriteText)
|
2019-05-21 14:13:52 +09:00 |
|
Dan Balasescu
|
2cf43dc4d4
|
Merge pull request #4829 from peppy/chain-load-component-single-file
Allow chaining of loadComponentSingleFile
|
2019-05-21 13:57:35 +09:00 |
|
Dean Herbert
|
247dad7e86
|
Use OsuColour for profile overlay
|
2019-05-21 13:54:19 +09:00 |
|
Dean Herbert
|
bc962bf8f0
|
Move TooltipText to OsuClickableContainer
|
2019-05-21 13:51:38 +09:00 |
|
Dean Herbert
|
85a41cf6c3
|
Allow chaining of loadComponentSingleFile
|
2019-05-21 13:44:18 +09:00 |
|
Dean Herbert
|
d407981ae4
|
Increase fastlane processing interval
This seems to be getting longer as we go. May be related to having many versions released under one testflight build?
|
2019-05-18 12:58:13 +09:00 |
|
Dean Herbert
|
c4adb79cc7
|
Update framework (#4814)
Update framework
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-18 12:55:27 +09:00 |
|
Dean Herbert
|
5e499cf55d
|
Update resources
|
2019-05-18 12:45:06 +09:00 |
|
Dean Herbert
|
98189b2b87
|
Merge branch 'master' into update-framework
|
2019-05-18 12:10:37 +09:00 |
|
Dean Herbert
|
9106200c65
|
Bump framework version
|
2019-05-18 12:08:22 +09:00 |
|
Dean Herbert
|
cdd6e97dd2
|
Update NuGet packages (#4815)
Update NuGet packages
|
2019-05-18 11:25:51 +09:00 |
|
Roman Kapustin
|
a538c94fed
|
Update NuGet packages
|
2019-05-17 21:40:46 +03:00 |
|
smoogipoo
|
ccbf3ff812
|
Update framework
|
2019-05-17 22:35:23 +09:00 |
|
Dan Balasescu
|
e53a09d219
|
Merge pull request #4802 from peppy/fix-logo-tracking-crash
Fix crash on switching from main menu to gameplay too fast
|
2019-05-17 22:29:07 +09:00 |
|
Dan Balasescu
|
553d786b94
|
Merge branch 'master' into fix-logo-tracking-crash
|
2019-05-17 19:23:14 +09:00 |
|
Dan Balasescu
|
c7d4b2d138
|
Merge pull request #4809 from peppy/fix-restart-race-condition
Fix race condition causing player to never restart
|
2019-05-17 19:21:55 +09:00 |
|
Dean Herbert
|
359e5b71a5
|
Fix race condition causing player to never restart
|
2019-05-16 17:13:03 +09:00 |
|
Dean Herbert
|
20316cc0ac
|
Remove a few custom user link implementations (#4789)
Remove a few custom user link implementations
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-16 15:27:30 +09:00 |
|
Dean Herbert
|
8ee3958b4a
|
Fix some padding issues with DirectListPanel
|
2019-05-16 15:17:44 +09:00 |
|
Dean Herbert
|
7f30f61d1b
|
Update DirectListPanel to use same styling
|
2019-05-16 15:02:13 +09:00 |
|
Dean Herbert
|
a5074d550c
|
Merge branch 'master' into linkify-user-links
|
2019-05-16 14:42:44 +09:00 |
|
Dean Herbert
|
958598d13b
|
Fix crash on switching from main menu to gameplay too fast
|
2019-05-15 19:39:36 +09:00 |
|
Dan Balasescu
|
8ab2c2f033
|
Merge pull request #2832 from ThePyrotechnic/TextLengthLimit
Add some default LengthLimit to OsuTextBox
|
2019-05-15 19:37:14 +09:00 |
|
Dan Balasescu
|
29a415de48
|
Merge branch 'master' into TextLengthLimit
|
2019-05-15 19:21:01 +09:00 |
|
Dan Balasescu
|
eb547fad39
|
Merge pull request #4801 from peppy/fix-missed-test-case
Fix some missed instances of TestCase
|
2019-05-15 18:59:52 +09:00 |
|
Dean Herbert
|
1ccef61f7b
|
Fix some missed instances of TestCase
|
2019-05-15 18:32:29 +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
|
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 |
|
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 |
|