h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 18:52:56 +08:00
Code Issues Releases Wiki Activity
30,947 Commits 3 Branches 657 Tags 361 MiB
9a09f97478
Commit Graph

1233 Commits

Author SHA1 Message Date
Welsar55
dbb1369eaf Use resources build 627 2019-06-29 11:54:02 -05:00
Dean Herbert
c2f82f86d6 Update framework 2019-06-28 18:14:08 +09:00
Dean Herbert
fe290ead63 Update framework 2019-06-25 18:38:11 +09:00
KingLuigi4932
13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Dean Herbert
d7bea3aa18 Update framework 2019-06-15 19:38:05 +09:00
Dean Herbert
0ca33e16dd Update framework 2019-06-14 23:25:29 +09:00
Dean Herbert
6a34d5575b Bump framework version 2019-06-11 20:44:11 +09:00
Dean Herbert
261badc770 Update framework 2019-06-11 19:24:54 +09:00
Dean Herbert
a5007b94db Update resources 2019-06-09 22:31:02 +09:00
Dean Herbert
cd4648a647 Update framework 2019-06-07 21:09:59 +09:00
smoogipoo
6bf6e22149 Update framework 2019-06-06 20:33:03 +09:00
smoogipoo
474191fcec Update framework 2019-06-04 11:13:21 +09:00
Dean Herbert
23b5d30360 Remove csproj changes 2019-05-28 17:10:46 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dean Herbert
9c6fbebb67 Update framework 2019-05-23 17:55:18 +09:00
Dean Herbert
236b8cec27 Update framework 2019-05-21 15:31:36 +09:00
Dean Herbert
5e499cf55d Update resources 2019-05-18 12:45:06 +09:00
Dean Herbert
98189b2b87
Merge branch 'master' into update-framework 2019-05-18 12:10:37 +09:00
Dean Herbert
9106200c65 Bump framework version 2019-05-18 12:08:22 +09:00
Roman Kapustin
a538c94fed Update NuGet packages 2019-05-17 21:40:46 +03:00
smoogipoo
ccbf3ff812 Update framework 2019-05-17 22:35:23 +09:00
Dean Herbert
f2e5beec11 Update framework 2019-05-14 18:35:35 +09:00
Dean Herbert
83663467ce Update dependencies 2019-05-08 21:08:46 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Dean Herbert
015b5cecb5 Update framework 2019-05-02 12:53:59 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
Dean Herbert
41d0b00120 Update framework 2019-04-27 16:43:23 +09:00
David Zhao
9ce7d0416b
Fix framework version 2019-04-25 23:16:08 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dean Herbert
8dc7fd8223 Update framework 2019-04-25 12:16:12 +09:00
Dean Herbert
1f18c08cfc Update framework 2019-04-22 19:17:58 +09:00
Dean Herbert
732c38fa79 Update framework again 2019-04-22 10:45:56 +09:00
Dean Herbert
9d6912a692 Update framework 2019-04-18 21:23:40 +08:00
Dean Herbert
d1799d197d Update resources and mods usage 2019-04-18 09:27:30 +08:00
Dean Herbert
b684cd49e6 Update framework 2019-04-16 22:51:57 +08:00
Dean Herbert
a34a511f22 Update framework 2019-04-05 14:55:25 +09:00
Dean Herbert
072954e4c0 Update framework 2019-04-02 21:00:05 +09:00
Dean Herbert
22519ddacc Update framework 2019-03-30 12:45:09 +09:00
Dean Herbert
bca8714905 Update framework 2019-03-28 23:25:31 +09:00
Dean Herbert
97675f6495 Update framework 2019-03-23 00:55:31 +09:00
Dean Herbert
d6f17a5ecd Bring nuget packages up to date 2019-03-22 02:41:21 +09:00
Dean Herbert
c555019692 Update framework 2019-03-20 22:50:50 +09:00
Dean Herbert
def15645f7 Update framework 2019-03-19 17:32:36 +09:00
Dean Herbert
8c6caf0b18 Update framework 2019-03-16 01:38:42 +09:00
Dean Herbert
108dcd0a92 Update framework 2019-03-13 21:58:50 +09:00
Dean Herbert
10734b774c Update framework 2019-03-08 20:48:50 +09:00
Dean Herbert
27edc41c11 Update framework 2019-03-07 20:14:43 +09:00
Dean Herbert
7f1f812f29 Update framework 2019-03-01 22:06:42 +09:00
Dean Herbert
48fcaf34e6 Update framework 2019-02-28 18:49:59 +09:00
Dean Herbert
42442edf5a Update framework 2019-02-27 22:41:46 +09:00
Dean Herbert
69b9de5acd Update framework 2019-02-23 21:13:53 +09:00
Dean Herbert
8f53af1c71 Update framework 2019-02-22 11:32:14 +09:00
Dean Herbert
b1337ed07f Update framework 2019-02-20 16:09:29 +09:00
Dean Herbert
c607b8c979 Update framework 2019-02-15 21:28:59 +09:00
Dean Herbert
cf66fc6924 Update framework 2019-02-14 13:29:07 +09:00
Dean Herbert
a28689ff4c Update framework 2019-02-12 17:58:36 +09:00
Dean Herbert
e8aed6b686 Update framework 2019-02-08 17:38:18 +09:00
smoogipoo
b5cc0ec8db Update framework 2019-02-08 15:44:11 +09:00
Dean Herbert
09056fd0d8
Merge branch 'master' into resources-via-nuget 2019-01-31 18:40:45 +09:00
Dean Herbert
aac921c298 Update framework again 2019-01-31 13:33:21 +09:00
smoogipoo
a8a34f8f20 Update framework 2019-01-30 23:56:14 +09:00
Dean Herbert
628b3e1119 Move osu-resources to nuget 2019-01-28 18:33:39 +09:00
Dean Herbert
144533706e Update framework 2019-01-25 18:51:29 +09:00
Dean Herbert
828b9451e5 Update framework 2019-01-22 16:48:32 +09:00
Dean Herbert
b904bd9e8f Update framework 2019-01-17 22:13:41 +09:00
Dean Herbert
5ff58870b8 Update framework 2019-01-16 19:05:46 +09:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Dean Herbert
c1656a7608 Update framework 2019-01-10 21:22:42 +09:00
Dean Herbert
415df52c69 Update framework 2019-01-08 21:26:24 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Dean Herbert
edfb027ff2 Update framework 2018-12-26 18:49:33 +09:00
Dean Herbert
59452800ed Update framework 2018-12-21 13:33:06 +09:00
Dean Herbert
8d458b0b6e Update framework version 2018-12-19 19:45:50 +09:00
Dean Herbert
64626f62db Update framework 2018-12-14 19:02:25 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dean Herbert
14d9f1d8bb Fix hard crash due to out-of-order chat sequencing 2018-12-03 18:13:10 +09:00
Dean Herbert
7543af07dd
Remove weird reference 2018-11-30 14:30:50 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
smoogipoo
2a41c38294 Update package 2018-11-20 17:30:03 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
caaa5645e3 Correct framework version 2018-11-14 21:16:08 +09:00
smoogipoo
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00
Dean Herbert
1101e161d9 Update framework and resources 2018-11-12 17:02:46 +09:00
Dean Herbert
4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +09:00
FreezyLemon
56ff2686ac Update osu-resources and osu-framework to use binary fonts 2018-11-03 18:09:11 +01:00
Dean Herbert
e6ee3dc73e Use framework helper functions for path approximation 2018-11-02 19:26:29 +09:00
Dean Herbert
0b534885b8 Update framework 2018-10-30 00:10:34 -07:00
smoogipoo
dd5a3ad59c Fix SliderMask not working 2018-10-29 15:17:45 +09:00
Dean Herbert
ae94aab677 Update framework 2018-10-18 21:04:29 +09:00
Dean Herbert
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
Dean Herbert
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
Dean Herbert
c52a292935 Update framework 2018-10-12 16:10:32 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dean Herbert
9baf587246 Bump framework again 2018-09-28 18:25:40 +09:00
Dean Herbert
1b77d9fd05 Merge branch 'update-chat-api' into update-framework 2018-09-26 19:50:23 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760 Update chat to work with new API version 2018-09-25 20:53:24 +09:00
Dean Herbert
5ee4130351 Update framework reference 2018-09-20 18:39:44 +09:00
Dean Herbert
6a1e2c6fa5 Update efcore packages 2018-09-15 18:49:01 +09:00
smoogipoo
067bc39185 Update nuget package 2018-09-13 12:47:26 +09:00
Dean Herbert
144779c698 Update framework 2018-09-11 00:30:13 +09:00
Dean Herbert
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
Dean Herbert
1327aed164 Update framework again 2018-09-06 19:23:19 +09:00
Dean Herbert
da906c0ddf Update framework 2018-09-06 18:03:27 +09:00
Dean Herbert
62a8245f11 Update framework 2018-09-01 10:59:04 +09:00
Dean Herbert
4c72565936 Update framework 2018-08-31 19:20:10 +09:00
Dean Herbert
3276f0f54d Update ef/sqlite version 2018-08-30 14:58:00 +09:00
Dean Herbert
9fb78852de Update framework 2018-08-30 14:58:00 +09:00
smoogipoo
da2f04c79c Update framework once more 2018-08-28 21:06:32 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
59d6ccbaab Update framework 2018-08-24 15:27:13 +09:00
Dean Herbert
c97548804e Update framework 2018-08-21 18:46:44 +09:00
Dean Herbert
7add4a8cc7 Update framework 2018-08-20 18:26:34 +09:00
Dean Herbert
6b0ed4a68d Update framework 2018-08-20 13:37:59 +09:00
Dean Herbert
9fc0a75b71
Merge branch 'master' into sentry-logging 2018-08-16 13:33:24 +09:00
smoogipoo
add78508e0 Update framework 2018-08-15 15:54:26 +09:00
smoogipoo
4dfb63023f Update with recent changes 2018-08-15 15:49:48 +09:00
Dean Herbert
7233e863db Update framework 2018-08-07 01:07:50 +09:00
Dean Herbert
8d98826f69 Update framework 2018-08-03 21:17:17 +09:00
Dean Herbert
2ea90ef98a Add sentry logging 2018-08-03 19:25:55 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
4224d35a75 Use forked squirrel 
Allows for updating SharpCompress, too.
 2018-08-01 16:56:36 +09:00
