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

118 Commits

Author SHA1 Message Date
Dean Herbert 54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
smoogipooo d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert 6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
Dean Herbert 0ec166f701
Remove broken dependency. 2017-03-15 21:50:28 +09:00
Dean Herbert ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader" 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
 2017-03-14 11:46:34 +09:00
Huo Yaoyuan e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08:00
Huo Yaoyuan db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
Alex Amadori c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
Alex Amadori caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
Alex Amadori 7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Alex Amadori 1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
Dean Herbert 5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Alex Amadori 309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert 4430255ec4
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
 2017-03-07 13:50:08 +09:00
Dean Herbert 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert 9106c45858
Fix remaining errors. 2017-03-07 10:42:59 +09:00
Alex Amadori fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
Dean Herbert 0ee38571a6
Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
Dean Herbert ff51af94ec
Fail on drag drop operations with mixed files. 2017-03-06 15:03:58 +09:00
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