Andrey Zavadskiy
|
e06b3ecf2d
|
Input fix
|
2017-02-27 18:18:12 +03:00 |
|
Andrey Zavadskiy
|
9444ffd849
|
Removed redundant qualifiers
|
2017-02-27 17:37:38 +03:00 |
|
Dean Herbert
|
27d31d1d30
|
Merge remote-tracking branch 'upstream/master' into better-container
|
2017-02-26 11:23:06 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
5ff4028c29
|
Make beatmap importing async.
|
2017-02-24 18:12:50 +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
|
bf33cc6f53
|
Make disclaimer actually be a thing.
|
2017-02-18 14:16:46 +09: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
|
366e95dd4f
|
Remove outdated comment.
|
2017-02-17 17:33:41 +09:00 |
|
Dean Herbert
|
9e8b4d43dd
|
Improve exit procedure.
|
2017-02-17 17:25:28 +09:00 |
|
Dean Herbert
|
753232533a
|
Display Important/Error logging in notifications for now.
|
2017-02-15 12:37:57 +09:00 |
|
Dean Herbert
|
870aa2750f
|
Don't attempt to import command line arguments as beatmaps.
|
2017-02-12 14:53:33 +09:00 |
|
Dean Herbert
|
8ec927899f
|
Implement notifications.
|
2017-02-10 16:30:23 +09:00 |
|
Dean Herbert
|
2e119cd74f
|
Handle toolbar offsets better.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
3cee23fc00
|
Toggle toolbar with Ctrl-T.
|
2017-02-08 20:30:45 +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 |
|
Dean Herbert
|
64f4098791
|
Move MusicController beneath Toolbar.
|
2017-01-31 17:05:54 +09:00 |
|
Dean Herbert
|
74366c620b
|
Move login screen to toolbar and update design (still not fully implemented).
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
# osu.Game/Overlays/Toolbar/Toolbar.cs
|
2017-01-30 22:55:35 +09:00 |
|
Dean Herbert
|
cbd6fe3f36
|
Move definition of MusicController's position out of itself.
|
2017-01-30 22:54:33 +09:00 |
|
Dean Herbert
|
1853bbdda8
|
Move window/volume configuration to framework level.
|
2017-01-25 18:44:51 +09:00 |
|
Dean Herbert
|
ae464fcace
|
Move Intro logic to OnEntering in line with framework changes.
|
2017-01-20 16:30:24 +08:00 |
|
Dean Herbert
|
4d27101aca
|
Add ability to adjust game clock's speed (pgup/pgdn).
A bit hacky, probably need to expose rate better.
|
2016-12-05 19:33:38 +09:00 |
|
Dean Herbert
|
9bf36418a0
|
Make toolbar buttons more independent logic-wise.
Also adds visual toggle state for toggleable buttons.
|
2016-12-02 18:43:01 +09:00 |
|
Dean Herbert
|
167b559a95
|
Move toolbar to own namespace.
|
2016-12-01 14:22:29 +09:00 |
|
Dean Herbert
|
c6b7e90739
|
Merge branch 'refs/heads/master' into online-improvements
|
2016-12-01 12:51:45 +09:00 |
|
Dean Herbert
|
18509e6a60
|
ChatConsole -> ChatOverlay. Namespace tidying.
|
2016-11-30 18:30:06 +09:00 |
|
Dean Herbert
|
481b9d3208
|
Make opening options shift the rest of the screen as per design.
|
2016-11-30 18:28:18 +09:00 |
|
Thomas Müller
|
b12b82fdd3
|
Fix depth values.
|
2016-11-29 20:50:12 +01:00 |
|
Drew DeVault
|
69cb9cf4de
|
Fix up volume encapsulation
|
2016-11-25 00:21:42 -05:00 |
|
Dean Herbert
|
d846246ef2
|
ShowToolbar -> ShowOverlays; include MusicController.
|
2016-11-15 20:55:57 +09:00 |
|
Dean Herbert
|
2af839cdbd
|
Render musicController above toolbar.
|
2016-11-15 20:55:55 +09:00 |
|
Dean Herbert
|
867797a089
|
Change volume control mouse wheel behaviour to not gain full-screen focus.
|
2016-11-15 15:22:14 +09:00 |
|
Dean Herbert
|
06f4f93918
|
Move play modes to Modes namespace.
|
2016-11-14 18:03:20 +09:00 |
|
Dean Herbert
|
0f4538f69f
|
Rename GameModes namespace to Screens.
|
2016-11-14 17:23:33 +09:00 |
|
Dean Herbert
|
1d51e6af2a
|
Merge pull request #168 from huoyaoyuan/fixes
Fixes for music controller
|
2016-11-14 16:11:31 +09:00 |
|
Huo Yaoyuan
|
33a35ca711
|
Do not set WorkingBeatmap explicitly in mode stack.
|
2016-11-14 04:01:48 +08:00 |
|
Thomas Müller
|
ac99e2d488
|
Avoid using load to construct the drawable hierarchy whereever possible.
|
2016-11-12 18:34:36 +01:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
a0e1513df6
|
Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence
# Conflicts:
# osu.Game/OsuGame.cs
|
2016-11-11 13:30:57 +09:00 |
|
Drew DeVault
|
0d4560a054
|
Update to latest DI stuff
|
2016-11-10 17:40:42 -05:00 |
|
Drew DeVault
|
ee24cd310c
|
Convert everything to DI pattern
|
2016-11-10 16:41:18 -05:00 |
|
Drew DeVault
|
19fd6fe249
|
Introduce dependency injection
|
2016-11-10 16:38:25 -05:00 |
|
Dean Herbert
|
788c11de10
|
Merge pull request #103 from huoyaoyuan/music-controller
Music controller
|
2016-11-10 12:54:56 +09:00 |
|
Dean Herbert
|
d9bd3717d0
|
Re-organise overlay-level elements in OsuGame.
|
2016-11-09 15:24:24 +09:00 |
|
Dean Herbert
|
fdb83bed79
|
Make OsuGameModes self-aware of if they want a toolbar or not.
|
2016-11-09 15:24:22 +09:00 |
|
Dean Herbert
|
97f3023cd9
|
Ctrl+O for options.
|
2016-11-08 19:27:37 +09:00 |
|
Dean Herbert
|
4426a683ed
|
Move OptionsOverlay to OsuGame.
|
2016-11-08 19:26:12 +09:00 |
|
Huo Yaoyuan
|
2d86cb1e81
|
Merge branch 'master'
|
2016-11-05 16:21:59 +08:00 |
|
Drew DeVault
|
89d3f4c2be
|
Import enum from old osu
|
2016-11-03 19:06:22 -04:00 |
|
Huo Yaoyuan
|
9e0fbed748
|
Use PreLoad on music controller.
|
2016-11-03 22:38:10 +08:00 |
|
Huo Yaoyuan
|
f2a8cc0c29
|
Merge branch 'master'
|
2016-11-03 20:38:34 +08:00 |
|
Dean Herbert
|
b86f308af6
|
Add async workflow.
|
2016-11-01 23:24:14 +09:00 |
|
Huo Yaoyuan
|
7543d491ae
|
Add music controller into game.
|
2016-10-28 21:21:47 +08:00 |
|
Dean Herbert
|
74f1a9622f
|
Add initial game-wide beatmap flow.
|
2016-10-28 19:55:48 +09:00 |
|
Dean Herbert
|
debea59bab
|
Merge pull request #61 from SirCmpwn/song-select
Song select
|
2016-10-27 13:54:34 +09:00 |
|
Dean Herbert
|
ee8b678989
|
Fix volume controls handling mouse wheel at a higher level than anything else game-wide.
|
2016-10-26 18:45:48 +09:00 |
|
Dean Herbert
|
d3a857edb9
|
Make importing work properly.
Moves import code to BeatmapDatabase.
|
2016-10-24 11:39:53 -04:00 |
|
Drew DeVault
|
8e31965fb4
|
Refactor beatmap import secondary process
Doesn't launch a new game window and now supports several files at once.
|
2016-10-24 11:39:18 -04:00 |
|
Dean Herbert
|
bd1a1644fd
|
Fix window size saving to config incorrectly.
|
2016-10-23 01:35:11 +09:00 |
|
Drew DeVault
|
768dd38fa0
|
s/AddBeatmap/ImportBeatmap/g
|
2016-10-18 15:42:07 -04:00 |
|
autismpp
|
7276038ca7
|
Replace Console.WriteLine with Logger.Log.
|
2016-10-15 06:13:50 +03:00 |
|
Dean Herbert
|
8c7ff58310
|
Fix regressions caused by overlay class.
|
2016-10-14 12:50:03 +09:00 |
|
Dean Herbert
|
b425d14ea1
|
Merge pull request #73 from huoyaoyuan/overlay
Overlay proposals
|
2016-10-14 10:49:13 +09:00 |
|
Huo Yaoyuan
|
254cc87578
|
Use name ToggleVisibility.
|
2016-10-14 05:02:13 +08:00 |
|
Huo Yaoyuan
|
1c97edaac2
|
Base class for overlays.
|
2016-10-13 23:04:57 +08:00 |
|
Huo Yaoyuan
|
c93a440d3b
|
Make Options:IStateful.
|
2016-10-13 22:27:37 +08:00 |
|
Huo Yaoyuan
|
acd54d1ebc
|
Single Visibility enum type.
|
2016-10-13 22:22:27 +08:00 |
|
Drew DeVault
|
fd10e6e582
|
Copy imported beatmaps into beatmap storage
|
2016-10-13 10:15:08 -04:00 |
|
Drew DeVault
|
ddac0e8c8f
|
Update osu-framework
|
2016-10-13 12:18:23 +09:00 |
|
Drew DeVault
|
45c0bc5428
|
Import beatmaps into the database via IPC
|
2016-10-13 12:18:17 +09:00 |
|
Drew DeVault
|
3a163de0f7
|
Follow changes to osu-framework
|
2016-10-13 12:18:10 +09:00 |
|
Drew DeVault
|
94f2898f52
|
Implement beatmap sending/receiving over IPC
|
2016-10-13 12:18:04 +09:00 |
|
Dean Herbert
|
aa96d98822
|
Merge branch 'master' into limit-game-access
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
osu.Game/GameModes/Menu/ButtonSystem.cs
osu.Game/Online/Chat/Display/ChatLine.cs
osu.Game/OsuGame.cs
osu.Game/Overlays/ToolbarButton.cs
|
2016-10-12 20:44:33 +09:00 |
|
Dean Herbert
|
4052a665bf
|
Remove all non-load Game access.
|
2016-10-12 15:47:08 +09:00 |
|
Dean Herbert
|
24771a62cf
|
Remove upwards reference.
|
2016-10-12 15:23:22 +09:00 |
|
Dean Herbert
|
79b62d4373
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
osu-framework
osu.Desktop.VisualTests/Program.cs
|
2016-10-12 15:20:23 +09:00 |
|
Thomas Müller
|
c62f29dcae
|
Merge branch 'master' of github.com:ppy/osu into general-improvements
|
2016-10-09 16:02:35 +02:00 |
|
Thomas Müller
|
934523e347
|
Update framework version.
|
2016-10-09 13:31:16 +02:00 |
|
Dean Herbert
|
9594b7193c
|
Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem
|
2016-10-08 23:27:46 +09:00 |
|
Dean Herbert
|
47faf8f40d
|
Add in-game chat display, along with a global hotkey handling method.
|
2016-10-08 19:23:21 +09:00 |
|
Dean Herbert
|
5ff3767038
|
Fix typo in comment.
|
2016-10-08 19:18:50 +09:00 |
|
Dean Herbert
|
556420ee58
|
Add proper toolbar state handling.
|
2016-10-08 15:54:09 +09:00 |
|
Dean Herbert
|
243d2cdec5
|
Block window closing while intro is playing.
|
2016-10-08 15:54:07 +09:00 |
|
Dean Herbert
|
c5228b63cb
|
Unify and smiplify exit logic. Now only OsuGame calls the final Exit.
|
2016-10-08 15:54:05 +09:00 |
|
Dean Herbert
|
a5adbc0615
|
Update namespace references.
|
2016-10-08 15:54:02 +09:00 |
|
Dean Herbert
|
bdb72d7b82
|
Add basic VolumeControl and saving of volume to config.
|
2016-10-08 15:54:00 +09:00 |
|
Dean Herbert
|
10468a566c
|
Add some comments about future usage.
|
2016-10-08 15:53:58 +09:00 |
|
Dean Herbert
|
d6042bd689
|
Add intro and begin to create central logic nest.
|
2016-10-08 15:53:56 +09:00 |
|
Dean Herbert
|
03aea04a00
|
Add BackgroundMode stack.
|
2016-10-05 20:06:55 +09:00 |
|
Dean Herbert
|
11403a922a
|
Make Home, Settings and PlayMode buttons work.
|
2016-10-04 17:15:03 +09:00 |
|
Dean Herbert
|
51cf13460f
|
Remove performance overlay.
|
2016-10-03 23:56:25 +09:00 |
|
Dean Herbert
|
ac16bffe49
|
Bring framework and resources up-to-date.
|
2016-10-01 19:05:26 +09:00 |
|
Dean Herbert
|
7db555be5d
|
Move toolbar to OsuGame.
|
2016-10-01 18:01:52 +09:00 |
|
Dean Herbert
|
f0681f35c4
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout
# Conflicts:
# osu.Game/OsuGame.cs
# osu.Game/OsuGameBase.cs
# osu.Game/osu.Game.csproj
|
2016-10-01 17:10:27 +09:00 |
|
Dean Herbert
|
b110a879a7
|
Merge branch 'refs/heads/master' into api-channels-messages
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2016-10-01 17:05:56 +09:00 |
|
Dean Herbert
|
cc14aeb802
|
Add basic background display system.
|
2016-09-30 18:45:55 +09:00 |
|
Dean Herbert
|
28045b7136
|
Add back basic API support for channel/message retrieval.
|
2016-09-27 18:33:52 +09:00 |
|
Dean Herbert
|
58ed5c00e4
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework
# Conflicts:
# osu.Game/GameModes/Menu/ButtonSystem.cs
# osu.Game/OsuGame.cs
|
2016-09-25 13:40:06 +09:00 |
|
Dean Herbert
|
7bdb2fcfc7
|
Add basic implementation of VisualTest framework for osu! project.
Comes with one complimentary test.
|
2016-09-24 15:47:17 +09:00 |
|
Dean Herbert
|
f936618156
|
Add back TextAwesome and osu!font.
|
2016-09-24 00:05:09 +09:00 |
|
Dean Herbert
|
e0c06a4f19
|
Merge branch 'refs/heads/general-fixes' into beatmap_framework
# Conflicts:
# osu-framework
# osu.Game/GameModes/FieldTest.cs
# osu.Game/GameModes/FontTest.cs
# osu.Game/GameModes/Menu/ButtonSystem.cs
# osu.Game/Graphics/UserInterface/TextBox.cs
# osu.Game/OsuGame.cs
# osu.Game/osu.Game.csproj
|
2016-09-20 16:36:42 +09:00 |
|
Dean Herbert
|
b2e7f290f2
|
Fix window size.
|
2016-09-20 16:26:07 +09:00 |
|
Remie Richards
|
320f76d860
|
Fixes over-scaling, Brings osu! logo back to the front
|
2016-09-19 01:35:50 +01:00 |
|
Remie Richards
|
314b0dfc04
|
Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency
|
2016-09-18 20:41:53 +01:00 |
|
Remie Richards
|
4732a4db19
|
An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end.
|
2016-09-18 16:42:59 +01:00 |
|
Remie Richards
|
f2fa9f611a
|
Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs
|
2016-09-17 22:11:27 +01:00 |
|
Dean Herbert
|
4a85d8627d
|
Update to latest framework version.
|
2016-09-11 03:04:47 +09:00 |
|
Dean Herbert
|
b6bbea392b
|
Merge branch 'general-fixes' into beatmap_framework
Conflicts:
osu-framework
|
2016-09-11 02:24:15 +09:00 |
|
Dean Herbert
|
842fb1892f
|
Update to latest framework version.
|
2016-09-11 02:23:26 +09:00 |
|
Dean Herbert
|
016521240a
|
Add playtest class.
|
2016-09-06 21:41:16 +09:00 |
|
Dean Herbert
|
49a0e3d9ac
|
Framework namespace rename.
|
2016-09-04 18:32:19 +09:00 |
|
smoogipooo
|
59a69ca59c
|
Remove unused System.Drawing reference.
|
2016-09-03 23:02:55 +09:30 |
|
Dean Herbert
|
7d2f303e61
|
Update font logic to override framework default.
# Conflicts:
# osu.Game/OsuGame.cs
|
2016-09-01 22:47:48 +09:00 |
|
Dean Herbert
|
9585a9105e
|
Update resolution handling logic.
|
2016-09-01 22:47:48 +09:00 |
|
Dean Herbert
|
013cf1cf3f
|
Fix broken namespaces.
|
2016-08-31 20:16:05 +09:00 |
|
Dean Herbert
|
8870935a4b
|
Add basic online API support.
|
2016-08-31 20:14:01 +09:00 |
|
Dean Herbert
|
81f9ce657f
|
License -> Licence.
|
2016-08-26 17:27:49 +09:00 |
|
Dean Herbert
|
6cbbeaaac0
|
Initial commit.
|
2016-08-26 14:41:47 +09:00 |
|