h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Code Issues Releases Wiki Activity
65,465 Commits 3 Branches 648 Tags 270 MiB
45f60b035e
Commit Graph

394 Commits

Author SHA1 Message Date
DrabWeb
215b016f32 Initial implementation 2017-03-24 05:59:26 -03:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Thomas Müller
9af0104e3e Fix NaN when dragging music controller 
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
 2017-03-18 12:46:12 +01:00
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Dean Herbert
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Dean Herbert
6c3bda18b6
Add beatmap deletion support. 
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
 2017-02-24 14:37:54 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Thomas Müller
2c4ecb990d Remove line break in MusicController 2017-02-11 16:23:15 +01:00
Thomas Müller
b7fd65070e Merge pull request #335 from peppy/overlay-improvements 
Overlay improvements
 2017-02-09 08:43:58 +01:00
Dean Herbert
23bc84fa3c Fix borked header. 2017-02-09 16:38:39 +09:00
Dean Herbert
30bec0876d
Make MusicController a focused overlay. 2017-02-09 13:57:49 +09:00
Dean Herbert
581ec765fb
Improve transitions of MusicController. 2017-02-09 13:57:47 +09:00
Dean Herbert
18bb61897f
Update overlay containers in lines with framework changes. 
Allows closing the MusicController using escape.
 2017-02-09 13:57:44 +09:00
Dean Herbert
f6956fc51c
Fix MusicController doing work in the background when not visible. 2017-02-09 11:36:45 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
74366c620b Move login screen to toolbar and update design (still not fully implemented). 
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
#	osu.Game/Overlays/Toolbar/Toolbar.cs
 2017-01-30 22:55:35 +09:00
Dean Herbert
cbd6fe3f36 Move definition of MusicController's position out of itself. 2017-01-30 22:54:33 +09:00
Dean Herbert
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
Drew DeVault
f5f545df62 Refactor OsuColour into injected instance class 
Which should allow you to change the color palette in the future for
skinning purposes.
 2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Drew DeVault
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Drew DeVault
70ecf48ca7 Add central color class 
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
 2017-01-09 17:20:31 -05:00
Huo Yaoyuan
6690d1bd72 Move logic into updateDisplay. 2017-01-04 02:12:18 +08:00
Huo Yaoyuan
794e4663d8 Fix PreferUnicode changing when nothing to play. 2017-01-04 01:00:08 +08:00
Huo Yaoyuan
3a4fb2ffed IsEnabled property for drag bar of music controller. 2016-12-01 08:20:24 +08:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Dean Herbert
60d939f323 Use FillMode in more cases. 2016-11-23 13:18:22 +09:00
Dean Herbert
3bc38268a0 Make MusicController more async. 2016-11-22 20:47:28 +09:00
Dean Herbert
1f73bb4cf0 Set drag bar to correct orange. 2016-11-15 19:34:55 +09:00
Tom94
c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01:00
Dean Herbert
dde3a68c8f Account for anchor when dragging MusicController (fixes VisualTest). 2016-11-14 16:40:13 +09:00
Dean Herbert
eb32d842cc Use switch instead of if-else. 2016-11-14 16:10:07 +09:00
Huo Yaoyuan
86a6c7641d Make TransformDirection more clear. 2016-11-14 04:59:41 +08:00
Huo Yaoyuan
afab938794 Strongly typed TransformDirection for music controller. 2016-11-14 03:21:07 +08:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
 2016-11-12 20:18:26 +09:00
Dean Herbert
3b99a8fd06 Add a shadow and bit of elasticity to MusicController. 2016-11-12 17:09:58 +09:00
Dean Herbert
b65eb33774 Fix weird artifacting when the MusicController fades in and out by using a buffered container. 2016-11-12 16:44:31 +09:00
Drew DeVault
d49b418449 Implement ShowUnicode option behavior 2016-11-10 21:35:58 -05:00
Drew DeVault
0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
Huo Yaoyuan
ef5968e243 More robust metadata handling. 2016-11-07 23:12:49 +08:00
Huo Yaoyuan
fd977cacb3 Fix corner case when shuffling. 2016-11-07 23:06:14 +08:00
Huo Yaoyuan
02b903f1ea Shuffle playlist. 2016-11-07 22:12:58 +08:00
Huo Yaoyuan
dc347a74f5 Don't play transition if audio equals. 2016-11-07 21:58:30 +08:00
Huo Yaoyuan
c59cad2478 AudioEquals method for BeatmapInfo. 2016-11-07 21:52:23 +08:00
Huo Yaoyuan
d1f64cfbfc Make external changes into history. 2016-11-07 21:30:25 +08:00
Huo Yaoyuan
ad1dccf6ce Use play history for back and forward. 2016-11-07 21:25:37 +08:00
Huo Yaoyuan
644e337cf6 Add a list for play history. 2016-11-07 20:57:33 +08:00
Huo Yaoyuan
c272041f37 Block click and drag at MusicController level. 2016-11-07 20:07:45 +08:00
Huo Yaoyuan
736079a60d Update FontAwesome usage. 2016-11-07 19:00:20 +08:00
Huo Yaoyuan
c8a7bd2ece Minor implementation changes. 2016-11-06 16:47:37 +08:00
Huo Yaoyuan
000c2218b8 Make background update happens in update thread, and thread-safer. 2016-11-06 16:34:47 +08: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
f2a8cc0c29 Merge branch 'master' 2016-11-03 20:38:34 +08: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
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