Dean Herbert
c81c4cbbcd
Fix missing Metadata initialisation.
2016-10-19 12:28:48 +09:00
Dean Herbert
6705902710
Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes
2016-10-19 12:22:16 +09:00
Dean Herbert
0e9a155be5
Merge branch 'refs/heads/db-refactor' into general-fixes
2016-10-19 12:22:04 +09:00
Dean Herbert
6dc600d287
Framework updates.
2016-10-19 12:21:13 +09:00
Drew DeVault
7bdf1fe1bf
Drop BeatmapSet, only BeatmapSetInfo is necessary
2016-10-18 15:48:24 -04:00
Drew DeVault
768dd38fa0
s/AddBeatmap/ImportBeatmap/g
2016-10-18 15:42:07 -04:00
Drew DeVault
105bba6178
Rework duplicate detection in AddBeatmap
2016-10-18 15:41:46 -04:00
Drew DeVault
ad14462369
Add lifecycle management to BeatmapDatabase
2016-10-18 15:38:59 -04:00
Drew DeVault
8ca4a2067e
$(SolutionDir)
2016-10-18 13:58:24 -04:00
Drew DeVault
449f04c07b
Refactor the database code
2016-10-18 13:38:27 -04:00
Thomas Müller
406ffdafbc
Merge pull request #93 from peppy/general-fixes
...
General fixes
2016-10-18 18:55:37 +02:00
Thomas Müller
68476eafb9
Use DrawSize instead of Size whereever Size was previously read due to framework changes.
...
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
Dean Herbert
cce2094392
Framework update.
2016-10-18 11:20:16 +09:00
Dean Herbert
29b67334c6
Update framework.
2016-10-17 16:59:11 +09:00
Dean Herbert
3a77fc16c3
Merge pull request #89 from Tom94/round_masking
...
Update framework.
2016-10-17 12:11:23 +09:00
Dean Herbert
18f4d4ed1c
Update framework.
2016-10-17 12:09:05 +09:00
Dean Herbert
bfbc26738c
Merged branch master into round_masking
2016-10-17 12:08:31 +09:00
Dean Herbert
9576a7c0e7
Merge pull request #90 from Lunar-Dust/patch-1
...
Reorder ToolbarButton instantiation for consistency
2016-10-17 10:09:34 +09:00
Lunar Dust
8e47d72f93
Reorder ToolbarButton instantiation for consistency
...
Might as start good standards now rather than later
2016-10-16 18:42:40 -05:00
Thomas Müller
53076f6446
Modify osu! logo to use new CircularContainer.
2016-10-16 19:26:56 +02:00
Dean Herbert
96095f34e2
Merge pull request #87 from Tom94/unified_shader
...
Unified shader
2016-10-16 22:34:50 +09:00
Thomas Müller
d3fd16f209
Update framework.
2016-10-16 15:34:30 +02:00
Thomas Müller
fec127eb8c
Merge branch 'master' of github.com:ppy/osu into unified_shader
...
# Conflicts:
# osu-framework
# osu.Game/Overlays/Options.cs
2016-10-16 15:17:24 +02:00
Thomas Müller
b514293004
Merge pull request #88 from peppy/general-fixes
...
General fixes & framework updates.
2016-10-16 15:09:12 +02:00
Dean Herbert
d07aaba75b
Update framework.
2016-10-16 22:00:55 +09:00
Dean Herbert
02dc8dc167
Change the way VolumeControl handles global input.
2016-10-16 21:57:15 +09:00
Thomas Müller
b3e531b98c
Remove implementation of WedgedBox and use Shear transformation instead.
2016-10-16 14:10:24 +02:00
Thomas Müller
7751a85e14
Update framework.
2016-10-16 14:10:06 +02:00
Dean Herbert
620c4e6ab7
Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes
2016-10-16 18:24:10 +09:00
Dean Herbert
7d59f63ef7
Merge pull request #86 from huoyaoyuan/overlay
...
Update overlay in framework.
2016-10-16 18:22:10 +09:00
Huo Yaoyuan
f4c381f745
Use OverlayContainer in framework.
2016-10-16 17:14:17 +08:00
Huo Yaoyuan
5e9d555309
Update framework.
2016-10-16 17:12:37 +08:00
Dean Herbert
4edefb935c
Improve the initialisation logic of OsuGameBase.
2016-10-16 17:33:53 +09:00
Dean Herbert
7a4bbb6921
Merge pull request #80 from autismpp/logger
...
Replace Console.WriteLine with Logger.Log.
2016-10-15 23:02:24 +09:00
Dean Herbert
9cfafceb34
Merge pull request #85 from Tom94/make_osu_logo_circular
...
Make osu logo circular
2016-10-15 23:01:56 +09:00
Thomas Müller
1d8ff5fe46
Use circular hover region for osu! logo.
2016-10-15 15:31:16 +02:00
Thomas Müller
8f5de3040c
Update framework.
2016-10-15 15:30:51 +02:00
Dean Herbert
01db512d77
Revert .gitattributes additions for now.
2016-10-15 20:43:42 +09:00
autismpp
7276038ca7
Replace Console.WriteLine with Logger.Log.
2016-10-15 06:13:50 +03:00
Dean Herbert
4fc681a8b8
Merge pull request #82 from SirCmpwn/vscode
...
Add Visual Studio code meta files
2016-10-14 23:20:53 +09:00
Dean Herbert
bada1a2e11
Merge pull request #81 from SirCmpwn/line-endings
...
Fix .gitattributes
2016-10-14 23:19:45 +09:00
Drew DeVault
f27c0d9e91
Fix .gitattributes
...
This behavior should check out files in the native line ending depending
on your platform.
2016-10-14 10:13:33 -04:00
Drew DeVault
1dbf91eaaf
Add Visual Studio code meta files
2016-10-14 10:12:11 -04:00
Dean Herbert
56f914ba47
Make sure *.cs has CRLF line endings.
2016-10-14 23:08:53 +09:00
Dean Herbert
123d92f5b9
Merge pull request #71 from huoyaoyuan/tidy-up
...
Strongly type specifications
2016-10-14 18:57:42 +09:00
Huo Yaoyuan
cb54d33c6e
Make converter instance per-convert.
2016-10-14 17:48:07 +08:00
Dean Herbert
c3b745bfef
Merge pull request #57 from UselessToucan/VolumeControl
...
VolumeControl: add controls for Effects and Music
2016-10-14 15:50:45 +09:00
TocoToucan
ade925937a
Set text position using Origin property
2016-10-14 09:46:40 +03:00
Dean Herbert
6597b09a55
Merge pull request #79 from peppy/general-fixes
...
Update framework version.
2016-10-14 12:54:52 +09:00
Dean Herbert
cc9bc9db93
Update framework version.
2016-10-14 12:53:44 +09:00
