1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 11:27:24 +08:00
Commit Graph

95 Commits

Author SHA1 Message Date
Dean Herbert
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
Dean Herbert
65699eb39d
Fix missing .config files from nuspec.
These are required to correctly redirect dll dependencies.
2017-03-05 02:48:44 +09:00
Dean Herbert
95e2e2b027
Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
aa9d85624d
Change IPC to make sense. 2017-03-04 18:51:16 +09:00
Dean Herbert
b294386077
Remove misleading beatmap import method. 2017-03-04 16:47:37 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
Dean Herbert
9a323226e3
Log errors with updating. 2017-03-03 18:09:38 +09:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
Dean Herbert
b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
default0
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Andrey Zavadskiy
9444ffd849 Removed redundant qualifiers 2017-02-27 17:37:38 +03:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Dean Herbert
5ff4028c29
Make beatmap importing async. 2017-02-24 18:12:50 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
74ea5e7343 Fix updates downloading in non-deploy builds. 2017-02-23 00:41:04 +09:00
Dean Herbert
b744f3a3a7
Re-nest code and handle even more potential exceptions. 2017-02-21 14:15:46 +09:00
Dean Herbert
461a22bccb
Add resiliency to update process when delta patching fails. 2017-02-21 13:52:52 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert
bc032aa0a6
Catch http errors in full update process (could happen during downloads too). 2017-02-21 12:58:56 +09:00
Andrey Zavadskiy
3106c52098 Removed unnecessary references 2017-02-19 13:25:41 +03:00
Andrey Zavadskiy
f028188398 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-18 13:47:45 +03:00
Andrey Zavadskiy
e803564b5a Added the specific exception 2017-02-18 13:46:47 +03:00
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing. 2017-02-18 14:16:46 +09:00
Andrey Zavadskiy
2f4855b00f Added exception 2017-02-17 21:07:59 +03:00
Dean Herbert
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Dean Herbert
25e7a08cca
Reset local version and explicitly show release/debug builds. 2017-02-15 13:41:12 +09:00
Dean Herbert
ba7b61521f Merge pull request #354 from peppy/builder
Deploy automation
2017-02-15 01:28:05 +09:00
Dean Herbert
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
bad501c018 Merge branch 'master' into builder 2017-02-14 08:35:38 +09:00
Dean Herbert
5c6e895644 Exclude vshost executables from packages. 2017-02-13 21:33:48 +09:00
Dean Herbert
d73c48c73d
Only show first three segments of version (ignore revision number). 2017-02-13 20:23:47 +09:00
Dean Herbert
85e85d32fc
Add dev build footer. 2017-02-13 20:06:51 +09:00
Dean Herbert
f52e9ddb05
Fix escape key being unnecessarily handled by VersionManager. 2017-02-13 19:08:59 +09:00
Dean Herbert
11643d2e09
Remove unnecessary methods and local variables. 2017-02-13 18:30:51 +09:00
Dean Herbert
1aeb48b920
Merge remote-tracking branch 'upstream/master' into osb_loading 2017-02-13 18:22:29 +09:00
Dean Herbert
a073b1db0d very simple build automation. 2017-02-13 01:02:44 +09:00
Dean Herbert
0ff054f887 Bump version. 2017-02-12 20:30:35 +09:00
Thomas Müller
e3f35cd66e Merge branch 'master' into osb_loading 2017-02-12 12:26:25 +01:00
Dean Herbert
01e774b1ec Don't attempt to install/update on a non-installed version for now. 2017-02-12 20:25:42 +09:00
Dean Herbert
874af48de6 Merge remote-tracking branch 'upstream/master' into installer-updater 2017-02-12 17:18:04 +09:00