Commit Graph

143 Commits

Author SHA1 Message Date
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
2017-07-13 15:11:33 +09:00
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
96189fa749 Fix crash on startup for release builds 2017-07-08 16:16:49 +09:00
5602f04611 CI fix 2017-06-27 04:23:58 +03:00
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03:00
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
fbd26a1d5e Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
a4e2f34ee7 Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
ce12cc20bd Merge remote-tracking branch 'upstream/master' into remove-playmode 2017-04-17 13:00:53 +09:00
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
c0338a82e7 Update nuget packages.
Includes fix in OpenTK for focus issues.
2017-04-12 19:35:16 +09:00
7d7bea7198 Fix crash on restart after update.
Also make update process more graceful.
2017-04-11 18:40:39 +09:00
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
15db37d9e0 Cleanup. 2017-04-03 20:27:25 +09:00
19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
e57de373a8 Add opentk to osu.Desktop's packages. 2017-03-31 09:02:55 +09:00
5393525e3c Fix OpenTK hint on project file 2017-03-24 18:29:19 -03:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
0ec166f701 Remove broken dependency. 2017-03-15 21:50:28 +09:00
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
e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08:00
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
d7497330b2 Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
da751804b6 Reduce error count. 2017-03-09 14:24:16 +09:00
dc5ac6e88f Add missing access modifiers. 2017-03-09 13:55:29 +09:00
1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
5a42035f88 Update license headers. 2017-03-08 15:50:52 +09:00
309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
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
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
9106c45858 Fix remaining errors. 2017-03-07 10:42:59 +09:00
fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
0ee38571a6 Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
ff51af94ec Fail on drag drop operations with mixed files. 2017-03-06 15:03:58 +09:00
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
65699eb39d Fix missing .config files from nuspec.
These are required to correctly redirect dll dependencies.
2017-03-05 02:48:44 +09:00