Shane Woolcock
4fdca2b198 Update framework 2018-07-31 21:21:26 +09:30
Dean Herbert
f57ba4ffb1 Update framework 2018-07-30 14:14:16 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
6bcc8d1cbc Update framework 2018-07-12 19:56:41 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert
2150cb1028 Update framework and other packages 2018-07-10 20:31:04 +09:00
Dean Herbert
abfebbddd9 Update framework 2018-07-09 23:50:45 +09:00
Dean Herbert
7e28a993f7 Update framework 2018-07-05 21:08:53 +09:00
Dean Herbert
cd47bd2cf8 Update framework 2018-06-29 21:06:43 +09:00
Dean Herbert
8742f41b7d Revert SharpCompress library to fix delta patching regression 2018-06-29 11:34:52 +09:00
Dean Herbert
563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
3819ecb2be Update framework 2018-06-19 20:19:52 +09:00
Dean Herbert
8092d70402 Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework 2018-06-11 20:17:33 +09:00
Dean Herbert
fd4f61fc88 Update framework and other packages 2018-06-08 21:51:43 +09:00
rootyElf
b3cab35a2c
Update EntityFramework libraries 
Updated Microsoft.EntityFrameworkCore.Sqlite and Microsoft.EntityFrameworkCore.Sqlite.Core to 2.1.0 to enable the app to run on arm linux platforms. This also updates SQLitePCLRaw.lib.e_sqlite3.linux from 1.1.7 to  1.1.11. While 1.1.7 only provides native libraries for linux-x64 and linux-x86, 1.1.11 adds alpine-x64, linux-arm, linux-arm64, linux-armel and linux-musl-x64.
 2018-06-07 15:46:31 +01:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert
