Dean Herbert
7877f42763
Merge remote-tracking branch 'upstream/master' into new-sounds-and-more
2017-11-27 17:59:24 +09:00
FreezyLemon
82a9b57277
Removed unnecessary "using" statement
2017-11-27 08:58:09 +01:00
FreezyLemon
b4513497d6
Added a textContainer reference to MetadataSection so casting is no longer required for setting new text
2017-11-27 08:52:26 +01:00
FreezyLemon
507da0dfb7
Renamed addTextAsync to setTextAsync
2017-11-27 08:48:47 +01:00
FreezyLemon
ac0942df86
Removed unnecessary private method to update the metadata
2017-11-27 08:48:12 +01:00
FreezyLemon
d49ee295d9
Removed unnecessary schedule and null checks
2017-11-27 08:47:36 +01:00
FreezyLemon
b34e724b8d
Changed MetadataSection so that the Text setter loads the new text in async before displaying it.
2017-11-27 08:18:09 +01:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate
2017-11-27 10:42:32 +09:00
Dan Balasescu
77bfc6037d
Merge branch 'master' into fix-stuck-in-play
2017-11-27 10:06:34 +09:00
Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle
2017-11-27 09:41:30 +09:00
Dean Herbert
5aa6615107
Add confirm-selection sound in song select
2017-11-26 17:21:22 +09:00
Dean Herbert
af499df6dd
Make a base OsuButton class to handle default samples
2017-11-26 17:17:48 +09:00
Dean Herbert
ae48b85827
Don't play logo select sample when actions are playing their own
2017-11-26 17:17:47 +09:00
Dean Herbert
07d6a70028
New sound effects with better names
2017-11-26 17:17:46 +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
Huo Yaoyuan
d955229ee5
Handle user rating metrics when no maps by using more linq.
2017-11-25 21:29:23 +08:00
Dean Herbert
09facdc838
Add a setting to toggle showing converted beatmaps
2017-11-24 18:34:20 +09:00
smoogipoo
3d8432aecf
Merge branch 'master' into fix-player-testcases
2017-11-24 13:23:42 +09:00
Dean Herbert
c7a5a7cd93
Merge remote-tracking branch 'upstream/master' into fix-player-testcases
2017-11-23 23:42:19 +09:00
Dean Herbert
6ddefa5f8c
Merge branch 'master' into improve-user-ratings-calculations
2017-11-23 23:33:05 +09:00
Dean Herbert
dbb03bcff2
Handle the case where a map hasn't been rated yet
2017-11-23 23:30:57 +09:00
Dan Balasescu
dd78479a1a
Merge branch 'master' into fix-ef-issues
2017-11-23 21:18:20 +09:00
Dean Herbert
2f3e4a27c6
Merge branch 'master' into improve-user-ratings-calculations
2017-11-23 20:55:55 +09:00
Dean Herbert
9565a9c352
Fix TestCasePlayer not working as expected
2017-11-23 20:42:07 +09:00
FreezyLemon
00830c190c
Merge branch 'master' of https://github.com/ppy/osu
2017-11-23 12:39:36 +01:00
FreezyLemon
a60e53c382
Changed the text updates into a scheduled (async) operation, and implemented this in the updateStatistics and clearStats methods
2017-11-23 12:31:18 +01:00
Dean Herbert
9db6ef6657
Fix unfixed regressions
2017-11-23 20:23:47 +09:00
Dean Herbert
4986ad73f7
Merge remote-tracking branch 'upstream/master' into load-optimization
2017-11-23 18:44:17 +09:00
Dean Herbert
d93911ae97
Improve user ratings calculations to make more sense
...
Closes #1552 .
2017-11-23 18:10:08 +09:00
FreezyLemon
2cc2323791
Style changes (removing newline from before second constructor parameter)
2017-11-23 09:12:23 +01:00
Dean Herbert
1824540325
Schedule calls to correct thread
...
These could be fired from an async worker thread (for instance, maintenance operations).
2017-11-23 17:02:54 +09:00
FreezyLemon
18b0b77f0a
Added requested changes. Mainly changing lambdas to direct function references.
2017-11-22 21:41:50 +01:00
FreezyLemon
7d428875b8
Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor)
2017-11-22 15:46:04 +01:00
Dean Herbert
517a9ec40f
Merge branch 'master' into async-beatmap-panels
2017-11-22 19:05:42 +09:00
Dean Herbert
36d45f633d
Reorder methods
2017-11-22 11:57:09 +09:00
Dean Herbert
e3c5a599b6
Tidy some regressions
2017-11-22 11:36:29 +09:00
Dean Herbert
27fb598352
Update colours to match design
2017-11-22 11:34:54 +09:00
Dean Herbert
0f8499c580
Rename to PlaybackControl and add a TestCase
2017-11-22 11:22:46 +09:00
Dean Herbert
ff5404e57f
Remove need for AlwaysPresent
...
Also self-contains the tab options inside the tab control.
2017-11-22 11:21:48 +09:00
Dean Herbert
855acc9401
Fix leading space before percent sign
2017-11-22 11:17:10 +09:00
Dean Herbert
c06d6d0bbb
Rename weird method
2017-11-22 10:59:31 +09:00
Dean Herbert
461c8e8be0
Clean up state change logic
2017-11-22 10:55:06 +09:00
Dean Herbert
63d366ea4b
Bindables should be readonly
2017-11-22 10:54:33 +09:00
FreezyLemon
1d41e7cc8a
Removed newline at end
2017-11-21 20:15:42 +01:00
FreezyLemon
2203a84300
Small fixes and style corrections
2017-11-21 19:16:44 +01:00
FreezyLemon
870807c265
Switched over to the new LoadWrapper class for all delayed loading.
2017-11-21 16:17:33 +01:00
FreezyLemon
a033eb46d3
Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance.
2017-11-21 16:12:23 +01:00
Dean Herbert
2603219350
Load beatmap carousel panels asynchronously
2017-11-21 22:30:09 +09:00
Dean Herbert
aff217cd03
Fix early access to beatmap in LogoVisualisation
...
Missed this one..
2017-11-21 19:47:12 +09:00
Dean Herbert
7b916806f9
Merge branch 'master' into fix-info-wedge
2017-11-21 19:12:19 +09:00
Dean Herbert
c2fcb2f9c7
Fix info wedge not displaying
2017-11-21 18:45:12 +09:00
EVAST9919
10f730a004
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
2017-11-21 12:39:14 +03:00
EVAST9919
41498ffad3
Apply suggestions
2017-11-21 12:22:19 +03:00
smoogipoo
0d1b5ae44f
Adjust bottom bar sizing as suggested
2017-11-21 17:51:07 +09:00
smoogipoo
238756ec5d
Merge remote-tracking branch 'origin/master' into editor-playback-speed
2017-11-21 17:41:16 +09:00
Dan Balasescu
c39e76fdea
Merge branch 'master' into sudden-death
2017-11-21 17:37:40 +09:00
Dan Balasescu
142b74cc47
Merge branch 'master' into sudden-death
2017-11-21 17:32:31 +09:00
smoogipoo
c30d31e037
Remove extra alternateFailConditions function in Player
2017-11-21 17:30:19 +09:00
Dean Herbert
66f72baa39
Avoid LogoVisualisation accessing the track before it's loaded
2017-11-21 12:42:28 +09:00
Dean Herbert
bd616c1307
Simplify some property access
2017-11-21 12:42:28 +09:00
Dean Herbert
be9c99ade3
Remove AsyncLoadWrapper dependence
2017-11-21 12:42:28 +09:00
Dean Herbert
e7654254d2
Remove unused code
2017-11-21 12:42:28 +09:00
Dean Herbert
5db2d383ed
Remove temporary variable in beatmap background update
2017-11-21 12:42:28 +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
Dan Balasescu
a2e45293d6
Merge branch 'master' into fix-result-screen
2017-11-20 18:18:08 +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
EVAST9919
ecc2877be6
Fix possible null and adjust timeline width
2017-11-20 09:29:26 +03:00
EVAST9919
9fe7ebc0ce
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
2017-11-20 09:18:22 +03:00
Aergwyn
0b5614e4ee
fix result screen not showing name of mapper
2017-11-18 22:12:15 +01:00
Dean Herbert
9325730f5d
Fix leaderboard fadeout causing constant flow changes
...
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
Dean Herbert
60778593c3
Make pressing space twice at main menu a bit smoother
2017-11-18 22:24:51 +09:00
Dean Herbert
b835f1b708
Merge branch 'master' into fix-main-menu-osu-logo
2017-11-18 21:53:04 +09:00
Brayzure
de4d8eb196
Implement Sudden Death and Perfect
...
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
EVAST9919
4ee3a89c12
Remove using
2017-11-18 08:35:00 +03:00
EVAST9919
34d8f94f99
Add track timer
2017-11-18 08:24:09 +03:00
Dean Herbert
c2d1de34fc
Fix logo not always returning to the correct state when rapidly changing menus
...
Fixes #1005 for real
2017-11-18 11:19:15 +09:00
EVAST9919
a741d6cea7
Fix incorrect score indexes in leaderboard
2017-11-18 04:46:02 +03:00
Dean Herbert
322dd1bd05
Rename variables to make more sense
2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590
Remove duplicated code
2017-11-18 10:34:17 +09:00
Dean Herbert
c2b6e958f7
Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo
2017-11-18 10:28:00 +09:00
EVAST9919
58e7263108
CI fixes
2017-11-18 03:09:09 +03:00
EVAST9919
0b8fed4e5a
Remove useless Dimention params
2017-11-18 01:51:23 +03:00
EVAST9919
7492ab6495
Use GridContainer to place the bottom bar objects
2017-11-18 01:48:50 +03:00
EVAST9919
0cad5a5ca3
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
2017-11-18 01:15:50 +03:00
EVAST9919
07e0aba01c
Remove using
2017-11-17 14:10:13 +03:00
EVAST9919
1680c0905f
Fix track tempo could be less than 1 on exiting the editor
2017-11-17 14:02:07 +03:00
EVAST9919
cc04d5bc61
Add all the objects to the PlaybackContainer
2017-11-17 13:35:41 +03:00
EVAST9919
d62da4334e
Add and place all the bottom bar objects
2017-11-17 12:26:13 +03:00
Dean Herbert
8bd59ff0b3
Fix osu! logo occasionally being in the wrong state on entering the main menu
2017-11-17 17:40:10 +09:00
Dean Herbert
6c40cf08cc
Optimise leaderboard display
...
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09: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
eaf1a60fe1
Merge branch 'master' into beatmap_scores
2017-11-15 17:58:07 +09:00
EVAST9919
ea2fa5fa00
Fix wrong ratings calculations
2017-11-15 09:48:40 +03:00
EVAST9919
8688afecde
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores
2017-11-14 20:13:07 +03:00
smoogipoo
9344502b71
More warning fixes
2017-11-14 18:05:07 +09:00
smoogipoo
bd7a6a90f5
Remove unused fields
2017-11-14 17:43:19 +09:00
smoogipoo
cd8d7af9db
Clean up a few warnings in preparation for net-standard
2017-11-14 13:06:25 +09:00
EVAST9919
d157e6baf1
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores
2017-11-13 16:02:44 +03: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
Dean Herbert
ee3a5b38f4
Merge branch 'master' into performance-improvements
2017-11-13 13:50:57 +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
11077546d1
Load logo async
2017-11-13 09:50:37 +09:00
EVAST9919
072e5db6ef
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores
2017-11-11 07:16:26 +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
EVAST9919
5bf756c3c6
Add DrawableTopScore
2017-11-11 06:54:52 +03: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
Dan Balasescu
89fd92c15b
Merge branch 'master' into menu-select-transition-improvements
2017-11-10 21:03:24 +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
9e82fc21ac
Improve transition when exiting song select
...
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
5eb94f7e68
Fix loader pushing children screens before it is displayed itself
2017-11-09 23:29:56 +09:00
Dean Herbert
724540ceaa
Fix toolbar not appearing at main menu
2017-11-09 20:38:34 +09:00
Dean Herbert
598e1652dc
Adjust timings
2017-11-09 18:12:33 +09:00
Dean Herbert
6d56b3c2df
Hide triangles during outro
2017-11-09 17:52:38 +09:00
Dean Herbert
e3a868744e
Merge branch 'master' into intro-v2
2017-11-09 17:48:42 +09:00
Dean Herbert
4874371dbf
Rename methods back
2017-11-09 17:38:20 +09:00
Dean Herbert
e2005c4431
Add comment explaining necessity of AlwaysPresent for now
2017-11-08 20:36:18 +09:00
Dean Herbert
df6c808d28
Adjust animation to designer-san's liking
2017-11-08 17:04:36 +09:00
Dean Herbert
cabb22b6d1
Merge branch 'single-osu-logo' into intro-v2
2017-11-08 16:43:07 +09:00
Dean Herbert
c2d4a213b1
Rename logo-related methods
2017-11-08 16:34:03 +09:00
Dean Herbert
a8bacd1ed4
Remove unnecessary private method /shrug
2017-11-08 14:46:47 +09:00
Dean Herbert
7ad498cb29
Remove unused puzzle pieces
2017-11-08 14:45:01 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo
2017-11-08 14:37:20 +09:00
Dean Herbert
41fcecf759
Add intro in to actual game
2017-11-08 14:31:11 +09:00
Dean Herbert
d8d7165164
Add a test case which starts the game
2017-11-08 13:52:44 +09:00
Dean Herbert
713d730d10
Simplify restart process and defaults initialisation
2017-11-08 13:32:03 +09:00
Dean Herbert
1771e003f7
Simplify more
2017-11-08 12:13:30 +09:00
Dean Herbert
419f041291
Fix text alignment
2017-11-08 12:12:27 +09:00
Dean Herbert
f83c095269
Simplify more
2017-11-08 12:10:32 +09:00
Dean Herbert
89426e1c11
Simplify lines
2017-11-08 12:07:52 +09:00
Dean Herbert
7dcdf78608
Make bars and circles better
2017-11-08 12:06:22 +09:00
Dean Herbert
a72e798b85
bar -> line
2017-11-08 11:21:50 +09:00
Dean Herbert
97b238d084
Simplify intro sequence a bit more
2017-11-08 11:20:21 +09:00
Dean Herbert
552a361a24
Merge remote-tracking branch 'upstream/master' into intro-v2
2017-11-08 11:08:42 +09:00
Dean Herbert
5af2cc29f5
Merge branch 'master' into song_select_delete
2017-11-07 16:42:40 +09:00
smoogipoo
2fbd490626
Make RemainingTimeCounter into a Counter
2017-11-06 14:58:05 +09:00
EVAST9919
1afe2c18be
Fix osu! deleting beatmaps on startup if MenuMusic is disabled
2017-11-04 19:42:28 +03: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
3adcfa8c38
Many fixes
2017-11-03 17:54:35 +09:00
