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
3fc2bfd313
Merge pull request #2665 from peppy/import-fixes
...
Fix beatmap importing entering a bad state
2018-05-31 13:58:22 +09:00
a9db479b27
Merge branch 'master' into import-fixes
2018-05-31 13:49:12 +09:00
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
0c94e90043
Merge branch 'master' into score-multiplier-edits
2018-05-31 13:05:14 +09:00
1201fe90fb
Merge pull request #2632 from peppy/catch-sizing-fixes
...
Fix catch sizing
2018-05-31 12:58:16 +09:00
b7511251d9
Remove pointless FillMode specification
2018-05-31 12:50:01 +09:00
0f6c623ebb
Tidy up some unnecessary lines
2018-05-31 12:44:59 +09:00
205aa1a3cd
Fetch colour from OsuColour palette
2018-05-31 12:44:11 +09:00
319faf12f7
Fix incorrect naming of label
2018-05-31 12:39:56 +09:00
2f21b9c4ea
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
2018-05-31 12:36:37 +09:00
9924ec9606
Merge branch 'master' into catch-sizing-fixes
2018-05-31 12:31:52 +09:00
5d103a0088
Merge pull request #2672 from DrabWeb/multiplayer-screen-type
...
Add Type property to MultiplayerScreen
2018-05-31 11:42:33 +09:00
ff93a54a64
Default Type to Title, use ToLower for the screen type title.
2018-05-30 23:16:54 -03:00
74c52e0a7c
Merge branch 'master' into multiplayer-screen-type
2018-05-31 00:16:43 +09:00
eb89317494
Remove performance optimisation tracking disables to keep things simple for now
2018-05-30 13:43:43 +09:00
4a7de043e0
Recycle all contexts on beginning a write operation for the time being
2018-05-30 13:43:25 +09:00
e23e2bd348
Fix recycling never being performed due to incorrect ordering
2018-05-30 13:37:52 +09:00
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
2dc7bb523b
Merge branch 'master' into fix-results-parallax
2018-05-30 10:15:20 +09:00
31ab6f2408
Fix event flushing sticking on early return
2018-05-29 19:43:52 +09:00
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
4a18951cce
Report full error to log file
2018-05-29 18:37:45 +09:00
6f72e5a876
Fix Debug mode instead of Release mode for mono debug target
2018-05-29 10:27:21 +02:00
749a69567b
Add EF tooling references
2018-05-29 16:26:58 +09:00
0adc16f9bd
Handle online ID mismatches and clashes on beatmap import
2018-05-29 16:26:50 +09:00
47d88a48a2
Add logging on import processes
2018-05-29 16:26:42 +09:00
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
c1f416b1cc
Add back missing rethrow
2018-05-29 16:23:38 +09:00
203691b1c7
Add import rollback test
2018-05-29 16:23:38 +09:00
3d3026a80c
Report any error during import to the write context to allow for rollback
2018-05-29 16:23:38 +09:00
cc081cad5a
Simplify test osz instantiation
2018-05-29 16:23:38 +09:00
015fd9d0e7
Fix loading test method returning oldest import rather than newest
2018-05-29 16:23:38 +09:00
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
80806be047
Don't start transactions for migration
...
It looks like transactions are used internally during migration.
2018-05-29 16:23:38 +09:00
a3287b8cf2
Correctly rollback failed imports
2018-05-29 16:23:38 +09:00
7b8211e6db
Add MultiplayerScreen.Type
2018-05-29 04:23:29 -03:00
bcb04f6168
Improve transaction handling flexibility
2018-05-29 16:23:27 +09:00
d4e7f08c20
Bring entity framework up-to-date and re-enable transactions
2018-05-29 16:23:27 +09:00
2a87b851fa
Add proper transaction rollback logic on exception
2018-05-29 16:23:27 +09:00
f6f18e2fe2
Merge pull request #2671 from Tom94/fix-vscode
...
Add build tasks for visual tests and fix broken launch tasks
2018-05-29 15:49:44 +09:00
4f73f6e0e0
Add build tasks for visual tests and fix broken launch tasks
2018-05-29 08:38:43 +02:00
5be46307fd
Fix results screen parallax being cut off
...
Alternative to / closes #2549 .
Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09:00
1572635fc8
Merge pull request #2660 from smoogipoo/fix-holdnote-judgement
...
Fix mania hold notes displaying judgements
2018-05-28 18:35:02 +09:00
31cbec99a1
Fix mania hold notes displaying judgements
2018-05-28 18:12:49 +09:00
ce8a6cfc53
Merge pull request #2603 from DrabWeb/multiplayer-lounge
...
Multiplayer lounge
2018-05-28 14:39:19 +09:00
ed7c860802
Adjust transitions of DrawableRoom
2018-05-28 13:30:29 +09:00
02c37ebc1f
Move screen titles to OsuScreen
2018-05-28 13:30:24 +09:00
0ca6d73f0e
Add a delay before the osu! logo appears when exiting multiplayer
2018-05-28 13:30:17 +09:00
3c3412791c
Merge remote-tracking branch 'upstream/release' into multiplayer-lounge
2018-05-28 13:30:04 +09:00