00b4a2519f Update framework 2018-06-06 21:22:22 +09:00
Dean Herbert
601ef3b6f7 Consume osu.Framework via nuget 2018-06-05 14:14:56 +09:00
Dean Herbert
d4e7f08c20 Bring entity framework up-to-date and re-enable transactions 2018-05-29 16:23:27 +09:00
FreezyLemon
4b3a129738 bump NUnit to version 3.10.1 2018-04-13 13:19:52 +02:00
Dean Herbert
9aae568bbe Tidy up csproj further 2018-03-28 15:19:56 +09:00
Dean Herbert
1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
Dean Herbert
988141408f Update copyright year 2018-03-27 15:26:15 +09:00
Dean Herbert
b290d2d039 Move NUnit includes to individual projects 2018-03-27 15:07:09 +09:00
smoogipoo
dd5bbbbd9f Define testable projects 2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6 Only compile with net461 in visual studio 2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498 Add msbuild/dotnet build + launch targets 2018-03-26 10:52:54 +09:00
smoogipoo
4dc317d4df Fix msbuild warnings 2018-03-25 03:38:52 +09:00
smoogipoo
d28de89e50 Add net461 target to test projects for nunit discovery 
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).
 2018-03-25 01:35:50 +09:00
smoogipoo
a30270658d Merge remote-tracking branch 'origin/master' into netstandard 2017-12-01 18:50:28 +09:00
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
Dean Herbert
880418fd0d Split out click and hover sound layers 2017-11-26 17:21:22 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
Dean Herbert
9565a9c352 Fix TestCasePlayer not working as expected 2017-11-23 20:42:07 +09:00
Dean Herbert
9d481eba96
Merge branch 'master' into kudosu-section 2017-11-23 17:19:42 +09:00
Dean Herbert
0f8499c580 Rename to PlaybackControl and add a TestCase 2017-11-22 11:22:46 +09:00
smoogipoo
0f8d4a455a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-21 19:18:06 +09:00
EVAST9919
10f730a004 Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-21 12:39:14 +03:00
smoogipoo
238756ec5d Merge remote-tracking branch 'origin/master' into editor-playback-speed 2017-11-21 17:41:16 +09:00
Dan Balasescu
142b74cc47
Merge branch 'master' into sudden-death 2017-11-21 17:32:31 +09:00
smoogipoo
a66edea6dc Move sqlite batteries to osu.Desktop 
Fixes e_sqlite.dll not being copied to output on Windows
 2017-11-21 15:33:05 +09:00
