TocoToucan
43d2ae348a
Rename ReplaySomething -> PlayerSomething
2018-01-13 22:25:09 +03:00
TocoToucan
0c4fcdf6d8
Remove not used breakOverlay field
2018-01-12 23:59:36 +03:00
TocoToucan
3795411fd1
Do not assign hudOverlay's and breakOverlay's members in Player class
2018-01-12 23:33:24 +03:00
smoogipoo
d0b177e233
Proxying isn't needed anymore
2018-01-12 19:50:09 +09:00
smoogipoo
16d739580b
IProvideLocalCursor -> IProvideCursor
2018-01-12 19:37:03 +09:00
Dean Herbert
188b26472c
Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision
2018-01-12 18:54:36 +09:00
smoogipoo
a6c6523a86
Make SkipButton an OverlayContainer to use the menu cursor
2018-01-12 18:21:17 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
smoogipoo
2e235660ad
Fix skip button appearing below osu!mania's stage
2018-01-12 13:25:49 +09:00
james58899
1985e5bdb2
fix background dim
2018-01-12 12:21:37 +08:00
TocoToucan
affbb7a847
Fix license header
2018-01-12 00:37:28 +03:00
TocoToucan
c1f756b16e
Support background blur in visual settings
2018-01-12 00:03:55 +03:00
TocoToucan
3ec93966a0
Implement VisualSettings autohiding
2018-01-11 23:39:23 +03:00
TocoToucan
98851e4a78
Stop time whenever visual settings are expanded
2018-01-11 01:24:34 +03:00
smoogipoo
d147683361
Cleanup
2018-01-10 17:39:15 +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
9ec8f130a6
Ensure changes are only applied when we are the current screen
2018-01-10 13:24:26 +09:00
TocoToucan
c48c7b085c
Visual settings initial commit
2018-01-10 02:24:51 +03:00
Dean Herbert
fcb197f7b6
Simplify logic
2018-01-09 22:21:15 +09:00
Dean Herbert
2518d16a77
Denote unused variable
2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur
2018-01-09 21:20:05 +09:00
Aergwyn
f6c168be27
add skip cutscene as "in game" keybinding
2018-01-08 18:22:43 +01:00
TocoToucan
ae032cbf23
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
2018-01-07 23:40:00 +03: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
Dean Herbert
c0dd812a4c
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
2018-01-02 15:33:08 +09:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Dean Herbert
d9a80dae5d
Male NoFail use an applicable interface
2017-12-31 04:10:29 +09:00
ColdVolcano
df62ca14b7
Don't unbind when not necessary
2017-12-29 23:41:36 -06:00
ColdVolcano
3845c7ac7d
Remove bluring of storyboard
2017-12-28 14:31:34 -06:00
FreezyLemon
998f9c090d
select pause buttons after mouse move only
2017-12-28 01:56:10 +01:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays
2017-12-27 23:26:57 +09:00
Dean Herbert
324a7d6377
Merge remote-tracking branch 'upstream/master' into better-testcase-player
2017-12-27 20:26:38 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity
2017-12-27 15:01:28 +09:00
Dean Herbert
d17f6cb564
Fix crash when starting play mode with no beatmap
...
Closes #1767
2017-12-27 11:46:44 +09:00
Dean Herbert
9fb958eadc
Make TestCasePlayer more usable
...
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
ColdVolcano
044e4d0acd
Add blur to background in Player
2017-12-25 19:11:49 -06:00
Dean Herbert
71a94d6b44
Add a bindable Enabled flag to NotificationManager
...
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
6f5f4f76e5
Use Logger.Error when exceptions are involved
2017-12-25 18:21:15 +09:00
Dean Herbert
13fee5402a
Remove unnecessary using
...
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dean Herbert
abe465358c
Fix formatting
2017-12-21 21:46:57 +09:00
Dean Herbert
5b596765c8
Merge branch 'master' into dev-overlay-counter
2017-12-21 21:09:40 +09:00
Seokho Song
6fbd06f967
Fix Not update retry counter on PauseOverlay
...
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.
Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
Dean Herbert
b6fd5b0f17
Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay
2017-12-21 19:19:08 +09:00
smoogipoo
5e111e14db
Make it possible to change the overlay actions beyond instantiation
2017-12-18 19:13:25 +09:00
smoogipoo
a17b2e4c18
Expose buttons for test cases
2017-12-18 19:13:08 +09:00
smoogipoo
918e7c9a4b
MenuOverlay -> GameplayMenuOverlay
2017-12-18 16:40:50 +09:00
smoogipoo
5f538f03ea
Comments
2017-12-18 16:34:25 +09:00
smoogipoo
59365bbdce
Make MenuOverlay support key selections
2017-12-18 16:34:17 +09:00
smoogipoo
f3a5258c5b
Reorder file (ctor + bdl)
2017-12-18 14:05:12 +09:00
smoogipoo
ed81ed7c54
Add back HandleInput disable overrides
2017-12-11 15:19:00 +09:00
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03:00
Aergwyn
016057ab01
readd storyboard to beatmap + minor cleanup
2017-11-30 16:49:53 +01:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate
2017-11-27 10:42:32 +09:00
Dean Herbert
69e388dd52
Adjust background blur rate
2017-11-26 17:08:14 +09:00
Unknown
7be55df790
fix being stuck in gameplay if exit is pressed too fast
...
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00
Dean Herbert
9565a9c352
Fix TestCasePlayer not working as expected
2017-11-23 20:42:07 +09:00
FreezyLemon
18b0b77f0a
Added requested changes. Mainly changing lambdas to direct function references.
2017-11-22 21:41:50 +01:00
FreezyLemon
a033eb46d3
Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance.
2017-11-21 16:12:23 +01:00
smoogipoo
c30d31e037
Remove extra alternateFailConditions function in Player
2017-11-21 17:30:19 +09:00
Brayzure
da30d76f9b
Implement Score Processor Mod Interface
...
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
Brayzure
de4d8eb196
Implement Sudden Death and Perfect
...
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
Dean Herbert
62358c0b53
Merge branch 'master' into beatmap_scores
2017-11-16 00:45:17 +09:00
Dean Herbert
f912744acc
Fix sizing of ModIcon
2017-11-16 00:15:27 +09:00
Dean Herbert
8011048540
Fix hard crash when clicking play button with no map selected
...
Resolves #1507 .
2017-11-15 20:03:18 +09:00
Dean Herbert
a2cb9d4086
Fix audio not playing during player loading
...
Regression due to changed audio initialisation logic.
2017-11-13 19:43:00 +09:00
Dean Herbert
49a5af60e2
Fix multiple order-of-execution issues with osu! logo
...
Also sets better defaults.
2017-11-13 18:43:16 +09:00
EVAST9919
51adea2a60
Convert text to a local variable
2017-11-13 05:58:19 +03:00
EVAST9919
89e9f84753
Add padding to the text container
2017-11-13 05:52:05 +03:00
EVAST9919
ec75837965
Replay speed setting visual improvements
2017-11-13 05:04:21 +03:00
Dean Herbert
7d4e1b6f22
Don't require a local storage variable for restoring playback speed
2017-11-11 13:03:46 +09:00
Dean Herbert
3142832693
Add precision to playback speed
2017-11-11 13:00:29 +09:00
Dean Herbert
3d1d66d886
Merge branch 'master' into replay_speed
2017-11-11 10:41:38 +09:00
EVAST9919
4b21c83f35
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-11-10 17:24:26 +03:00
smoogipoo
5816d25358
Merge remote-tracking branch 'origin/master' into replay-rewinding
2017-11-10 22:19:17 +09:00
Dean Herbert
49731f4c05
Remove unused parmeter
2017-11-10 19:32:09 +09:00
Dean Herbert
bd2de89918
Why weren't these fixed previously
2017-11-10 19:26:25 +09:00
Dean Herbert
4a5a293376
Merge branch 'master' into replay-rewinding
2017-11-10 19:08:13 +09:00
Dean Herbert
bc54d4dd4f
Ensure we wait for audio track reset before proceeding with player execution
2017-11-10 18:32:15 +09:00
Dean Herbert
4874371dbf
Rename methods back
2017-11-09 17:38:20 +09:00
Dean Herbert
c2d4a213b1
Rename logo-related methods
2017-11-08 16:34:03 +09:00
smoogipoo
2fbd490626
Make RemainingTimeCounter into a Counter
2017-11-06 14:58:05 +09:00
smoogipoo
3b189c1ffe
Fix BreakOverlay not properly working with rewinding
...
In various ways:
* It wouldn't show up if rewound after the break was complete.
* The time would increase backwards if rewind happened during a break.
* Etc.
* Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.
2017-11-03 21:20:36 +09:00
Dean Herbert
9b2d41f4eb
Fix quick retry looking bad
2017-11-02 21:52:01 +09:00
Dean Herbert
b8b05fe8d2
Make the osu! logo shared game-wide
...
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
6fa02ce9bb
Use internal less
...
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
EVAST9919
a7bcae4869
Add startup value for the slider
2017-10-26 15:18:06 +03:00
EVAST9919
08637253df
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-26 15:04:44 +03:00
Shane Woolcock
ea2934d92c
Add KeyboardStep values for configuration options
2017-10-23 16:06:08 +10:30
EVAST9919
bae91d7de7
Simplify gradient usage in Letterbox Overlay
2017-10-18 05:06:17 +03:00
EVAST9919
f4428980a6
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-15 00:10:15 +03:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
EVAST9919
7a72f2e3f5
Make sure we restore the clock rate on exiting
2017-10-14 05:15:18 +03:00
EVAST9919
0ec7d2dcf6
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-06 15:56:08 +03:00
EVAST9919
95ac4e9265
Remove useless using
2017-10-06 04:57:46 +03:00
EVAST9919
96fcc095eb
Apply suggested shrinking bar changes
2017-10-06 04:49:16 +03:00
EVAST9919
5caca1d328
Don't use '#' in RankDisplay for now
2017-10-05 05:27:52 +03:00
EVAST9919
cb0dbc6d9e
Fix shrinking bar lingering on the screen for too long
2017-10-05 05:23:18 +03:00
EVAST9919
cc99678a96
Remove useless usings
2017-10-05 05:09:23 +03:00
Dean Herbert
20bf0502ab
Use scheduling rather than raw transform delays
2017-10-05 10:03:48 +08:00
EVAST9919
22a59d753b
Make all the overlays IStateful
2017-10-05 04:38:13 +03:00
EVAST9919
1c132938df
Allow visibility can be toggled only if replay is loaded
2017-10-03 20:26:53 +03:00
EVAST9919
feb0b1852f
Remove the dangerous function
2017-10-03 20:05:50 +03:00
EVAST9919
b94c78e993
Hide/Show Replay settings on pressing Ctrl+H
2017-10-02 19:33:58 +03:00
EVAST9919
4a298098c5
CI fixes
2017-10-02 18:19:55 +03:00
EVAST9919
c34cc07fda
Remove default bindable from the config manager
2017-10-02 18:09:00 +03:00
EVAST9919
b6ed977e1e
Fix hard crash and fix breaks have been initialized twice
2017-10-02 09:04:03 +03:00
EVAST9919
7052462863
Update inline with framework
2017-10-02 08:51:00 +03:00
EVAST9919
c2f487aa3e
Add Rank as a property to the Score Processor
2017-10-02 05:56:38 +03:00
EVAST9919
5ce2723719
Don't use linq query
2017-10-02 05:12:56 +03:00
EVAST9919
6d97da8b19
Add replay speed adjustment
2017-10-02 04:42:38 +03:00
EVAST9919
ac6c323f93
Clear all tasks and transforms when resetting Breaks
2017-10-02 00:44:57 +03:00
EVAST9919
b62f2437ac
Don't allow counter became 0
2017-10-01 23:38:11 +03:00
EVAST9919
c696f74578
Fix broken testcase and apply suggested changes
2017-09-27 01:10:48 +03:00
EVAST9919
3cd6319ffa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-27 00:32:38 +03:00
Damnae
2d4616fd43
Apply beatmap settings when creating the DrawableStoryboard.
2017-09-25 11:03:57 +02:00
Damnae
0996867112
Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
2017-09-25 10:40:22 +02:00
EVAST9919
94269e119e
Reset text only if it has been changed
2017-09-23 19:59:34 +03:00
EVAST9919
0615f375e1
Show current grade
2017-09-23 19:52:44 +03:00
EVAST9919
a69bef8ec0
Use existing enum instead of my own
2017-09-23 16:51:31 +03:00
EVAST9919
2da3ea00b6
Bind break overlay to accuracy
2017-09-23 16:42:18 +03:00
EVAST9919
ced6204219
oops
2017-09-22 22:10:05 +03:00
EVAST9919
d73b40768e
More arrow adjustments to match the design
2017-09-22 21:12:58 +03:00
EVAST9919
92eb8e4fa9
Move blurred icons to a parallax container
2017-09-22 21:00:45 +03:00
EVAST9919
6fe2b64abd
Start breakOut animation a bit earlier
2017-09-22 20:50:00 +03:00
EVAST9919
d58e5a6130
Arrows improvements
2017-09-22 20:43:51 +03:00
EVAST9919
56bde64839
Add arrows overlay
2017-09-22 01:16:05 +03:00
EVAST9919
5383e33f3d
Remove useless clock assignment
2017-09-21 22:58:49 +03:00
EVAST9919
22ab2c5e5d
Apply suggested changes
2017-09-21 22:54:46 +03:00
EVAST9919
9667270336
Remove using
2017-09-21 01:56:50 +03:00
EVAST9919
e051bcc6df
Fix wrong arrows position on startup
2017-09-21 01:51:40 +03:00
EVAST9919
c79568135a
Add arrows
2017-09-21 01:44:30 +03:00
EVAST9919
18a714df74
Move every class to it's own file
2017-09-20 22:33:07 +03:00
EVAST9919
581689a84d
CI fixes
2017-09-20 20:58:20 +03:00
EVAST9919
4699a44608
Add info container
2017-09-20 20:50:14 +03:00
EVAST9919
8d7db52200
Add remaining time counter
2017-09-20 19:45:38 +03:00
EVAST9919
0f04d8c6a7
Add remaining time container
2017-09-20 15:58:28 +03:00
EVAST9919
429e7723b3
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-15 19:40:30 +03:00
EVAST9919
740e766201
BreakOverlay and LetterboxOverlay implementation
2017-09-15 19:39:55 +03:00
Damnae
757a159516
Display a non-parallax background at the appropriate size when storyboards do not replace it.
2017-09-15 14:31:54 +02:00
Damnae
f5368505ab
Load the storyboard asynchronously if it wasn't loaded with the beatmap.
2017-09-15 11:58:37 +02:00
Damnae
4a15762139
Don't create drawables for hidden storyboards.
2017-09-15 11:58:37 +02:00
Damnae
c8cdf6787e
Better property name.
2017-09-15 11:58:31 +02:00
Damnae
7c3ce7e830
Unbind events affecting the background after gameplay has ended.
2017-09-15 09:16:56 +02:00
Damnae
cb8029af9e
Add a setting to hide storyboards.
2017-09-15 09:16:56 +02:00
Damnae
ddaf28d7f6
Integrate storyboards with gameplay.
2017-09-15 09:16:56 +02:00
Damnae
010a6ec252
Fix player loading.
2017-09-15 09:06:27 +02:00
Dean Herbert
6ea22cc6c7
Add missing return to PlayerLoader
...
was being a bit too eager previously
2017-09-15 08:15:23 +09:00
Dean Herbert
d330b39db4
Remove max
2017-09-14 13:47:25 +09:00
Dean Herbert
4f09f30b7a
Fix incorrect exception
2017-09-14 13:13:54 +09:00
Dean Herbert
b1145272d1
Update code to support new inspectcode analysis rules
2017-09-14 12:58:32 +09:00
smoogipooo
2e0218f388
Move AllObjectsJudged into ScoreProcessor as AllJudged
...
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
Dean Herbert
eedfbdc0e8
Add nullref check in KeyCounterCollection's Add method
2017-09-11 11:41:09 +09:00
smoogipooo
57678a13d9
Update in-line with framework changes.
2017-09-04 09:32:35 +09:00
Dean Herbert
189988236b
Move PlayerInputManager logic inside RulesetInputManager
2017-08-24 15:23:17 +09:00
Dean Herbert
c5a20e3372
Remove permitNulls
2017-08-22 18:28:32 +09:00
Dean Herbert
803cbddfe2
Ensure score's user is set directly from API
...
Previously would fail in visualtests due to `OsuGame` case.
2017-08-22 16:59:54 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
Dean Herbert
7e21ddb5eb
Remove usage of HideOnEscape
2017-08-16 22:56:32 +09:00
Dean Herbert
2c7f0629ef
Merge remote-tracking branch 'upstream/master' into is-alive
2017-08-16 12:11:32 +09:00
Dean Herbert
97ac8e1a64
Update usages of IsAlive/IsLoaded in line with framework changes
2017-08-15 13:57:48 +09:00
Dean Herbert
70f148f0b4
Fix icons on skip button
2017-08-15 09:30:46 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Dean Herbert
e75f438c29
Add difficulty application mods
...
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e
Implement NoFail mod
2017-08-07 08:54:54 +09:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Huo Yaoyuan
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
Dean Herbert
f705589bf2
Rename NotificationManager to NotificationOverlay
2017-07-28 15:03:42 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Huo Yaoyuan
e0b1057b87
Merge branch 'master' into fixes
2017-07-24 20:50:33 +08:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
f7b64a458a
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:10:25 +09:00
Thomas Müller
ed6478be8b
Merge branch 'master' into always-load-storyboard
2017-07-20 20:54:16 +02:00
Dean Herbert
c1a3e4a008
Remove unnecessary using
2017-07-20 20:06:24 +09:00
Dean Herbert
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
d6968ca09c
Remove FullyLoaded logic
...
Always parse storyboards for now.
Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
Dean Herbert
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
smoogipooo
d75e439f94
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 01:27:27 +09:30
Dean Herbert
38431f8555
Fix remaining test case issues
2017-07-19 19:10:04 +09:00
Dean Herbert
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Dean Herbert
c5d23daa6b
Merge remote-tracking branch 'upstream/master' into remove-dragbar
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-07-18 13:44:23 +09:00
Huo Yaoyuan
cd7c04c54d
Simplify misc null-coalescing expression.
2017-07-18 12:30:10 +08:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737
Try different formatting style
2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4
Replace several usages of BeginDelayedSequence with LINQ-style
2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72
Update framework
2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
fd58c6e835
Nicer generic rolling counters
2017-07-14 19:14:07 +03:00
Thomas Müller
b5fbb26f8f
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
2017-07-14 16:46:18 +03:00
Thomas Müller
c73a1ae058
Use TransformTo in rolling counters
2017-07-14 16:46:00 +03:00
Dan Balasescu
c13dc943f8
Merge branch 'master' into fix-track-rotation
2017-07-14 19:25:54 +10:00
Dean Herbert
95a40e39ec
Merge branch 'master' into mods_overlay_fix
2017-07-14 17:31:52 +09:00
Dean Herbert
6c9219856d
Add comment
2017-07-14 09:39:40 +09:00
Nabile Rahmani
840cc918ea
Use Enabled instead of a private field.
2017-07-13 23:35:19 +02:00
Nabile Rahmani
8014cd55a2
Make the skip button clickable only once.
2017-07-13 21:59:17 +02:00
Dean Herbert
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09:00
EVAST9919
0b1db1502d
removed useless bool
2017-07-12 09:42:38 +03:00
EVAST9919
ab8fb2edab
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
2017-07-12 09:31:56 +03:00
Dean Herbert
54f6befd67
Merge branch 'master' into fix-track-rotation
2017-07-12 13:18:16 +09:00
Dean Herbert
0322e66c25
Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist
2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Thomas Müller
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
Dean Herbert
9bbcc0526d
Disable beatmap changes in specified screens
2017-07-11 18:39:10 +09:00
Thomas Müller
c4e378571b
Update framework
2017-07-10 11:54:23 +03:00
Dean Herbert
0e0c32008b
More changes
2017-07-10 15:40:40 +09:00
Dean Herbert
0e2dc9388a
More changes in-line with framework changes.
2017-07-10 12:55:47 +09:00
EVAST9919
33206fcf0e
Use Hide instead of FadeTo(0)
2017-07-08 12:34:24 +03:00
EVAST9919
adb88a8d49
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
2017-07-08 12:28:41 +03:00
Thomas Müller
178685292a
Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode
2017-07-08 12:25:08 +03:00
Dean Herbert
3c425dd07f
Fix CI issue
2017-07-08 18:06:59 +09:00
Thomas Müller
22a987f6cc
Update test cases to new framework and fix old crashes
2017-07-07 15:05:55 +03:00
Thomas Müller
6de9776e05
Update framework with tooltip changes
2017-07-07 08:59:17 +03:00
Jai Sharma
6eaeba5a92
Merge branch 'master' into remove-dragbar
2017-07-06 20:14:08 +01:00
Dean Herbert
724e5aa99e
Merge master into better-input
2017-07-05 13:59:40 -07:00
Thomas Müller
2d7eefa6fe
Update Cached usage according to framework
2017-07-02 13:00:02 +03:00
Thomas Müller
bb15bc0467
Use ReceiveMouseInputAt whenever possible
2017-06-30 09:54:03 +03:00
Dean Herbert
f3f3952ba5
More unused usings
2017-06-29 12:20:05 -07:00
Dean Herbert
6865f9b231
Remove unused parameters
2017-06-29 12:05:37 -07:00
Dean Herbert
1e50840a8e
Fix unused usings
2017-06-29 12:04:04 -07:00
Dean Herbert
ee96d39b93
Shuffle sound samples around and make more conformant
2017-06-28 10:19:04 -07:00
Thomas Müller
40225238d9
Set RelativeSizeAxes for updated FillMode behavior
2017-06-28 12:24:23 +03:00
Dean Herbert
480cdba023
Add OsuClickableContainer with generic sounds
2017-06-27 21:05:49 +09:00
EVAST9919
2ad6d3fa77
Simplify property
2017-06-27 05:41:24 +03:00
EVAST9919
714d53f329
Hide "Unranked" text in ModDisplay if play is ranked
2017-06-27 05:17:21 +03:00
Jai Sharma
a0262e32b1
CI Fixes
2017-06-24 09:15:53 +01:00
Jai Sharma
e073100498
Merge branch 'master' into remove-dragbar
2017-06-24 08:55:02 +01:00
Thomas Müller
e3489928b7
Remove now obsolete InternalContains
2017-06-24 09:21:08 +02:00
Jai Sharma
a327f49d68
Updating progressBar.EndTime is more thread safe
2017-06-23 18:24:46 +01:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
Jai Sharma
73c004fb71
Removed DragBar from song progress
2017-06-22 17:42:29 +01:00
smoogipooo
fc0e44b214
Update framework.
2017-06-21 11:28:27 +09:00
paparony03
c8720bc5d5
Oops
2017-06-20 16:00:09 +10:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
Dean Herbert
a454ca606f
Merge remote-tracking branch 'upstream/master' into johnneijzen-master
2017-06-08 20:33:39 +09:00
