smoogipoo
|
4ff803d11d
|
Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
|
2018-05-31 14:47:47 +09:00 |
|
Dan Balasescu
|
76567ae98b
|
Merge branch 'master' into song-selet-enumerable
|
2018-05-31 14:42:58 +09:00 |
|
Dan Balasescu
|
e7c35d7541
|
Merge pull request #2679 from peppy/fix-player-life-management
Fix player life management
|
2018-05-31 14:42:47 +09:00 |
|
Dan Balasescu
|
cd3ca68f03
|
Merge branch 'master' into song-selet-enumerable
|
2018-05-31 14:38:04 +09:00 |
|
Dan Balasescu
|
35d8ec8df6
|
Merge branch 'master' into fix-player-life-management
|
2018-05-31 14:34:31 +09:00 |
|
Dan Balasescu
|
c1d595677e
|
Merge pull request #2673 from peppy/fix-beatmap-import-conflicts
Fix conflicting Hash and Online IDs on beatmap import
|
2018-05-31 14:32:47 +09:00 |
|
smoogipoo
|
9da7bfd615
|
Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts
# Conflicts:
# osu.Game/Database/ArchiveModelManager.cs
|
2018-05-31 14:02:52 +09:00 |
|
Dan Balasescu
|
3fc2bfd313
|
Merge pull request #2665 from peppy/import-fixes
Fix beatmap importing entering a bad state
|
2018-05-31 13:58:22 +09:00 |
|
Dan Balasescu
|
a9db479b27
|
Merge branch 'master' into import-fixes
|
2018-05-31 13:49:12 +09:00 |
|
Dean Herbert
|
db89b92ae2
|
Merge pull request #2314 from Joehuu/score-multiplier-edits
Split score multiplier and unranked label colours
|
2018-05-31 13:13:37 +09:00 |
|
Dean Herbert
|
0c94e90043
|
Merge branch 'master' into score-multiplier-edits
|
2018-05-31 13:05:14 +09:00 |
|
Dan Balasescu
|
1201fe90fb
|
Merge pull request #2632 from peppy/catch-sizing-fixes
Fix catch sizing
|
2018-05-31 12:58:16 +09:00 |
|
Dean Herbert
|
b7511251d9
|
Remove pointless FillMode specification
|
2018-05-31 12:50:01 +09:00 |
|
Dean Herbert
|
0f6c623ebb
|
Tidy up some unnecessary lines
|
2018-05-31 12:44:59 +09:00 |
|
Dean Herbert
|
205aa1a3cd
|
Fetch colour from OsuColour palette
|
2018-05-31 12:44:11 +09:00 |
|
Dean Herbert
|
319faf12f7
|
Fix incorrect naming of label
|
2018-05-31 12:39:56 +09:00 |
|
Dean Herbert
|
2f21b9c4ea
|
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
|
2018-05-31 12:36:37 +09:00 |
|
Dan Balasescu
|
9924ec9606
|
Merge branch 'master' into catch-sizing-fixes
|
2018-05-31 12:31:52 +09:00 |
|
Dean Herbert
|
5d103a0088
|
Merge pull request #2672 from DrabWeb/multiplayer-screen-type
Add Type property to MultiplayerScreen
|
2018-05-31 11:42:33 +09:00 |
|
DrabWeb
|
ff93a54a64
|
Default Type to Title, use ToLower for the screen type title.
|
2018-05-30 23:16:54 -03:00 |
|
Dean Herbert
|
74c52e0a7c
|
Merge branch 'master' into multiplayer-screen-type
|
2018-05-31 00:16:43 +09:00 |
|
Dean Herbert
|
9ea6ab28ea
|
Fix intro potentially starting out-of-sync due to logo's outward animation
|
2018-05-30 20:22:31 +09:00 |
|
Dean Herbert
|
9497db0b0b
|
Add a delay before the loading logo is displayed
|
2018-05-30 20:22:26 +09:00 |
|
Dean Herbert
|
0caf15166e
|
Remove unnecessary FinishTransforms
|
2018-05-30 20:05:31 +09:00 |
|
Dean Herbert
|
0dafcf00b7
|
Fix some discrepancies with the main menu logo transitions
|
2018-05-30 19:50:00 +09:00 |
|
Dean Herbert
|
6d6b186fb2
|
Fix delayed logo animations playing even if screen has already been exited
|
2018-05-30 19:25:39 +09:00 |
|
Dean Herbert
|
a28e71995d
|
Offload database query to task
Allows song select to load a touch faster, in theory.
|
2018-05-30 16:15:57 +09:00 |
|
Dean Herbert
|
5872b61988
|
Fix potential double-disposal of player if PlayerLoader is finalised
|
2018-05-30 15:48:26 +09:00 |
|
Dean Herbert
|
54e53f7190
|
Fix player getting loaded when exiting song select
|
2018-05-30 15:48:20 +09:00 |
|
Dean Herbert
|
6000a90721
|
Merge branch 'master' into overlay-activation
|
2018-05-30 13:59:20 +09:00 |
|
Dean Herbert
|
eb89317494
|
Remove performance optimisation tracking disables to keep things simple for now
|
2018-05-30 13:43:43 +09:00 |
|
Dean Herbert
|
4a7de043e0
|
Recycle all contexts on beginning a write operation for the time being
|
2018-05-30 13:43:25 +09:00 |
|
Dean Herbert
|
e23e2bd348
|
Fix recycling never being performed due to incorrect ordering
|
2018-05-30 13:37:52 +09:00 |
|
Dean Herbert
|
e8cc3294d7
|
Merge pull request #2663 from smoogipoo/fix-results-parallax
Fix results screen parallax being cut off
|
2018-05-30 10:44:25 +09:00 |
|
Dean Herbert
|
2dc7bb523b
|
Merge branch 'master' into fix-results-parallax
|
2018-05-30 10:15:20 +09:00 |
|
Dean Herbert
|
31ab6f2408
|
Fix event flushing sticking on early return
|
2018-05-29 19:43:52 +09:00 |
|
Dean Herbert
|
c18a5b5ac8
|
Fix importing long filenames from stable
|
2018-05-29 19:32:56 +09:00 |
|
Dean Herbert
|
165e5b8518
|
Merge pull request #2677 from Tom94/fix-vscode
Fix Debug mode instead of Release mode for mono debug target
|
2018-05-29 19:32:20 +09:00 |
|
Dean Herbert
|
4a18951cce
|
Report full error to log file
|
2018-05-29 18:37:45 +09:00 |
|
Thomas Müller
|
6f72e5a876
|
Fix Debug mode instead of Release mode for mono debug target
|
2018-05-29 10:27:21 +02:00 |
|
Dean Herbert
|
749a69567b
|
Add EF tooling references
|
2018-05-29 16:26:58 +09:00 |
|
Dean Herbert
|
0adc16f9bd
|
Handle online ID mismatches and clashes on beatmap import
|
2018-05-29 16:26:50 +09:00 |
|
Dean Herbert
|
47d88a48a2
|
Add logging on import processes
|
2018-05-29 16:26:42 +09:00 |
|
Dean Herbert
|
de8c4e6d56
|
Remove unique constraints on hash columns
We are going to allow multiple instances of the same beatmap info hash as they could be in different beatmap sets.
|
2018-05-29 16:26:32 +09:00 |
|
Dean Herbert
|
c1f416b1cc
|
Add back missing rethrow
|
2018-05-29 16:23:38 +09:00 |
|
Dean Herbert
|
203691b1c7
|
Add import rollback test
|
2018-05-29 16:23:38 +09:00 |
|
Dean Herbert
|
3d3026a80c
|
Report any error during import to the write context to allow for rollback
|
2018-05-29 16:23:38 +09:00 |
|
Dean Herbert
|
cc081cad5a
|
Simplify test osz instantiation
|
2018-05-29 16:23:38 +09:00 |
|
Dean Herbert
|
015fd9d0e7
|
Fix loading test method returning oldest import rather than newest
|
2018-05-29 16:23:38 +09:00 |
|
Dean Herbert
|
72da640059
|
Change order of event firing in Update calls
A remove event should not be fired before the update is successful.
|
2018-05-29 16:23:38 +09:00 |
|