smoogipoo
9eb47ae691
Make SetupCircularButton inherit OsuButton
2018-08-01 17:02:52 +09:00
ekrctb
ecc6d55380
Fix player loader not gets ready when multiple mouse button is down
2018-08-01 16:20:29 +09:00
Shane Woolcock
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
smoogipoo
c9d4332846
size_x, size_y -> width, height
2018-07-31 16:44:20 +09:00
Dean Herbert
9ab56bc4ef
Make Ruleset non-public
2018-07-31 16:35:51 +09:00
smoogipoo
c5a772bbc8
Completely reuse TriangleButton
2018-07-31 15:49:04 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas
2018-07-31 13:21:14 +09:00
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
Roman Kapustin
3134e14b37
Test KeyCounter.RestoreState
2018-07-28 23:24:03 +03:00
Roman Kapustin
8bb83a8fd9
Fix nullref in KeyCounterCollection
2018-07-28 22:16:14 +03:00
Roman Kapustin
1e6220e3c0
Call KeyCounter.RestoreState itself
2018-07-28 13:22:52 +03:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas
2018-07-28 12:44:34 +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
AlFasGD
93cf063c97
Remove useless things
2018-07-27 12:52:33 +03:00
AlFasGD
1962797e20
Remove unnecessary using directive
2018-07-27 12:40:38 +03:00
AlFasGD
78cde95132
Privatise constants
2018-07-27 12:34:11 +03:00
AlFasGD
3ee1353976
Remove whitespace
2018-07-27 12:28:47 +03:00
AlFasGD
2a819a53c0
Prefer inheriting TriangleButton instead of Container
2018-07-27 12:26:37 +03:00
Dan Balasescu
ceaa23fbbb
Merge branch 'master' into fix-turkish-i
2018-07-26 18:06:58 +09:00
Dan Balasescu
6c290702a3
Merge branch 'master' into labelled-text-box-fixes
2018-07-25 21:21:06 +09:00
AlFasGD
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
Dean Herbert
95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
Dean Herbert
ff04527c6d
Merge branch 'master' into fix-always-skipping
2018-07-25 12:30:39 +02:00
smoogipoo
206e3686f2
Add back blue border
2018-07-25 18:38:50 +09:00
smoogipoo
127084ba74
Merge remote-tracking branch 'origin/master' into labelled-text-box
2018-07-25 18:35:04 +09:00
smoogipoo
b60e4b0728
Cleanup
2018-07-25 18:34:47 +09:00
Dan Balasescu
53e55c2f14
Merge branch 'master' into fix-always-skipping
2018-07-25 15:30:24 +09:00
Dean Herbert
38f221cd60
Merge branch 'master' into fix-turkish-i
2018-07-25 08:15:20 +02:00
Dean Herbert
da8fc0ee5d
ToLower -> ToLowerInvariant
2018-07-25 07:37:05 +02:00
AlFasGD
6675c455f3
Trim whitespace that magically appeared
2018-07-24 22:33:19 +03:00
AlFasGD
3ca112aef0
Clean code and apply requested changes
2018-07-24 22:04:02 +03: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
AlFasGD
ebf14c9c93
Update framework from current master
2018-07-24 11:32:24 +03:00
AlFasGD
d304aca08f
Merge branch 'master' into circular-button
2018-07-24 11:30:56 +03:00
AlFasGD
4d0d4523ca
Add test case, rename component
2018-07-24 11:23:38 +03:00
AlFasGD
0e50e4ee34
Clean code
2018-07-24 10:10:17 +03:00
AlFasGD
765c6e4ecc
Remove custom text box
2018-07-24 09:46:24 +03:00
AlFasGD
2f452c162c
Make text colour white
2018-07-24 09:21:01 +03:00
AlFasGD
a833fa3d92
Update framework and apply suggested changes
2018-07-24 09:19:45 +03:00
AlFasGD
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
AlFasGD
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
Dean Herbert
1b456fd716
Fix a potential InvalidOperationException when entering song select
...
Closes #3052 .
2018-07-23 13:11:06 +02:00
Dean Herbert
44a2ae5f9a
Fix incorrect variable usage
2018-07-23 08:33:47 +02:00
Dean Herbert
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
Roman Kapustin
332ad5bb67
Move states to KeyCounter
2018-07-22 23:58:21 +03: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
Roman Kapustin
ecd51d70f9
Rename Memento class
2018-07-22 23:13:06 +03:00
Roman Kapustin
d387048057
Resolve KeyCounterCollection merge conflict
2018-07-22 21:15:53 +03:00
Roman Kapustin
7f3ad37ede
Restore keycounter state on replay seek
2018-07-22 19:42:18 +03:00
Roman Kapustin
1d9bf42082
Fix clock assigning during KeyCounterCollection creation
2018-07-22 18:38:10 +03:00
Roman Kapustin
0632c59e60
Save KeyCounter state when keypress happens
2018-07-22 17:35:42 +03:00
Roman Kapustin
72959691e9
Introduce KeyCounterMemento
2018-07-22 17:16:17 +03:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
AlFasGD
7b4616c6c1
Add circular button file
2018-07-20 14:02:02 +03:00
AlFasGD
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
Dean Herbert
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
Dean Herbert
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
Dean Herbert
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
smoogipoo
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +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
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
smoogipoo
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
smoogipoo
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
smoogipoo
9f730dd784
Merge branch 'editor-composer-cleanup' into mania-mask-container
...
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00
smoogipoo
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +09:00
Dean Herbert
e681bd3244
Merge branch 'master' into fix-incorrect-mods
2018-07-17 15:23:21 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods
2018-07-17 13:41:02 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications
2018-07-17 13:29:16 +09:00
smoogipoo
577ff4cc7f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dan Balasescu
e4fc3a1c65
Merge branch 'master' into fix-drawable-load-regression
2018-07-17 12:22:12 +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
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state
2018-07-16 03:17:26 +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
Dean Herbert
4f5578245e
Fix regression causing previews to not play
2018-07-13 21:45:49 +09:00
Dean Herbert
63c40e9051
Remove unnecessary cache operations
2018-07-13 21:45:42 +09:00
Dean Herbert
a1a077398c
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
2018-07-13 21:04:17 +09:00
Dean Herbert
bbb11a4066
Fix regression in drawable rank first display
2018-07-13 19:53:29 +09:00
Dean Herbert
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
Dean Herbert
ac078153ae
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
2018-07-13 14:20:56 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer
2018-07-12 23:41:55 +09:00
Dean Herbert
5df2df9b3a
Fix osu! logo handling non-left mouse buttons
2018-07-12 12:36:58 +09:00
HoutarouOreki
1e48582dc2
Instantly hide pause menu for quick retry
2018-07-11 13:49:37 +02:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
8bc7c4c9a2
Add TestCase and update disclaimer screen
2018-07-11 16:30:51 +09:00
Dean Herbert
1418d1369f
Add the ability to click completed download notifications to select beatmap
...
Closes #2731 .
2018-07-11 01:32:10 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system
2018-07-10 16:44:55 +09:00
Dean Herbert
9e59b4a8e2
Fix SongSelect binding to ruleset too early
...
Causes music to stop playing while at main menu.
2018-07-10 01:29:24 +09:00
Dan Balasescu
ee4607c86e
Merge branch 'master' into fix-exit-race-condition
2018-07-09 19:02:37 +09:00
Dean Herbert
49e94850b6
Fix being able to trigger player before carousel is ready
...
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
Dean Herbert
09b3375a9d
Fix pressing escape too fast causing multiple exit attempts at song select
2018-07-09 18:12:23 +09:00
smoogipoo
0a67e5a274
Fix some possible null reference exceptions
2018-07-09 17:09:17 +09:00
Dean Herbert
0b30e6eb6a
Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system
2018-07-06 17:55:02 +09:00
Dean Herbert
c025158735
Give VisibleState a default rather than nullable
2018-07-06 17:53:06 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
Dean Herbert
e28a610757
Fix mods not correctly resetting when changing ruleset at song select
2018-07-05 13:22:52 +09:00
Dean Herbert
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
Joehu
d476842c44
Fix FooterButton clicking area
2018-07-02 22:03:17 -07:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder
2018-07-02 17:17:40 +09:00
Dan Balasescu
e5947cc969
Merge branch 'master' into non-null-ruleset
2018-07-02 15:32:55 +09:00
smoogipoo
4070c1a888
Merge remote-tracking branch 'origin/master' into non-null-ruleset
...
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash
2018-07-02 15:01:59 +09:00
Dean Herbert
2c597874bf
Fix leaderboard showing placeholder briefly when entering song select
2018-07-01 18:17:02 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player
2018-06-29 21:54:18 +09:00
Dean Herbert
6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
smoogipoo
6d6436c8d3
Fix ruleset not getting updated if changed
2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626
SongSelect needs to recache as IBindable
2018-06-29 20:50:30 +09: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
06bd3d4815
Use IBindable where possible
2018-06-29 20:28:28 +09:00
Dean Herbert
0e649b8866
Change logic
2018-06-29 20:16:24 +09:00
Dean Herbert
34fef3caba
Update exception type
2018-06-29 20:13:29 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset
2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b
Ensure toolbar triggers updates to SongSelect's ruleset
2018-06-29 19:32:42 +09:00
Dean Herbert
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
Dean Herbert
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +09:00
Dean Herbert
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
Dean Herbert
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
Dean Herbert
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
Dean Herbert
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
smoogipoo
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash
2018-06-27 16:00:59 +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
Dean Herbert
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad
Fix review issues
2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f
Remove error logging
...
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572
Move leaderboard update scheduling to a more central method
2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983
Privatise game ruleset and access via DI
...
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
smoogipoo
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
...
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
2a42418dbf
Tidy up ReadyButton
2018-06-21 10:21:54 +09:00
Dean Herbert
4c068097c8
Change required child to use same structure as other use cases
2018-06-21 10:12:12 +09:00
Dean Herbert
96100a2200
Remove schedule logic (seems unnecessary)
2018-06-20 17:41:48 +09:00
Dean Herbert
39649747aa
Simplify and synchronise multiplayer screen transitions
2018-06-20 17:25:22 +09:00
