RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,345 Commits 3 Branches 659 Tags 364 MiB
Commit Graph

60 Commits

Author SHA1 Message Date
Dean Herbert 292bd22f92 Allow multiple instances of osu! when running under debug 2019-07-23 13:38:05 +09:00
Dean Herbert 7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert 612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools 
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
 2019-02-02 19:09:48 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert 9c5eddea54 Allow running tournament tools from main executable 2018-11-06 14:49:09 +09:00
smoogipoo da13266ae9 Fix missed string interpolation 2018-08-21 09:17:44 +09:00
Dean Herbert 583e026906 Don’t suppress unhandled exceptions in debug builds 2018-08-17 13:28:35 +09:00
Dean Herbert 83dc01d07c Fix multiple sentry reports arriving for similar exceptions 2018-08-17 12:05:21 +09:00
Dean Herbert 562a31713e Fix regression in handling logic 2018-08-16 16:44:04 +09:00
Dean Herbert 2ea90ef98a Add sentry logging 2018-08-03 19:25:55 +09:00
Dean Herbert 854beaab5f Remove only remaining .NET desktop code 2018-08-01 02:58:49 +09:00
Dean Herbert 2150cb1028 Update framework and other packages 2018-07-10 20:31:04 +09:00
Dean Herbert 1d6609d9f3 Add common custom words to dotsettings dictionary 
Also fixes some typos and reduces spelling suggestions to hints.
 2018-07-05 15:54:41 +09:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert 94b1d3e4af Make VisualTests/nUnit work again 2018-03-28 12:33:01 +09:00
smoogipoo 5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo ffa712dccb Fix post-merge issues 2018-03-24 15:19:45 +09:00
smoogipoo c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert db9b5ebaca Reduce complexity of code 2018-02-27 22:26:54 +09:00
TocoToucan 89bac13bf2 Fix profiles folder path 2018-02-27 22:06:32 +09:00
TocoToucan 714d7b4477 Do not use Multicore JIT on Mono 2018-02-27 22:06:32 +09:00
TocoToucan ed99f26699 Use Multicore JIT 2018-02-27 22:06:32 +09:00
Dean Herbert e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
smoogipoo b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Aergwyn ae1adfd2f2 remove unnecessary empty lines 
codefactor.io \(o.o)/
also one unnecessary semicolon
 2018-01-12 19:30:34 +01:00
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +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
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
Dean Herbert 6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert 7e89b1021d FirstOrDefault 2017-08-04 15:58:59 +09:00
Dean Herbert f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Dean Herbert 898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
smoogipooo 59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert aa9d85624d
Change IPC to make sense. 2017-03-04 18:51:16 +09:00
Dean Herbert 686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Thomas Müller 2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Dean Herbert da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert 50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
default0 299c4923c3 Implement Beatmap Import via drag&drop 2017-02-05 13:32:08 +01:00
Drew DeVault 0861eb79e4 Minor cleanups 2017-01-31 19:55:36 -05:00
Drew DeVault 66d104394f Add comments around cwd handling 2017-01-30 09:36:26 -05:00
Drew DeVault 46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00
Huo Yaoyuan 95600f872d Expression body and spacing. 2016-11-16 10:53:10 +08:00
Huo Yaoyuan 53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Huo Yaoyuan 97005e033c cctor->Register 2016-11-15 02:08:02 +08:00
Dean Herbert d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Drew DeVault 1bca78f4b6 Wire up one of the settings to the config 
One step at a time, right
 2016-11-07 22:36:24 -05:00
Drew DeVault 063fdd9a2d Add test data to db for VisualTests 
Also fixes the broken IPC condition
 2016-10-24 14:57:00 -04:00