Dean Herbert
14e597b608
Merge pull request #785 from EVAST9919/ingame_options
...
Replay Settings
2017-06-05 17:15:42 +09:00
Dean Herbert
2712f49545
Remove bad
2017-06-05 17:06:47 +09:00
Dean Herbert
958cd9f8d8
Don't display in-game
...
Nothing does anything yet, so we can't display this. Make it functional before adding to game project.
2017-06-05 16:52:09 +09:00
Dean Herbert
af6f8bbd89
Fix namespaces and class names
2017-06-05 16:47:42 +09:00
Dean Herbert
c3c56820fa
Fix lots of small issues
2017-06-05 16:43:23 +09:00
Dean Herbert
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
Dan Balasescu
a36148e57c
Merge pull request #896 from Tom94/separate-skip
...
Move skip button into its own test, because it is no longer two-layered
2017-06-05 12:10:37 +09:00
Dan Balasescu
04c5fed1ad
Merge branch 'master' into separate-skip
2017-06-05 11:58:53 +09:00
Dan Balasescu
1cf10263cb
Merge pull request #890 from peppy/async-channel-load
...
Load initial channel content asynchronously
2017-06-05 10:16:06 +09:00
Dan Balasescu
6bda62f260
Merge branch 'master' into async-channel-load
2017-06-05 10:02:01 +09:00
Dan Balasescu
d28e8a4b51
Merge pull request #883 from Shawdooow/Daycore
...
Mod Suggestion: Daycore
2017-06-05 09:50:01 +09:00
smoogipooo
52bb2df69b
Change to fa_question for now, pending flyte redesign.
2017-06-05 09:40:22 +09:00
Dan Balasescu
d6a1205d08
Merge branch 'master' into Daycore
2017-06-05 09:33:30 +09:00
Thomas Müller
0afb188cde
Remove unused using
2017-06-03 20:05:51 +02:00
Thomas Müller
04925594ca
Merge branch 'master' into separate-skip
2017-06-03 17:45:57 +02:00
Thomas Müller
d498a4a022
Trim whitespace
2017-06-03 17:45:44 +02:00
Thomas Müller
3b987e35c9
Merge pull request #895 from Jorolf/framework-tooltips
...
update osu to use the framework's TooltipContainer
2017-06-03 17:34:43 +02:00
Thomas Müller
8cd2f509ef
Move skip button into its own test, because it is no longer two-layered
2017-06-03 17:33:24 +02:00
Thomas Müller
2c5979ea8a
Remove unnecessary usings
2017-06-03 17:29:20 +02:00
Thomas Müller
3daae480d2
Remove TestCaseTooltip
2017-06-03 17:28:34 +02:00
Thomas Müller
9c6ce230bc
Fix compile error
2017-06-03 17:17:56 +02:00
Thomas Müller
b2bbf65e39
Update framework
2017-06-03 17:01:21 +02:00
Thomas Müller
50158a1cd2
Fix incorrect proportions of menu cursor
2017-06-03 16:34:00 +02:00
Jorolf
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
Dean Herbert
5b80c8ac49
Load initial channel content asynchronously
...
Quite often, the first time loading a chat channel will be loading font characters (textures) that were previously never displayed. This stops the game from stuttering in such a scenario.
2017-06-01 18:29:34 +09:00
Dean Herbert
900e3ce3e2
Merge pull request #888 from Drenata/random-selection-alternatives
...
Add alternative for random beatmap selection
2017-06-01 18:04:31 +09:00
Dean Herbert
2025eee8eb
Merge branch 'master' into random-selection-alternatives
2017-06-01 17:58:15 +09:00
Patrick Andersson
94294e4b45
Changed default selection type and added suggestions from PR feedback
2017-06-01 08:54:48 +02:00
Dan Balasescu
b8d070b29b
Merge pull request #887 from peppy/increase-ipc-timeout
...
Increase timeout in TestImportOverIPC
2017-06-01 10:22:40 +09:00
Dan Balasescu
f29322e374
Merge branch 'master' into increase-ipc-timeout
2017-06-01 10:11:10 +09:00
Patrick Andersson
a3945bb11d
Added suggestions by code inspector
2017-05-31 22:04:29 +02:00
Patrick Andersson
9592e9778b
Trim whitespace
2017-05-31 20:31:05 +02:00
Patrick Andersson
1dd85b5986
Add alternative for random beatmap selection
...
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
Dean Herbert
f59edd697c
Merge pull request #866 from ColdVolcano/storyboards
...
Allow for variables in storyboards
2017-05-31 16:03:25 +09:00
Dean Herbert
a5695aca1c
Merge branch 'master' into storyboards
2017-05-31 15:59:01 +09:00
Dean Herbert
0f59645e17
Increase timeout in TestImportOverIPC
...
Has been failing CI randomly, so let's increase the timeout a bit.
2017-05-31 15:51:52 +09:00
Dean Herbert
013e9d5c69
Merge pull request #886 from DrabWeb/user-dropdown-arrow
...
Fix user dropdown menu item chevron alignment
2017-05-31 15:44:17 +09:00
Dean Herbert
bab3f1b89a
Merge branch 'master' into user-dropdown-arrow
2017-05-31 15:39:52 +09:00
EVAST9919
8cde50a88a
Merge branch 'master' of https://github.com/ppy/osu into ingame_options
2017-05-31 08:23:06 +03:00
DrabWeb
cd57343191
Text -> Label
2017-05-31 02:03:13 -03:00
DrabWeb
4fd7405fb8
Fix user dropdown menu item chevron alignment
2017-05-31 01:57:32 -03:00
Dan Balasescu
2c438e6a8e
Merge pull request #882 from peppy/update-framework
...
Update in line with framework
2017-05-31 13:16:29 +09:00
Dan Balasescu
d90006b229
Merge branch 'master' into update-framework
2017-05-31 13:01:17 +09:00
Dean Herbert
9a40470298
Merge pull request #838 from MrTheMake/playsongselect-exit-fix
...
Unregister OnBeatmapChanged() when exiting song selection
2017-05-31 11:31:12 +09:00
Dean Herbert
40312080f7
Merge branch 'master' into playsongselect-exit-fix
2017-05-31 11:14:41 +09:00
Dean Herbert
61fb5d6ac8
Add issue URL to comment
2017-05-31 11:04:18 +09:00
Dean Herbert
b61452024a
Add comment
2017-05-31 11:02:26 +09:00
Shawdooow
cb5fcf2572
change mania multiplier
2017-05-30 13:27:10 -04:00
Shawdooow
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
Dean Herbert
8544b45443
Update in line with framework
2017-05-30 22:23:51 +09:00
