h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 18:42:56 +08:00
Code Issues Releases Wiki Activity
30,974 Commits 3 Branches 661 Tags 368 MiB
138afea431
Commit Graph

5183 Commits

Author SHA1 Message Date
Dean Herbert
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
Thomas Müller
68476eafb9 Use DrawSize instead of Size whereever Size was previously read due to framework changes. 
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
 2016-10-18 18:53:31 +02:00
Lunar Dust
8e47d72f93 Reorder ToolbarButton instantiation for consistency 
Might as start good standards now rather than later
 2016-10-16 18:42:40 -05:00
Thomas Müller
fec127eb8c Merge branch 'master' of github.com:ppy/osu into unified_shader 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options.cs
 2016-10-16 15:17:24 +02:00
Thomas Müller
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
Huo Yaoyuan
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
Dean Herbert
8c7ff58310 Fix regressions caused by overlay class. 2016-10-14 12:50:03 +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
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
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
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
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
Dean Herbert
cb5e4287e2 Post-merge fixes. 2016-10-09 22:21:44 +09: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
47faf8f40d Add in-game chat display, along with a global hotkey handling method. 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
556420ee58 Add proper toolbar state handling. 2016-10-08 15:54:09 +09:00
Dean Herbert
698c1ef1ae Fix width of toolbar buttons with text. 2016-10-05 20:07:10 +09:00
Dean Herbert
3891f467a3 Fix being able to click two toolbar buttons at once. 2016-10-04 20:00:55 +09:00
Dean Herbert
836083667f Clean up a bit. 2016-10-04 19:57:32 +09:00
Dean Herbert
cc52580568 Implement mode selector highlight line. 2016-10-04 19:41:18 +09:00
Dean Herbert
11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
Dean Herbert
ddcd5ec286 Add basic layout for toolbar. 2016-10-03 20:39:32 +09:00
Dean Herbert
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert
d93718d953 Add template toolbar. 2016-09-30 18:45:27 +09:00
Dean Herbert
154226b9a3 Basic white-boxing of all game modes. 2016-09-29 23:51:17 +09:00