RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,183 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

238 Commits

Author SHA1 Message Date
Thomas Müller 8894e5f73a Fade the options overlay to prevent unnecessary updates to its content. 2016-11-06 08:54:36 +01:00
Huo Yaoyuan d63e3b6724 Add fallback texture of beatmap when getting null; 2016-11-06 05:37:55 +08:00
Huo Yaoyuan 0c6825bb20 Adjust visual behavior. 2016-11-06 05:35:35 +08:00
Huo Yaoyuan c53298a3b1 Update font size (*1.25) to follow the design image. 2016-11-06 01:53:10 +08:00
Huo Yaoyuan 74000f77ad Set font in music controller. 2016-11-06 01:50:38 +08:00
Huo Yaoyuan a19bb1270d Async workflow on music controller. 2016-11-06 00:46:09 +08:00
Huo Yaoyuan 859a59a8ab Set children in constructor. 2016-11-06 00:24:03 +08:00
Huo Yaoyuan 5eed07db57 Update access of WorkingBeatmap. 2016-11-06 00:13:45 +08:00
Huo Yaoyuan c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00
Dean Herbert 2ee5e2efb7 Bring framework up-to-date. 
# Conflicts:
#	osu-framework
 2016-11-05 18:18:52 +09:00
Huo Yaoyuan 2d86cb1e81 Merge branch 'master' 2016-11-05 16:21:59 +08:00
Dean Herbert 10e5472624 Block mouse events from hitting things behind options. 2016-11-04 12:29:05 +09:00
Dean Herbert 2135b93791 Make options semi-transparent. 2016-11-04 12:28:00 +09:00
Dean Herbert f3d461e318 Fix some events not firing correctly. 2016-11-04 12:27:43 +09:00
Drew DeVault 408173319b Refactor options header and layout stuff 2016-11-03 23:01:11 -04:00
Drew DeVault cb40b7079f Rework how references are passed about 2016-11-03 22:43:00 -04:00
Drew DeVault af8e4415c3 Split out [Sub]sections into seperate files 2016-11-03 19:06:22 -04:00
Drew DeVault 1d8c6db0a7 Add remaining options 2016-11-03 19:06:22 -04:00
Drew DeVault c7fa0a5ab0 Add more options 2016-11-03 19:06:22 -04:00
Drew DeVault 7e77efcfdc Add Graphics options 2016-11-03 19:06:22 -04:00
Drew DeVault 6c0cef894e Add OsuButton with sane defaults 2016-11-03 19:06:22 -04:00
Drew DeVault 2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
Drew DeVault 2f990b884e Tweak style to more closely match osu!next 2016-11-03 19:06:22 -04:00
Drew DeVault dd0cb5da01 Add options from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault 9f78f8607b Implement General options section 2016-11-03 19:06:22 -04:00
Huo Yaoyuan f2a8cc0c29 Merge branch 'master' 2016-11-03 20:38:34 +08:00
Dean Herbert 774b47c1fe Don't cache drawable for no reason. 2016-11-02 00:53:13 +09:00
Dean Herbert b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Huo Yaoyuan f1837b4822 Fix changed event and no longer auto play on load. 2016-10-28 21:57:23 +08:00
Huo Yaoyuan 7543d491ae Add music controller into game. 2016-10-28 21:21:47 +08:00
Huo Yaoyuan 3858c77817 No longer holds OsuGame reference. 2016-10-28 20:47:27 +08:00
Huo Yaoyuan 9b76110605 Interaction with external changes. 2016-10-28 20:44:59 +08:00
Huo Yaoyuan 36cefcb956 Fix to work individually. 2016-10-28 20:34:22 +08:00
Huo Yaoyuan aa107de162 Store a local copy of WorkingBeatmap. 2016-10-28 20:27:44 +08:00
Huo Yaoyuan 7d14e6e6cf Make prev and next work again. 2016-10-28 20:08:27 +08:00
Huo Yaoyuan 7d6e4a8ad2 Make music controller uses WorkingBeatmap. 2016-10-28 19:39:02 +08:00
Huo Yaoyuan eab8caaa0c Ensure track is playing after seek. 2016-10-27 19:51:38 +08:00
Huo Yaoyuan 73d1eeb272 Update MusicController using DragBar. 2016-10-27 18:15:43 +08:00
Huo Yaoyuan 35b1d0ae50 Seperated DragBar class. 2016-10-27 18:14:50 +08:00
Huo Yaoyuan 9c2d3990ce Add spacing in code. 2016-10-27 17:04:41 +08:00
Huo Yaoyuan 3e30935d10 Allow to set database of music controller. 2016-10-27 16:58:40 +08:00
Huo Yaoyuan 6482184a09 Dispose ArchiveReader. 2016-10-27 13:34:54 +08:00
Huo Yaoyuan fead1d4c6f Seek by clicking and dragging on progress bar. 2016-10-27 13:34:53 +08:00
Huo Yaoyuan d9fc04748e Remove redundant class. 2016-10-27 13:34:52 +08:00
Huo Yaoyuan 0da78c19a2 TestCase reset. 2016-10-27 13:34:51 +08:00
Huo Yaoyuan b671a33911 Transition fixes and clock for VisualTest. 2016-10-27 13:34:51 +08:00
Huo Yaoyuan 8e766a1f47 Show playing progress. 2016-10-27 13:34:50 +08:00
Huo Yaoyuan 1a3a5c544d Button behavior fixes. 2016-10-27 13:34:49 +08:00
Huo Yaoyuan a32f9eed51 Play control. 2016-10-27 13:34:48 +08:00
Huo Yaoyuan d2495e34fb Query from beatmap database. 2016-10-27 13:34:47 +08:00
Huo Yaoyuan 303bd41765 Background scale. 2016-10-27 13:34:46 +08:00
Huo Yaoyuan b0d72c5f84 Button and text. 2016-10-27 13:34:45 +08:00
Huo Yaoyuan 0f2b5e8370 Layers. 2016-10-27 13:34:44 +08:00
Huo Yaoyuan e1f6ab1a42 Create MusicController UI class and visual test. 2016-10-27 13:34:43 +08:00
Dean Herbert 28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
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