66cdc76621
Merge branch 'master' into hide-cursor
2017-03-19 09:23:30 +01:00
034d818427
Update framework.
2017-03-19 17:22:47 +09:00
8cb334a118
Adjust sizing a touch.
2017-03-19 16:34:29 +09:00
af85bcaf1d
Merge pull request #500 from smoogipooo/explicit_expires
...
Make DrawableHitObject expires explicit.
2017-03-19 12:47:43 +09:00
6c12da54f1
Merge pull request #499 from smoogipooo/legacy_beatmap_flag
...
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
5c645350f9
Formatting
2017-03-19 00:14:23 -03:00
4719817b45
Merge https://github.com/ppy/osu into leaderboards
2017-03-19 00:10:08 -03:00
b0e7296e25
-IHasDrawableRepresentation, User.Region -> Country
2017-03-19 00:09:58 -03:00
f237b5f1b8
Merge pull request #498 from smoogipooo/taiko_hitobject_base
...
Taiko hitobject base
2017-03-19 12:03:29 +09:00
73ffbf8142
Remove unnecessary using.
2017-03-19 11:52:16 +09:00
7337cb5f62
Merge branch 'master' into taiko_hitobject_base
2017-03-19 11:37:39 +09:00
af82a49127
Fix test case not containing any buttons.
2017-03-19 02:33:28 +09:00
3d8ec4fa05
FIx transition not always being correct.
2017-03-19 02:33:25 +09:00
f56b84a1ca
Fix mouse cursor in VisualTestGame.
2017-03-19 02:32:21 +09:00
3c7b4a8ffa
Fix cursor being displayed during disclaimer.
2017-03-19 01:59:13 +09:00
80de15d935
fixed typo
2017-03-18 15:22:03 +01:00
8f75032b64
Fix incorrect abs.
2017-03-18 22:37:50 +09:00
125936bad0
Fix double-assignment.
2017-03-18 22:23:53 +09:00
87622f9349
Update framework.
2017-03-18 22:21:51 +09:00
919ec2d3a5
Spend more when wound up.
2017-03-18 22:17:23 +09:00
6f07930110
Move cursor hiding to OsuGameDesktop (fixes headless).
2017-03-18 21:46:58 +09:00
f636f59289
Nicer cursor orientation when dragging
2017-03-18 12:47:49 +01:00
9af0104e3e
Fix NaN when dragging music controller
...
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
3649b432a1
Update framework
2017-03-18 12:04:42 +01:00
341f36be5f
Add tests service reference
2017-03-18 12:00:44 +01:00
3ee2b68215
Hide the OS cursor in OsuGameBase
2017-03-18 12:00:31 +01:00
4b3308fd1d
Remove TaikoHitObject Type, we won't be using this going forward.
2017-03-18 18:40:26 +09:00
b68b017a49
What even was this lol.
2017-03-18 18:38:51 +09:00
f4f5715906
Resharper.
2017-03-18 18:37:48 +09:00
77bdfe880a
Fix post-merge errors.
2017-03-18 18:34:45 +09:00
aa565274de
Merge branch 'legacy_beatmap_flag' into taiko_conversion
...
Conflicts:
osu.Game/Beatmaps/Legacy/IIsLegacy.cs
2017-03-18 18:34:00 +09:00
26b0bb02d8
Remove IIsLegacy, expose LegacyBeatmap without a public constructor.
2017-03-18 18:32:54 +09:00
0bc8ed9c9e
Use Colour for non-faded scores
2017-03-18 01:56:19 -03:00
e78069af12
Parenthesis
2017-03-18 01:48:29 -03:00
b9d5ab5d8c
Only calculate fade for fading leaderboard scores
2017-03-18 01:44:05 -03:00
33d70b9bbc
Update framework.
2017-03-18 13:23:58 +09:00
fbb8e79f1a
Move ctor above methods
2017-03-17 19:45:51 -03:00
137611ecf3
Use LeaderboardScore height for fade
2017-03-17 19:07:45 -03:00
82c02fa1fc
Formatting
2017-03-17 18:29:55 -03:00
4aea06be22
Merge branch 'master' into leaderboards
2017-03-17 18:23:01 -03:00
27ab8e2e86
Merge
2017-03-17 18:21:35 -03:00
0834b5b794
Made requested changes
2017-03-17 18:16:59 -03:00
8568e1536c
Separated menu and gameplay cursor size
2017-03-17 18:40:03 +01:00
124efe8126
Merge pull request #504 from peppy/song-select-loading-reoptimisation
...
Song select performance / code cleanup.
2017-03-18 02:19:02 +09:00
e529f5e439
Merge branch 'master' into song-select-loading-reoptimisation
2017-03-18 02:12:56 +09:00
bcaf12e3d9
Rename Criteria -> CreateCriteria and make into method.
2017-03-18 02:11:14 +09:00
af55bc4a12
Merge pull request #505 from peppy/menu-cursor
...
Add menu cursor.
2017-03-18 02:09:10 +09:00
77067b7e64
Re-style.
2017-03-18 02:04:23 +09:00
1fda7ee33e
Merge branch 'master' into menu-cursor
2017-03-18 01:51:41 +09:00
cd30958086
Merge branch 'master' into song-select-loading-reoptimisation
2017-03-18 01:25:22 +09:00
