Dean Herbert
|
28b67e3d77
|
Merge branch 'master' into url-parsing-support
|
2018-01-30 17:47:55 +09:00 |
|
Dean Herbert
|
53129e5235
|
Fix text getting truncated after last link in chat line
|
2018-01-30 17:47:22 +09:00 |
|
Dean Herbert
|
e5188fd151
|
Add better channel test cases (testing non-existent channels)
|
2018-01-30 17:43:19 +09:00 |
|
Dean Herbert
|
d81d884a01
|
Remove unnecessary paren handling from regex
Can't find a reason for this to exist
|
2018-01-30 17:16:01 +09:00 |
|
Dean Herbert
|
662c7c5bdc
|
Fix osump links
|
2018-01-30 16:44:43 +09:00 |
|
Dean Herbert
|
dd2731b873
|
Add support for markdown style links
|
2018-01-30 16:38:45 +09:00 |
|
Dean Herbert
|
1dbaf9b7a7
|
Add many more tests
|
2018-01-30 16:38:18 +09:00 |
|
Dean Herbert
|
749fb29445
|
Merge pull request #1992 from smoogipoo/rename-inputmanager
Rename "InputManager" to "Container" where keybindings are involved
|
2018-01-30 15:02:17 +09:00 |
|
smoogipoo
|
b4cd8ea716
|
GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
|
2018-01-30 14:54:30 +09:00 |
|
smoogipoo
|
ef3fb8c05a
|
InputManager -> Container where KeyBindings are involved
|
2018-01-30 14:49:12 +09:00 |
|
Dean Herbert
|
1920a4e029
|
Prepare tests for fixing
|
2018-01-29 18:47:14 +09:00 |
|
Dean Herbert
|
f996acd7e6
|
Add back old non-visual tests
|
2018-01-29 18:37:11 +09:00 |
|
Dean Herbert
|
c07a31a484
|
Add new (failing) tests
|
2018-01-29 17:45:39 +09:00 |
|
Dean Herbert
|
df221b6786
|
Remove usage of ValueTuple to allow for dynamic recompilation
|
2018-01-29 17:45:23 +09:00 |
|
Dean Herbert
|
445af2ba7a
|
Merge pull request #1983 from peppy/global-mod-binding
Remember mod selection when re-entering song select
|
2018-01-29 15:26:48 +09:00 |
|
Dan Balasescu
|
2bae22999d
|
Merge branch 'master' into global-mod-binding
|
2018-01-29 15:18:11 +09:00 |
|
Dan Balasescu
|
188fc1e6c2
|
Merge pull request #1991 from peppy/update-framework
Update framework
|
2018-01-29 15:18:01 +09:00 |
|
Dean Herbert
|
6e0cb1adb3
|
Remove redundant arguments
|
2018-01-29 15:05:07 +09:00 |
|
Dan Balasescu
|
ea0ef96557
|
Merge branch 'master' into global-mod-binding
|
2018-01-29 15:04:20 +09:00 |
|
Dean Herbert
|
fc11cac5a0
|
Update framework
|
2018-01-29 15:03:19 +09:00 |
|
Dean Herbert
|
c38f06fd61
|
Merge pull request #1984 from FreezyLemon/add-r#-annotation-support
Add JetBrains.Annotations NuGet package
|
2018-01-29 14:07:17 +09:00 |
|
Dean Herbert
|
b789db3a1e
|
Update framework
|
2018-01-29 13:53:35 +09:00 |
|
Dean Herbert
|
0879366a30
|
Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support
|
2018-01-29 13:52:21 +09:00 |
|
Dean Herbert
|
2b14438fe4
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
|
2018-01-29 12:55:32 +09:00 |
|
Dan Balasescu
|
cb939d5370
|
Merge pull request #1986 from peppy/fix-csproj-case
Fix incorrect case on migration file
|
2018-01-28 08:59:11 +09:00 |
|
Dean Herbert
|
247833174c
|
Fix incorrect case on migration file
|
2018-01-27 23:20:49 +09:00 |
|
Dean Herbert
|
a5b0d51205
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-01-27 14:06:58 +09:00 |
|
FreezyLemon
|
cff3f25cd7
|
make all line endings CR LF (windows style)
|
2018-01-26 12:46:58 +01:00 |
|
FreezyLemon
|
8f0ab2040f
|
Add Jetbrains.Annotations NuGet package
|
2018-01-26 12:46:28 +01:00 |
|
Dean Herbert
|
7852015db3
|
Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.
Alternative to #1968.
Closes #1961.
|
2018-01-26 19:32:57 +09:00 |
|
Dean Herbert
|
545a4bd082
|
Merge pull request #1929 from smoogipoo/ruleset-configs
Implement ruleset-specific config managers and attach them to the global OnScreenDisplay
|
2018-01-26 17:54:38 +09:00 |
|
Dean Herbert
|
5bb547530b
|
Merge branch 'master' into ruleset-configs
|
2018-01-26 17:03:38 +09:00 |
|
Dan Balasescu
|
14092006ef
|
Merge pull request #1953 from Aergwyn/fix-repeats-appearing-early
Fix RepeatPoint animations
|
2018-01-26 16:41:28 +09:00 |
|
Dan Balasescu
|
755ae9802c
|
Merge branch 'master' into fix-repeats-appearing-early
|
2018-01-26 15:45:20 +09:00 |
|
smoogipoo
|
1ab2a4075f
|
Update resources
|
2018-01-26 15:39:37 +09:00 |
|
smoogipoo
|
5742e61e68
|
Merge remote-tracking branch 'origin/master' into ruleset-configs
|
2018-01-26 15:39:09 +09:00 |
|
smoogipoo
|
929a710dfc
|
Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs
|
2018-01-26 15:37:57 +09:00 |
|
Dan Balasescu
|
81c759f1e1
|
Make field readonly
|
2018-01-26 15:17:56 +09:00 |
|
Dean Herbert
|
db58e4dbfe
|
Update framework again
|
2018-01-26 15:02:55 +09:00 |
|
Dean Herbert
|
7a2420ead2
|
Fix a couple of regressions
|
2018-01-26 08:21:09 +09:00 |
|
Dean Herbert
|
3b9318e894
|
Update framework
|
2018-01-26 07:39:03 +09:00 |
|
Dean Herbert
|
03154dbc63
|
Fix incorrect initial migration
Also adds variant to settings
|
2018-01-25 23:41:03 +09:00 |
|
smoogipoo
|
45e8a2b69b
|
Remove ManiaPlayfield local scrollTime bindable
Now not needed due to having this databased.
|
2018-01-25 20:49:25 +09:00 |
|
Dean Herbert
|
80b8780f56
|
Revert "Remove game-wise settings store for the time being"
This reverts commit 72df2c681b.
|
2018-01-25 18:08:50 +09:00 |
|
Dean Herbert
|
c2a58223c5
|
Update framework
|
2018-01-25 17:55:41 +09:00 |
|
Dan Balasescu
|
08ffd886e3
|
Merge pull request #1975 from peppy/new-hitsounds
Add new default hitsounds (thanks to cYsmix)
|
2018-01-25 11:32:57 +09:00 |
|
Dean Herbert
|
794d82d83f
|
Add new default hitsounds
Getting these in for more widespread feedback.
|
2018-01-25 10:21:52 +09:00 |
|
Dean Herbert
|
59f62ad8cf
|
Merge pull request #1973 from UselessToucan/MakeMusicControllerDraggableAgain
Make MusicController draggable again
|
2018-01-25 09:18:07 +09:00 |
|
Dean Herbert
|
fd7d7c3953
|
Merge branch 'master' into MakeMusicControllerDraggableAgain
|
2018-01-25 09:01:54 +09:00 |
|
Dean Herbert
|
b3b4e04950
|
Merge pull request #1965 from Aergwyn/fix-settings
Fix settings button
|
2018-01-25 08:54:19 +09:00 |
|