Commit Graph

278 Commits

Author SHA1 Message Date
317dc94b4c Adjust appearance. 2017-03-17 21:09:31 +09:00
f9f31ca092 Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
292de44a0b WIP menu cursor. 2017-03-17 20:45:27 +09:00
d7497330b2 Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09: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
9fd16be2d4 Refactor IsDebug 2017-03-06 19:59:29 +01:00
1e48b0a037 Ensure AssemblyName is never null (seems to be on CI server). 2017-03-06 19:00:15 +09:00
0ee38571a6 Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
95e2e2b027 Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
5ff4028c29 Make beatmap importing async. 2017-02-24 18:12:50 +09:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
da2bfe6d3c Framework updates. 2017-02-23 16:42:12 +09:00
4fc2cd227c Add CJK support via font Noto Medium. 2017-02-09 10:35:25 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
9b9ed32245 Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
ac7feafe9a Merge branch 'master' into login_fix 2017-01-28 11:24:08 +02:00
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
f5f545df62 Refactor OsuColour into injected instance class
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
acc50e3473 fixed wrong parameter for token 2016-12-24 10:16:22 +03:00
5fbc0e408b Remove unnesessary Username field check 2016-12-24 09:16:17 +03:00
7c96102229 When we have empty login, api.Token becames empty
So we can't sign in having Token without login
2016-12-22 16:09:42 +03:00
4817d4bf10 Stop using password field in .ini at all 2016-12-22 15:41:06 +03:00
b066a7d905 Stop saving password 2016-12-22 15:26:31 +03:00
1c79ebff9f Fix loggining on start even after logout and exit 2016-12-21 01:51:01 +03:00
c7de449713 Token fix
If "Save Password" is checked, Token will be saved
2016-12-21 00:37:54 +03:00
f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
b81bf7085f Add missing licence headers and fixup using statements. 2016-12-03 13:56:35 +01:00
6ccce88a0e Add proper user data retrieval on connect. 2016-12-01 16:44:24 +09:00
01dc7cb5c2 Thread safety, username saving correctly etc. 2016-11-30 19:22:36 +09:00
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
fbf35c904d Fix Config regression with DI. 2016-11-29 18:49:03 +09:00
89effca12e Remove need for PlaySongSelect ctor to take a db 2016-11-25 00:44:46 -05:00
885df47864 Add simple implementation of HitExplosions. 2016-11-16 19:24:48 +09:00
2cbe2b34fd Change default font weight to Medium. 2016-11-15 19:34:50 +09:00
ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
2362665b8a Re-cache the new FontStore when overwritten
Fixes issues with font loading
2016-11-10 16:43:04 -05:00
fe9034323b Get the game running, though not perfectly 2016-11-10 16:42:29 -05:00
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
19fd6fe249 Introduce dependency injection 2016-11-10 16:38:25 -05:00
788c11de10 Merge pull request #103 from huoyaoyuan/music-controller
Music controller
2016-11-10 12:54:56 +09:00
d70e8806b4 Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes 2016-11-09 11:41:36 +09:00
4426a683ed Move OptionsOverlay to OsuGame. 2016-11-08 19:26:12 +09:00
3b0114671e Max sidebar draggable. 2016-11-08 19:16:39 +09:00
30323876a8 Use preload for options (fix icons). 2016-11-08 18:49:20 +09:00
a61fb5ef5d Initial updates to make generic containers work. 2016-11-07 21:13:56 +09:00
c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00