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 |
|
TocoToucan
|
f3c1c60ab7
|
Change volume in VolumeMeter
|
2016-10-10 17:19:05 +03:00 |
|
Thomas Müller
|
48bd998f46
|
Merge pull request #59 from peppy/general-fixes
Update framework to fix draw order.
|
2016-10-10 08:16:52 +02:00 |
|
Dean Herbert
|
4ac2c9ad90
|
Update framework to fix draw order.
|
2016-10-10 15:12:21 +09:00 |
|
Dean Herbert
|
8706027155
|
Merge pull request #54 from SirCmpwn/specify-game-name
Update osu-framework and specify game name
|
2016-10-10 15:03:01 +09:00 |
|
Dean Herbert
|
3f83ffcb99
|
Bring framework up-to-date with upstream master.
|
2016-10-10 14:36:27 +09:00 |
|
Dean Herbert
|
0b0e79d29f
|
Merge remote-tracking branch 'upstream/master' into SirCmpwn/specify-game-name
Conflicts:
osu-framework
|
2016-10-10 14:35:43 +09:00 |
|
Dean Herbert
|
8b06778746
|
Merge pull request #56 from Tom94/general-improvements
General improvements
|
2016-10-10 14:20:17 +09:00 |
|
Dean Herbert
|
0b08c8ba15
|
Update framework.
|
2016-10-10 14:18:06 +09: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 |
|
TocoToucan
|
89d7de31ee
|
VolumeControl: add controls for Effects and Music
|
2016-10-09 20:45:34 +03:00 |
|
UselessToucan
|
b004961d07
|
Merge pull request #2 from ppy/master
Actualize fork
|
2016-10-09 20:34:18 +03: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
|
5861e782e5
|
Update Framework version.
|
2016-10-09 16:02:25 +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 |
|
Dean Herbert
|
de24c86c81
|
Merge pull request #55 from Tom94/better-addtarget
Better addtarget
|
2016-10-09 20:13:30 +09: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
|
36bb4a3988
|
Don't call Container.Add within KeyCounterCollection.Reset.
|
2016-10-09 20:06:15 +09:00 |
|
Dean Herbert
|
0a10bf9a51
|
Update framework.
|
2016-10-09 20:06:07 +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 |
|
Thomas Müller
|
916bb742da
|
Don't call Container.Add within KeyCounterCollection.Reset.
|
2016-10-09 11:55:38 +02:00 |
|
Thomas Müller
|
c997e16cfb
|
Update Framework.
|
2016-10-09 11:55:11 +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 |
|
Thomas Müller
|
9d54d4f9bb
|
Update framework version.
|
2016-10-09 08:16:51 +02: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 |
|
Drew DeVault
|
eb7486f109
|
Update osu-framework and specify game name
|
2016-10-08 10:26:35 -04: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 |
|
Thomas Müller
|
965cd6539f
|
Merge pull request #48 from peppy/general-fixes
General fixes
|
2016-10-08 12:21:17 +02:00 |
|