Dan Balasescu
|
090bc592b5
|
Merge branch 'master' into add-skip-button-sound
|
2018-07-30 17:56:08 +09:00 |
|
Dean Herbert
|
8c3583ac54
|
Remove newline
|
2018-07-30 14:55:03 +09:00 |
|
phosphene47
|
d32a3ff052
|
Esc at the end of play should push to result screen
Closes #3060
|
2018-07-28 08:34:51 +10:00 |
|
Dan Balasescu
|
ceaa23fbbb
|
Merge branch 'master' into fix-turkish-i
|
2018-07-26 18:06:58 +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
|
44a2ae5f9a
|
Fix incorrect variable usage
|
2018-07-23 08:33:47 +02:00 |
|
Dean Herbert
|
479fe98335
|
Add more prominent sound when skipping
|
2018-07-22 22:57:55 +02:00 |
|
Dean Herbert
|
3c59ccadd0
|
Fix gameplay always skipping to first hitobject time
Regresssed with previous build
|
2018-07-22 22:19:58 +02:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
Dean Herbert
|
241437c819
|
Remove unnecessary counting change logic
|
2018-07-20 17:08:25 +09:00 |
|
Dean Herbert
|
82ddbb3f5d
|
Delay key count stop
|
2018-07-19 01:18:07 +09:00 |
|
Dean Herbert
|
8414fe9d05
|
Add key counter exceptions for paused state
|
2018-07-18 22:19:32 +09:00 |
|
Dean Herbert
|
a01361f833
|
Set restart count
|
2018-07-18 22:05:24 +09:00 |
|
Dean Herbert
|
c2cdf12986
|
Better pause logic
|
2018-07-18 19:59:04 +09:00 |
|
Dean Herbert
|
b967fe714b
|
Fix lead-in time now being long enough in many cases
|
2018-07-17 14:29:22 +09:00 |
|
Dean Herbert
|
da300baff1
|
Update hide logic
|
2018-07-17 00:06:51 +09:00 |
|
Dean Herbert
|
ca7b61367f
|
Merge branch 'master' into correctQuickFade
|
2018-07-17 00:02:15 +09:00 |
|
HoutarouOreki
|
453d58bcbd
|
Hide Content instead of particular overlays
|
2018-07-15 01:10:05 +02:00 |
|
Berkan Diler
|
c8697e1743
|
Fix KeyCounter counting clicks when game is paused
|
2018-07-14 03:08:28 +02:00 |
|
HoutarouOreki
|
1e48582dc2
|
Instantly hide pause menu for quick retry
|
2018-07-11 13:49:37 +02:00 |
|
Dean Herbert
|
8cf1553fd5
|
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
|
2018-06-29 20:30:42 +09:00 |
|
Dean Herbert
|
750f5a86c3
|
Fix catch test failing due to disabled bindable
|
2018-06-29 16:49:11 +09:00 |
|
Dean Herbert
|
0866dd11bd
|
DefaultBackAction -> BackAction, defaults to last button
The last button is more commonly the escape condition.
|
2018-06-27 12:57:26 +09:00 |
|
Dean Herbert
|
d7ce4ab6fd
|
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
|
2018-06-27 12:36:10 +09:00 |
|
ekrctb
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +09:00 |
|
Dean Herbert
|
a7ed3ea80b
|
Rename alwaysVisible to explain where it comes from
|
2018-06-13 11:38:15 +09:00 |
|
Dean Herbert
|
d9e7a324c0
|
Revert HudOverlay to private field
|
2018-06-13 11:30:22 +09:00 |
|
smoogipoo
|
67aa52fb1d
|
Use bindable binding
|
2018-06-12 19:34:49 +09:00 |
|
smoogipoo
|
c70c7a476b
|
Always display the key counter during replay/autoplay
|
2018-06-12 17:59:59 +09:00 |
|
smoogipoo
|
b9391b3c6b
|
Fix bindable not working under non-debug due to weak references
|
2018-06-11 18:18:24 +09:00 |
|
Aergwyn
|
b9b04c1b6e
|
move back logic into GameplayMenuOverlay
|
2018-06-09 09:28:02 +02:00 |
|
Aergwyn
|
792d3b8215
|
allow "go back" keybind in play
|
2018-06-09 09:14:58 +02: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
|
f3c9049660
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-07 15:34:19 +09:00 |
|
smoogipoo
|
d516a0a05c
|
Store platform offset clock in variable for visibility
|
2018-06-07 13:42:31 +09:00 |
|
smoogipoo
|
3745f9000b
|
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
|
2018-06-07 13:37:19 +09:00 |
|
Dan Balasescu
|
c30861186b
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-06 20:26:17 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +09:00 |
|
Dean Herbert
|
55921efffb
|
Rewrite much state logic
|
2018-06-06 16:17:51 +09:00 |
|
Dean Herbert
|
86be1bef6b
|
Use UserTriggered in Player
|
2018-06-06 15:10:15 +09:00 |
|
Thomas Müller
|
88b23d4e66
|
Merge branch 'master' into netcoreapp2.1
|
2018-06-04 05:30:25 +02:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
Dean Herbert
|
7ca437aa8e
|
Merge branch 'master' into fix-expand-button-colour
|
2018-06-04 02:16:27 +09:00 |
|
Joehu
|
0f13acf67e
|
Use updateExpanded method
|
2018-06-02 12:52:31 -07:00 |
|
Dean Herbert
|
652e2ccaf5
|
Merge branch 'master' into netcoreapp2.1
|
2018-06-03 03:55:33 +09:00 |
|
Dean Herbert
|
64eda27547
|
Update framework
|
2018-06-03 03:05:53 +09:00 |
|
FreezyLemon
|
a0c643fae5
|
Fix SongProgressInfo timespan formatting
|
2018-06-02 11:25:49 +02:00 |
|
Joehu
|
8d3de3affb
|
Use '?:' expression instead
|
2018-06-01 15:58:05 -07:00 |
|
Joehu
|
5d1421c0e9
|
Fix visual settings expand button colour
|
2018-06-01 15:31:25 -07:00 |
|