Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
...
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dean Herbert
1550908edb
Add tooltip to key configuration button
2019-02-15 11:56:33 +09:00
Dean Herbert
a5f1aa644b
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 17:30:35 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Dean Herbert
1025c51e0d
Allow filtering settings matching based on dropdown content
2019-01-23 17:30:05 +09:00
Dean Herbert
7baff750de
Consolidate layout, wording and ordering with VisualSettings
2019-01-22 10:06:30 +09:00
Bear Daniel
7cdb823c87
Moved "Use beatmap hitsounds" button
2019-01-21 08:04:06 -06:00
Bear Daniel
858541bcf4
Added "Use beatmap hitsounds" button to volume section of settings
2019-01-18 02:33:39 -06:00
nwabear
42fa04beee
Update SkinSection.cs
...
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
Dean Herbert
93a08bdb23
Remove stray using
2019-01-17 20:23:15 +09:00
Dean Herbert
d16f4af92b
Use TransferValueOnCommit for mouse sensitivity
2019-01-17 19:18:40 +09:00
Dean Herbert
5e4bea9d99
Fix extra newline
2019-01-10 12:11:14 +09:00
Dean Herbert
4f5c208672
Add UI scale
...
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
smoogipoo
2c44b928d3
Remove unused references
2019-01-08 16:38:34 +09:00
smoogipoo
daeba63242
Remove more unused code
2019-01-08 16:37:18 +09:00
Dean Herbert
a2a7aa708f
Use better logic for setting slider bar settings
2019-01-08 14:56:42 +09:00
Dean Herbert
01aa4c2a72
Use TransferOnCommit
2019-01-08 13:48:38 +09:00
Dean Herbert
74539b5e5c
Merge remote-tracking branch 'upstream/master' into letterboxing
2019-01-07 18:52:48 +09:00
Dean Herbert
73c2fcac08
Remove broken SettingsLabel class
2019-01-07 17:03:59 +09:00
Dean Herbert
3a10dd47d5
Add preview for gameplay region
2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b
Size -> scale
2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642
Delay updates when changes would affect mouse position
2019-01-04 14:55:59 +09:00
Dean Herbert
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +09:00
Dean Herbert
63847890d1
Add better messaging when connecting or failing
2018-12-26 18:07:33 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration
2018-12-14 19:45:27 +09:00
Dean Herbert
4fc9902cd2
Fix reverting to default skin via settings button causing a hard crash
2018-12-12 21:30:21 +09:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
smoogipoo
cadfe41f83
Merge remote-tracking branch 'origin/master' into external_link_warning
2018-11-23 15:19:52 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK
2018-11-21 18:53:11 +09:00
smoogipoo
5ad96afea0
Fix crashes when importing/deleting from model managers
2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Roman Kapustin
376e76e00d
Resolve merge conflicts
2018-11-18 16:10:36 +03:00
HoLLy
9dd3d28436
Fix SettingsTextBox having width of 0
2018-11-14 22:29:11 +01:00
smoogipoo
f1f2fc133a
Use SkinInfo directly
2018-11-14 19:29:20 +09:00
smoogipoo
aff5fa6169
Update with osu!-side dropdown changes
2018-11-14 18:02:38 +09:00
Roman Kapustin
b4809f4417
External link warning code cleanup
2018-11-01 23:52:07 +03:00
Roman Kapustin
805f8d98c4
Implement warn about opening external links option
2018-10-22 23:57:37 +03:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
Dan Balasescu
b1450b1f1a
Merge branch 'master' into fix-3514
2018-10-02 09:24:58 +09:00
AtomCrafty
6c55efdf20
Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode
2018-10-01 13:12:34 +02:00
Hanamuke
b983e20067
Merge branch 'master' into AR_Catch
2018-09-30 16:01:55 +02:00
Dean Herbert
dafbabec31
Fix import buttons having incorrect mappings when setting disabled states
2018-09-21 21:08:21 +09:00
Dean Herbert
1861547c86
Apply review
2018-09-20 19:01:04 +09:00
Hanamuke
e7d78b94ae
Remove ScrollingVisualisation from settings
2018-09-19 18:30:25 +02:00
smoogipoo
73fb3fa3a4
Fix macOS crashing in fullscreen mode
2018-09-19 17:52:35 +09:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Dean Herbert
c1cdff8505
Add default resolution to avoid crashing
2018-09-07 19:29:51 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete
2018-09-07 16:48:01 +09:00
Dean Herbert
bf0ad723f5
Add default fallback for headless operation
2018-09-07 14:35:38 +09:00
Dean Herbert
f76d00e8ae
Simplify null checks
2018-09-07 14:31:38 +09:00
Dean Herbert
8b217ad803
Merge branch 'master' into select_resolution_in_fullscreen_mode
2018-09-07 14:25:10 +09:00
smoogipoo
d5acc96efa
Apply changes in line with osu!framework changes
2018-09-05 14:59:37 +09:00
Dean Herbert
581da108fc
Rewrite to not suck
2018-09-05 11:32:38 +09:00
Dean Herbert
46b6601cbf
Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode
2018-09-05 10:47:34 +09:00
Dean Herbert
5efa9c7652
Fix items in skin settings not always being removed corrrectly
2018-09-03 11:51:03 +09:00
Dean Herbert
144e80dff6
Add "import all skins from stable" option (and mass delete)
2018-09-03 10:10:04 +09:00
smoogipoo
ce367bcc42
Fix invalid GC latency mode being set
2018-08-22 12:02:14 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button
2018-08-02 20:25:45 +09:00
smoogipoo
b9814b64ed
Move default button implementation from TriangleButton to OsuButton
2018-08-01 17:02:38 +09:00
Dean Herbert
5364a6148a
Use ToUpperInvariant
2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
...
Closes #3098 .
2018-07-24 11:37:43 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys
2018-07-13 23:32:44 +09:00
Dean Herbert
24054246b8
Fix DI regression
2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Roman Kapustin
8f9bf4bd3e
Remove redundant DesktopGameWindow cast
2018-07-10 22:07:32 +03:00
HoutarouOreki
dd20663192
Lesser keyboard steps
2018-07-10 17:28:56 +02:00
Roman Kapustin
699702f8d0
Use DesktopGameWindow.GetCurrentDisplay method
2018-07-09 21:57:31 +03:00
Roman Kapustin
3dbdfcc1e2
Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode
2018-07-09 21:31:46 +03:00
smoogipoo
9f405b0894
Don't hard-bail if config skin doesn't exist anymore
2018-07-02 16:49:07 +09:00
Roman Kapustin
4af45b7518
Do not display resolutions lower than 800x600
2018-06-30 20:06:11 +03:00
Roman Kapustin
5076fe4c20
LayoutSettings: inject OsuGameBase instead of OsuGame
2018-06-23 12:45:13 +03:00
Roman Kapustin
5d26d5d4ed
Fix resolutionDropdown
2018-06-21 20:42:22 +03:00
Roman Kapustin
71371dc4b8
ValueChanged parameters quickfix
2018-06-12 19:27:55 +03:00
UselessToucan
b6c0aa3f26
Merge branch 'master' into select_resolution_in_fullscreen_mode
2018-06-12 18:01:30 +03:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
smoogipoo
14b7530994
Use a global ruleset config cache
2018-06-11 15:07:42 +09:00
smoogipoo
f4fbf27d42
Give ruleset settings a ruleset-specific config manager
2018-06-11 13:28:50 +09:00
Roman Kapustin
de7e4328c5
Use bindable size
2018-06-10 16:17:57 +03:00
UselessToucan
4233211fb3
Merge branch 'master' into select_resolution_in_fullscreen_mode
2018-06-08 21:13:41 +03:00
Dean Herbert
0b4f5af52e
Add setting to toggle standardised or exponential scoring display
...
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
0a97b8ae25
Implement DebugUtils locally
...
Has been removed from framework
2018-06-06 18:33:10 +09:00
Dean Herbert
1dd5bdcf72
Move setting to new "mods" section
2018-06-06 12:32:59 +09:00
Roman Kapustin
e98f9f1323
Add dropdown for selecting fullscreen resolution
2018-06-02 21:02:45 +03:00
Dean Herbert
9e17eb2342
Reword settings text to be ruleset agnostic
2018-05-21 16:03:08 +09:00
Dean Herbert
76e58a51b9
Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
2018-04-25 17:28:21 +09:00
Dean Herbert
e395a47112
Changes to naming and text
2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
2018-04-18 19:46:59 +09:00
Dean Herbert
c9615f837a
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
2018-04-16 00:20:06 +09:00
Dean Herbert
a0f9f8d512
Update frramework again
2018-04-13 21:47:50 +09:00
smoogipoo
733f70cbd5
Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
2018-04-13 21:13:09 +09:00
Dean Herbert
9f5a52b641
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
2018-04-13 19:54:15 +09:00
Dean Herbert
81f0649e44
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
2018-04-13 19:50:44 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200
Add right click scrolling in song select (and its option)
2018-04-13 11:09:49 +02:00
smoogipoo
826a8552e5
Reword options item to include "screenshot"
2018-04-13 17:30:02 +09:00
TocoToucan
7c3441e2d0
ActiveInputHandlers -> IgnoredInputHandler
2018-04-12 17:06:35 +03:00
Dean Herbert
903dd7a015
Fix regression causing hard crash
...
Regressed in #2373 . My bad.
2018-04-11 19:24:19 +09:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor
2018-04-09 21:41:54 +03:00
smoogipoo
b97c4e8b44
Fix all possible cases of crossthread import data races
2018-04-09 12:45:44 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
b593c47809
Add setting to toggle performance logging
2018-03-24 05:07:48 +09:00
TocoToucan
dd5cc59250
Introduce 'Capture menu cursor' setting
2018-03-23 22:53:06 +03:00
Dean Herbert
74191e1b73
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-22 20:49:17 +09:00
Dean Herbert
f944c29505
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-21 12:32:27 +09:00
Dean Herbert
ec851648da
Add better ToString output from SkinInfo
2018-03-19 20:06:44 +09:00
TocoToucan
604e725f3f
Remove redundant code
2018-03-16 20:42:05 +03:00
Dean Herbert
afc3646450
Move API configuration hooks out of OsuGameBase
...
Also makes username more private, and password completely private.
2018-03-14 10:15:05 +09:00
Vidalee
6d9e78a3a3
Review changes
2018-03-11 22:40:49 +01:00
Vidalee
eed0f3a1de
Added setting to not hide the first object in Hidden mod
2018-03-11 21:02:14 +01:00
TocoToucan
e6c22e2287
Taking screenshot support initial commit
2018-03-10 21:59:20 +03:00
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09:00
Dean Herbert
402d71a8d9
Add user skin setting storage
2018-02-22 16:29:05 +09:00
Dean Herbert
659cf629b6
Add skin seleciton dropdown to settings
2018-02-22 15:46:11 +09:00
Joseph Madamba
3d4bed462b
Reword sign in text
2018-02-21 20:54:47 -08:00
Dean Herbert
d07ab1fbea
Fix undelete all
2018-02-15 15:14:55 +09:00
Dean Herbert
d3dd31dadb
Make deletion and purging logic even more global
2018-02-15 14:22:39 +09:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
Dean Herbert
67bd375bfa
Merge remote-tracking branch 'upstream/master' into raw-input-fixes
2018-02-07 22:05:44 +09:00
Shane Woolcock
e0c52c69cf
Prevent revert-to-default OnHover from hiding visual settings at beatmap load
2018-02-06 22:31:30 +10:30
Dean Herbert
30b9439263
Fix default mouse sensitivity not reverting correctly
2018-02-05 20:00:36 +09:00
Dean Herbert
7e56519d6a
Add setting for absolute input mapping
2018-02-05 16:13:39 +09:00
Dean Herbert
39160d895c
Update design of "revert to default" button
...
Also fixes some inconsistencies in padding
2018-02-02 15:18:39 +09:00
Dean Herbert
335f0d577c
Add the ability to duck volume when the game is inactive
2018-01-31 18:16:55 +09:00
Dean Herbert
188b26472c
Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision
2018-01-12 18:54:36 +09:00
smoogipoo
441e8aced5
Better namings for the speed change "algorithms"
2018-01-12 17:18:34 +09:00
smoogipoo
6a5a3b01b2
Fix license headers
2018-01-11 12:39:06 +09:00
smoogipoo
86b5591583
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
2018-01-10 18:02:49 +09:00
smoogipoo
c010b48b29
Remove number format specified from OsuSliderBar, override ToolTipText
...
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca
More osu!-side bindable fixes
2018-01-10 15:41:13 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur
2018-01-09 21:20:05 +09:00
smoogipoo
c4d1922c8b
Add scrolling algorithm to global settings
2018-01-08 11:34:37 +09:00
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision
2018-01-05 20:48:30 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
1571c10c42
Fix up replay settings sliderbar formatting
2018-01-05 14:37:32 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
Dean Herbert
2354163900
Change icon for audio settings
2018-01-02 12:30:55 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
ColdVolcano
bc90793b1c
Trim whitespace
2017-12-25 19:18:57 -06:00
ColdVolcano
044e4d0acd
Add blur to background in Player
2017-12-25 19:11:49 -06:00
Dean Herbert
3c8d30f8e6
Add a dialog offering to import beatmaps from stable
2017-12-26 00:52:11 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog
2017-12-21 22:56:31 +09:00
Aergwyn
bfe986230d
Merge branch 'master' into add-confirmation-dialog
2017-12-18 17:29:06 +01:00
Aergwyn
6ac33e3c00
made DeleteAll-button pink
2017-12-18 17:04:35 +01:00
FreezyLemon
d2b80fdbfc
Moved "undelete all" logic to BeatmapManager and added a progress notification
2017-12-18 10:55:07 +01:00
Dean Herbert
4c45102d61
Merge branch 'master' into undelete-button-add
2017-12-18 16:28:32 +09:00
Aergwyn
2e196661bb
Merge branch 'master' into add-confirmation-dialog
2017-12-15 18:11:13 +01:00
Dean Herbert
b9298325a3
Rename weird config setting
2017-12-15 14:36:51 +09:00
Dean Herbert
99b00143eb
More clean-ups and event bindings
2017-12-15 14:36:51 +09:00
Aergwyn
59e8536ff7
moved action to construction arguments
2017-12-14 17:33:56 +01:00
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03:00
Aergwyn
cdf9ea0d01
removed unnecessary variable
...
and fixed the test because of new DI letting it fail
2017-12-09 13:39:11 +01:00
Aergwyn
114604a642
removed unused DI
2017-12-08 14:45:40 +01:00
Aergwyn
c97646bea6
added confirmation dialog for Delete ALL beatmaps
2017-12-08 14:27:07 +01:00
FreezyLemon
d93a1fdaae
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
2017-12-08 10:30:42 +01:00
smoogipoo
d52b84df46
Move KeyboardStep assignment to ctor
2017-12-07 20:53:28 +09:00
FreezyLemon
bf386598b6
Added a new "undelete" button that restores every beatmap with "DeletePending" set to true.
2017-11-30 10:58:32 +01:00
Nicolas Brassard
36cfa552f4
Fix SensitivitySlider keyboard control
2017-11-29 23:03:26 -08:00
smoogipoo
0ec10ba32d
CI fixes
2017-11-30 00:11:00 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
Dean Herbert
7877f42763
Merge remote-tracking branch 'upstream/master' into new-sounds-and-more
2017-11-27 17:59:24 +09:00
Dean Herbert
8d7c891882
Add hover and click sound effects to settings sidebar buttons
2017-11-26 17:17:49 +09:00
Dean Herbert
af499df6dd
Make a base OsuButton class to handle default samples
2017-11-26 17:17:48 +09:00
Dean Herbert
09facdc838
Add a setting to toggle showing converted beatmaps
2017-11-24 18:34:20 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +09:00
smoogipoo
f461f03b08
Make osu! compile with framework changes
2017-11-16 14:51:31 +09:00
smoogipoo
cd8d7af9db
Clean up a few warnings in preparation for net-standard
2017-11-14 13:06:25 +09:00
smoogipoo
04b271cce9
Migrate osu.Game project to VS2017 project structure
2017-10-30 22:24:11 +09:00
Shane Woolcock
22d222354c
Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables
2017-10-26 18:45:20 +10:30
Dean Herbert
c765785d00
Mark several long-running tasks as long-running
2017-10-25 11:42:55 +09:00
Dean Herbert
00bb82215b
Merge branch 'master' into revert-to-default-glow
2017-10-24 10:48:08 +09:00
Dan Balasescu
9eab2deee7
Merge branch 'master' into config-slider-keyboardstep
2017-10-24 10:10:39 +09:00
Dean Herbert
df20845fbb
Share one context per file store for performance reasons
...
There is now a CreateContext method for retrieving a stand-alone context for threaded use.
We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Shane Woolcock
ea2934d92c
Add KeyboardStep values for configuration options
2017-10-23 16:06:08 +10:30
Shane Woolcock
2e6a68d358
Rename indicator class, add colour/fade easing, and add tooltip
2017-10-22 16:12:30 +10:30
Shane Woolcock
5785af9f6a
Reenable revert indicator on audio device since the potential crash was addressed in #1101
2017-10-22 14:22:57 +10:30
Shane Woolcock
59b10981dc
CI fixes
2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07
Fix wrong license header
2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e
Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset
2017-10-21 16:05:37 +10:30
Shane Woolcock
b4d575fbcd
Fix namespace and unnecessary using
2017-10-21 13:22:21 +10:30
Shane Woolcock
290fac8990
Temporarily disable revert functionality for audio device, since it crashes
2017-10-21 13:17:03 +10:30
Shane Woolcock
98044a17d3
Fix misaligned settings buttons
2017-10-21 13:16:06 +10:30
Shane Woolcock
2c7343e965
Add revert-to-default glow for settings items
2017-10-21 12:44:47 +10:30
Dean Herbert
acc299c7b9
Correct and simplify RulesetStore
2017-10-16 17:02:31 +09:00
Damnae
2c245f4c22
Merge branch 'master' into storyboard_integration
...
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
2017-09-22 12:45:34 +02:00
Dean Herbert
98c22e8111
Merge branch 'master' into master
2017-09-22 15:19:23 +08:00
gabixdev
8438ea1267
Fix formatting ;_;
2017-09-21 22:11:35 +02:00
Damnae
fcaabf7fdf
Merge branch 'master' into storyboard_integration
2017-09-19 17:36:29 +02:00
Dean Herbert
096f53d769
Use new static IsDebug method
2017-09-19 16:07:00 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
