2afe0feb24
remove white space
...
I think
2018-06-03 12:02:43 +02:00
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02:00
707af02097
apply feedback
...
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
eb135b2e85
Merge branch 'master' into participant-count-default
2018-06-03 03:05:17 +09:00
a0c643fae5
Fix SongProgressInfo timespan formatting
2018-06-02 11:25:49 +02:00
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
9b7741b353
Avoid using update for fading logic
2018-06-01 22:19:11 +09:00
ae6f603d16
Merge branch 'master' into match-panel-with-web
2018-06-01 21:31:18 +09:00
59762c0393
Change Room.Participants to an IEnumerable.
2018-06-01 06:15:23 -03:00
8dd36ee1a9
Default Max to null in ParticipantCount.
2018-06-01 06:08:57 -03:00
b9c601074d
Formatting fixes
2018-06-01 15:45:09 +09:00
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation
2018-06-01 15:31:19 +09:00
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover
2018-06-01 15:20:59 +09:00
729f2ec725
Match authorinfo with web
2018-05-31 14:34:47 -07:00
1095669a55
Match panel with web
2018-05-31 08:09:19 -07:00
6781b81336
Cleanup.
2018-05-31 05:48:42 -03:00
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover
2018-05-31 17:33:31 +09:00
29f3011f75
Merge branch 'master' into fix-osu-logo-discrepancies
2018-05-31 15:21:44 +09:00
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
4ff803d11d
Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
2018-05-31 14:47:47 +09:00
76567ae98b
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:42:58 +09:00
cd3ca68f03
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:38:04 +09:00
35d8ec8df6
Merge branch 'master' into fix-player-life-management
2018-05-31 14:34:31 +09:00
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
a9db479b27
Merge branch 'master' into import-fixes
2018-05-31 13:49:12 +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
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
0caf15166e
Remove unnecessary FinishTransforms
2018-05-30 20:05:31 +09:00
0dafcf00b7
Fix some discrepancies with the main menu logo transitions
2018-05-30 19:50:00 +09:00
6d6b186fb2
Fix delayed logo animations playing even if screen has already been exited
2018-05-30 19:25:39 +09:00
a28e71995d
Offload database query to task
...
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
5872b61988
Fix potential double-disposal of player if PlayerLoader is finalised
2018-05-30 15:48:26 +09:00
54e53f7190
Fix player getting loaded when exiting song select
2018-05-30 15:48:20 +09:00
6000a90721
Merge branch 'master' into overlay-activation
2018-05-30 13:59:20 +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
31ab6f2408
Fix event flushing sticking on early return
2018-05-29 19:43:52 +09:00
4a18951cce
Report full error to log file
2018-05-29 18:37:45 +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
3d3026a80c
Report any error during import to the write context to allow for rollback
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
