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
|
29d223dc41
|
Update framework and simplify some references.
|
2016-10-12 19:52:49 +09:00 |
|
Dean Herbert
|
61d5c7c56d
|
Make stuff compile again (but StarCounter hits assertions).
|
2016-10-12 16:11:40 +09:00 |
|
Dean Herbert
|
e800649633
|
Merge remote-tracking branch 'upstream/master' into limit-game-access
|
2016-10-12 16:03:03 +09:00 |
|
Dean Herbert
|
b2c31d3047
|
Updates post-master-merge.
|
2016-10-12 16:01:23 +09:00 |
|
Dean Herbert
|
4052a665bf
|
Remove all non-load Game access.
|
2016-10-12 15:47:08 +09:00 |
|
Dean Herbert
|
af76dc09d3
|
Move direction declaration to usage.
|
2016-10-12 15:33:04 +09:00 |
|
Dean Herbert
|
f737090c6b
|
Make CentreTarget public.
|
2016-10-12 15:28:28 +09:00 |
|
Dean Herbert
|
1c0b769451
|
Centralise the maximum chat history variable.
|
2016-10-12 15:25:07 +09:00 |
|
Dean Herbert
|
24771a62cf
|
Remove upwards reference.
|
2016-10-12 15:23:22 +09:00 |
|
Dean Herbert
|
9276244d6a
|
getter on single line.
|
2016-10-12 15:22:03 +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 |
|
Dean Herbert
|
05031d18ef
|
Fix some display regressions in ChatConsole.
|
2016-10-12 13:35:21 +09:00 |
|
Dean Herbert
|
c0ea061bd4
|
Update framework; amend ToolbarButton to use padding and Children initialiser.
|
2016-10-12 12:24:07 +09:00 |
|
Drew DeVault
|
5306141f5f
|
Merge pull request #49 from NeoAdonis/counters
Rolling counters (initial)
|
2016-10-11 15:04:46 -04:00 |
|
Adonais Romero González
|
2954c19345
|
Misc. fixes
|
2016-10-09 15:19:35 -05:00 |
|
Adonais Romero González
|
4d0c8ed441
|
StarAnimationEasing
|
2016-10-09 14:55:50 -05:00 |
|
Adonais Romero González
|
fd1cbfd8fa
|
Hide VisibleCount from transformStar
|
2016-10-09 14:53:06 -05:00 |
|
Adonais Romero González
|
01da3ca474
|
More line wrapping
|
2016-10-09 14:48:24 -05:00 |
|
Adonais Romero González
|
841707b61f
|
Not animate stars over MaxStars
|
2016-10-09 14:09:07 -05:00 |
|
Adonais Romero González
|
707effb591
|
Completed StarCounter
More complex than the other counters, but hopefully functional.
I subestimated you and your silly bouncing animations.
>.>
|
2016-10-09 14:02:44 -05: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
|
9ed0748d73
|
No need to enforce scheduling of task anymore.
|
2016-10-09 15:40:32 +02:00 |
|
Dean Herbert
|
cb5e4287e2
|
Post-merge fixes.
|
2016-10-09 22:21:44 +09:00 |
|
Dean Herbert
|
25de055802
|
Merge branch 'master' into stateful-drawables
Conflicts:
osu.Game/GameModes/Menu/Intro.cs
|
2016-10-09 22:08:32 +09:00 |
|
Thomas Müller
|
934523e347
|
Update framework version.
|
2016-10-09 13:31:16 +02:00 |
|
Thomas Müller
|
dd04b33232
|
Use AddInternal instead of AddTopLevel.
|
2016-10-09 20:06:23 +09:00 |
|
Thomas Müller
|
bcb5a02221
|
Don't rely on return value of Container.Add.
|
2016-10-09 20:06:20 +09:00 |
|
Thomas Müller
|
d9486e790a
|
Use AddInternal instead of AddTopLevel.
|
2016-10-09 11:56:41 +02:00 |
|
Thomas Müller
|
99c8f618af
|
Don't rely on return value of Container.Add.
|
2016-10-09 11:55:52 +02:00 |
|
Dean Herbert
|
76f1653090
|
Merge pull request #53 from Tom94/use_drawable_scheduler
Use drawable scheduler
|
2016-10-09 15:25:22 +09:00 |
|
Adonais Romero González
|
67d3d772f6
|
Minor fix with StarCounter width
|
2016-10-08 22:15:25 -05:00 |
|
Adonais Romero González
|
37115c8c9f
|
Merge branch 'master' into counters
|
2016-10-08 22:02:43 -05:00 |
|
Adonais Romero González
|
accf365fd1
|
More styling.
|
2016-10-08 21:58:53 -05:00 |
|
Adonais Romero González
|
0d18680eeb
|
StarCounter styling using absolute positioning.
|
2016-10-08 21:45:01 -05:00 |
|
Adonais Romero González
|
5ebb2fc289
|
Refactor + Stars Counter (initial)
Moved a few things to allow using common transforms
for a star counter. This implementation is basic and
hacky, but good enough as proof of concept.
|
2016-10-08 19:11:01 -05:00 |
|
Dean Herbert
|
926c46dbd4
|
Code formatting and slight changes to transitions.
|
2016-10-08 23:27:53 +09: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
|
97c2dcf590
|
Use PaddingContainer for better layout.
|
2016-10-08 23:25:38 +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
|
1e9e52aecc
|
osuLogo handles less keys.
|
2016-10-08 19:23:21 +09:00 |
|
Dean Herbert
|
adba72d293
|
Toolbar stores its current state locally (just for conformity).
|
2016-10-08 19:23:21 +09:00 |
|
Dean Herbert
|
3067c890ce
|
General improvements to chat querying and logic organisation.
|
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
|
5a507838d6
|
Fix event not being unbound.
|
2016-10-08 19:12:31 +09:00 |
|
Thomas Müller
|
0c793dfe69
|
Use own Scheduler instead of Game.Scheduler.
|
2016-10-08 11:33:24 +02:00 |
|
Dean Herbert
|
556420ee58
|
Add proper toolbar state handling.
|
2016-10-08 15:54:09 +09:00 |
|
Dean Herbert
|
27a26cfaaf
|
Ensure the correct background state is restored when skipping multiple levels
|
2016-10-08 15:54:09 +09:00 |
|
Dean Herbert
|
93f326bb9b
|
Fix welcome sound being played twice.
|
2016-10-08 15:54:08 +09:00 |
|
Dean Herbert
|
243d2cdec5
|
Block window closing while intro is playing.
|
2016-10-08 15:54:07 +09:00 |
|