Brayzure
da30d76f9b Implement Score Processor Mod Interface 
- Add a delegate whenever we want to register an additional fail condition
 2017-11-20 02:15:29 -05:00
smoogipoo
756f6f2d16 Remove net461 targets 2017-11-20 10:10:28 +09:00
Dean Herbert
492120e88c Add migration for unique constraint on online id 2017-11-19 16:02:08 +09:00
smoogipoo
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09:00
EVAST9919
87f1368869 Add KudosuInfo container in the kudosu section 2017-11-18 18:19:35 +03:00
EVAST9919
d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
smoogipoo
1e023f0419 Implement PerformanceCalculator testcase 2017-11-17 14:37:19 +09:00
smoogipoo
38fe95d94a Add basic display for pp in TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
smoogipoo
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
EVAST9919
d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert
46ad986301
Merge branch 'master' into profile-beatmaps-section 2017-11-13 20:02:40 +09:00
EVAST9919
072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
EVAST9919
3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
EVAST9919
c9353e3795 Fix humanizer package path 2017-11-09 15:49:17 +03:00
Dean Herbert
5547348d07
Merge branch 'master' into profile-beatmaps-section 2017-11-09 18:31:46 +09:00
EVAST9919
a46dbee532 Add Humanizer package 2017-11-07 12:38:10 +03:00
EVAST9919
761d885167 Add Favourite Beatmaps section in UserProfileOverlay 2017-11-03 20:25:21 +03:00
Dean Herbert
d6c86ebcb1 Merge branch 'master' into intro 2017-11-01 15:38:14 +09:00
Dean Herbert
8138796ee3 Fix VisualTests configuration being completely wrong 2017-11-01 14:53:33 +09:00
Dean Herbert
ca8afc0c80 Merge remote-tracking branch 'upstream/master' into intro 2017-10-31 15:49:28 +09:00
Dean Herbert
069f4b1fcf Make DrawableScore abstract and move shared class to own file 2017-10-30 19:15:19 +09:00
Dean Herbert
b660366d96 ScoreContainer -> PaginatedScoreContainer 2017-10-30 19:06:40 +09:00
Dean Herbert
dce7d1c910 Move pp score representation to own file 2017-10-30 19:05:13 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores 2017-10-30 18:48:26 +09:00
EVAST9919
08637253df Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-26 15:04:44 +03:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
DerpyCrabs
de10300675 Fix case-sensitive linux build 2017-10-26 10:44:38 +07:00
Dean Herbert
ead3ca1f27 Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:42:08 +09:00
Dean Herbert
8452e315f4 Allow "refreshing" instances via DatabaseBackedStore 2017-10-25 22:06:25 +09:00
Dean Herbert
487b888f4f Add missing database indices 
Also add missing unique constraints where applicable.
 2017-10-25 22:05:10 +09:00
