Dean Herbert
|
51cf13460f
|
Remove performance overlay.
|
2016-10-03 23:56:25 +09:00 |
|
Dean Herbert
|
ddcd5ec286
|
Add basic layout for toolbar.
|
2016-10-03 20:39:32 +09:00 |
|
Dean Herbert
|
2b905df58c
|
Merge pull request #41 from peppy/game-modes-layout
Basic white-boxing of all game modes.
|
2016-10-01 19:33:03 +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
|
cdbc47ef7a
|
Merge pull request #40 from peppy/api-channels-messages
API: channels & messages
|
2016-10-01 17:07:05 +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
|
af91341704
|
Remove unused variable.
|
2016-10-01 17:03:47 +09:00 |
|
Dean Herbert
|
5afb038025
|
Use explicit cast to OsuGame rather than in-between derived classes.
# Conflicts:
# osu.Game/GameModes/Menu/MainMenu.cs
|
2016-10-01 17:02:57 +09:00 |
|
Dean Herbert
|
40e5a449bf
|
Add parallax to ButtonSystem.
|
2016-10-01 17:02:20 +09:00 |
|
Dean Herbert
|
4ad618abc9
|
Adjust scale and outwards transition of ButtonSystem.
|
2016-10-01 17:02:01 +09:00 |
|
Dean Herbert
|
665352f706
|
Improve the transition and look of white-boxed game modes.
|
2016-10-01 17:01:09 +09:00 |
|
Dean Herbert
|
24837a0af3
|
Merge pull request #16 from peppy/beatmap_framework
Beatmap framework
|
2016-10-01 16:53:58 +09:00 |
|
Dean Herbert
|
0178e23b73
|
Ensure we always remain fully visible on any aspect ratio (including very tall ones).
|
2016-09-30 18:46:34 +09:00 |
|
Dean Herbert
|
cc14aeb802
|
Add basic background display system.
|
2016-09-30 18:45:55 +09:00 |
|
Dean Herbert
|
d93718d953
|
Add template toolbar.
|
2016-09-30 18:45:27 +09:00 |
|
Dean Herbert
|
463f606004
|
Add delay for exit process.
|
2016-09-30 13:31:05 +09:00 |
|
Dean Herbert
|
357c94ed8a
|
Add OsuGameMode. Standardise naming of classes.
|
2016-09-30 13:30:55 +09:00 |
|
Dean Herbert
|
643ae0cefe
|
Merge remote-tracking branch 'upstream/master' into beatmap_framework
|
2016-09-30 00:13:08 +09:00 |
|
Dean Herbert
|
b4c9dca54b
|
Merge remote-tracking branch 'upstream/master' into api-channels-messages
Conflicts:
osu.Game/Online/Chat/Message.cs
|
2016-09-29 23:54:33 +09:00 |
|
Dean Herbert
|
a114463678
|
Add null check.
|
2016-09-29 23:52:51 +09:00 |
|
Dean Herbert
|
154226b9a3
|
Basic white-boxing of all game modes.
|
2016-09-29 23:51:17 +09:00 |
|
Thomas Müller
|
8470961c2a
|
Merge pull request #39 from peppy/general-fixes
General fixes
|
2016-09-29 16:50:12 +02:00 |
|
Dean Herbert
|
2db962dc33
|
Add basic tweening mouse cursor.
# Conflicts:
# osu-framework
|
2016-09-29 23:46:33 +09:00 |
|
Dean Herbert
|
ae6fb0553d
|
Add contains override to allow correct rendering by CursorContainer on window bounds.
|
2016-09-29 23:46:30 +09:00 |
|
Dean Herbert
|
a69c5b4fc0
|
Fix a few warnings.
|
2016-09-29 23:46:27 +09:00 |
|
Dean Herbert
|
7dcf2c6269
|
Add TestCase for main menu ButtonSystem.
|
2016-09-29 23:46:24 +09:00 |
|
Dean Herbert
|
27b96ab6c9
|
Update framework.
|
2016-09-29 23:46:10 +09:00 |
|
Dean Herbert
|
7c98ef1b3d
|
Move initialisation of ChatLine to Load.
|
2016-09-28 16:33:20 +09:00 |
|
Dean Herbert
|
8650e951e5
|
Merge branch 'refs/heads/master' into api-channels-messages
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2016-09-28 16:30:00 +09:00 |
|
Dean Herbert
|
eaab1b718e
|
Merge branch 'refs/heads/master' into beatmap_framework
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2016-09-28 16:09:26 +09:00 |
|
Dean Herbert
|
cca5de2203
|
Merge pull request #31 from huoyaoyuan/key-counter
Key Counter
|
2016-09-28 15:56:25 +09:00 |
|
Dean Herbert
|
aad58532ec
|
Remove getter on Objects.
|
2016-09-28 15:49:47 +09:00 |
|
Dean Herbert
|
3755ca0501
|
Add missing SizeMode.
|
2016-09-28 14:40:27 +09:00 |
|
Dean Herbert
|
67652a6d8e
|
Improve formatting of chat lines.
|
2016-09-27 20:45:26 +09:00 |
|
Dean Herbert
|
754d9c78bd
|
Simple chat message display functionality.
|
2016-09-27 19:22:22 +09:00 |
|
Dean Herbert
|
154b914a3a
|
Fix API scheduling.
|
2016-09-27 19:22:08 +09:00 |
|
Dean Herbert
|
b4e65e7011
|
Add clear to ensure no pile-up of messages.
|
2016-09-27 18:41:58 +09:00 |
|
Dean Herbert
|
28045b7136
|
Add back basic API support for channel/message retrieval.
|
2016-09-27 18:33:52 +09:00 |
|
Huo Yaoyuan
|
25fecfca06
|
Relative size and position for text layer.
|
2016-09-26 16:56:39 +08:00 |
|
Huo Yaoyuan
|
bb13da2b32
|
Add ResetCount method for Counter.
|
2016-09-26 14:23:22 +08:00 |
|
Huo Yaoyuan
|
b4bb3d6317
|
Update private methods implementation.
|
2016-09-26 14:21:40 +08:00 |
|
Huo Yaoyuan
|
756e7a6a67
|
Add missing lincense header, remove unnecessary comment and field.
|
2016-09-26 14:21:25 +08:00 |
|
Dean Herbert
|
f0284ce57c
|
Use the old naming style for now.
|
2016-09-26 15:07:29 +09:00 |
|
Huo Yaoyuan
|
3d23dda3b4
|
Merge branch 'master' into key-counter
|
2016-09-26 13:46:51 +08:00 |
|
Dean Herbert
|
cd57661aa2
|
Merge pull request #37 from peppy/general-fixes
Fix OpenTK reference in VisualTests.
|
2016-09-26 14:42:24 +09:00 |
|
Dean Herbert
|
ae100e3137
|
Move PlayTest to the VisualTests project.
|
2016-09-25 13:59:38 +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
|
9491bd7f59
|
Fix OpenTK reference in VisualTests.
|
2016-09-25 13:32:53 +09:00 |
|