Jorolf
9109b1b3f1 Merge branch 'master' of git://github.com/ppy/osu into recent-scores 2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73 show recent scores 2017-10-24 20:31:38 +02:00
Dean Herbert
ffe94ea880 Merge branch 'master' into revert-to-default-glow 2017-10-24 08:14:53 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project 
This allows tests to successfully retrieve rulesets, as they are referenced.
 2017-10-23 19:32:02 +09:00
Dean Herbert
1b455019a8 Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-23 11:56:17 +09:00
Nabile Rahmani
5af6fb41f5 Fixed .NET Standard build on Linux. 2017-10-23 02:03:46 +02:00
DerpyCrabs
cf468d6708 Fix linux build 
Build is failing on linux because of case sensitive file system. This change fixes it.
 2017-10-22 20:14:38 +07:00
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Dean Herbert
908c6d827f ValueTuple please 2017-10-19 14:49:23 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
71d614b813 FIx missing columns yet again 2017-10-18 21:57:54 +09:00
Dean Herbert
ac4b2797dc valuetuple nightmare 2017-10-18 20:07:25 +09:00
Dean Herbert
4e8019b313 Add some more missing indices 2017-10-17 19:59:22 +09:00
Dean Herbert
b9d0fb96ed Fix cascade deletions 2017-10-17 18:26:28 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00
Dean Herbert
ef10bb73db osu.Game csproj fixes 2017-10-17 10:31:54 +09:00
Dean Herbert
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
Dean Herbert
e378d0685d Remove weird additions 2017-10-16 20:37:10 +09:00
Dean Herbert
1a16784db9 Add BindingRedirects rule to fix dependency when running via nunit 
See https://github.com/ErikEJ/EntityFramework.SqlServerCompact/issues/463
 2017-10-16 14:18:01 +09:00
Dean Herbert
a5ccf12e4a Fix ValueTuple mess 2017-10-16 14:04:04 +09:00
Dean Herbert
29b46a5c5e Add missing reference to System.ValueTuple 2017-10-16 13:23:41 +09:00
Dean Herbert
8a0b184dd6 Revert "Return back DatabaseBackedStore's query and populate functions" 
This reverts commit 7cf5d63cd3.
 2017-10-16 12:59:59 +09:00
Dean Herbert
04e5f764a3 Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects" 2017-10-16 12:59:59 +09:00
TocoToucan
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03:00
TocoToucan
7cf5d63cd3 Return back DatabaseBackedStore's query and populate functions 2017-10-15 00:40:41 +03:00
EVAST9919
e3ce641ea0 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-15 00:15:25 +03:00
EVAST9919
f4428980a6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-15 00:10:15 +03:00
smoogipoo
9924f518b7 Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/BeatmapMetadata.cs
#	osu.Game/osu.Game.csproj
#	osu.Game/packages.config
 2017-10-14 16:36:37 +09:00
Dean Herbert
179542daf1 Standardise AssemblyInfos 2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project 
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
 2017-10-14 14:33:05 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
smoogipoo
b83d7cd4df Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore 
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
 2017-10-14 12:38:59 +09:00
EVAST9919
6711331f66 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-14 05:18:03 +03:00
EVAST9919
bdcc70e0bb Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-14 05:06:36 +03:00
Dean Herbert
7550b461e3 Add individual beatmap set lookup request 2017-10-13 19:57:59 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
f9a1240325 Merge remote-tracking branch 'upstream/master' into direct-previews 2017-10-13 14:06:46 +09:00
Dean Herbert
d98f1a2bb7 Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline 2017-10-12 21:48:08 +09:00
Dean Herbert
182bb71eb0 Merge branch 'master' into editor-waveform 2017-10-12 20:49:48 +09:00
Dean Herbert
70c55b23f4 Remove references to CodeAnalysisRulesets 
Having these produce warnings under certain compile environments.
 2017-10-12 20:37:20 +09:00
smoogipoo
622659336d Merge + update framework 2017-10-12 17:02:39 +09:00
Thomas Müller
78f2037d84 Remove now obsolete RatioAdjust 2017-10-12 09:42:06 +02:00
smoogipoo
de8f9325a3 Implement TimelineButton and use for the magnification buttons 2017-10-12 16:10:33 +09:00
smoogipoo
df6409308a Merge remote-tracking branch 'origin/master' into editor-waveform-timeline 
# Conflicts:
#	osu-framework
 2017-10-12 15:32:11 +09:00
EVAST9919
57a9116355 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-12 06:41:06 +03:00
TocoToucan
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00