h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 19:57:24 +08:00
Code Issues Releases Wiki Activity
1,182 Commits 3 Branches 653 Tags 367 MiB
ec7bbd231f
Commit Graph

853 Commits

Author SHA1 Message Date
Dean Herbert
3b0114671e Max sidebar draggable. 2016-11-08 19:16:39 +09:00
Dean Herbert
30323876a8 Use preload for options (fix icons). 2016-11-08 18:49:20 +09:00
Dean Herbert
a851d7b44f Updates. 2016-11-08 18:33:31 +09:00
Dean Herbert
c36b54b35a Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container 2016-11-08 18:29:21 +09:00
Drew DeVault
743c1bde58 Wire up alternative chat font 2016-11-07 22:37:21 -05:00
Drew DeVault
1bca78f4b6 Wire up one of the settings to the config 
One step at a time, right
 2016-11-07 22:36:24 -05:00
Drew DeVault
fbbd05e606 Remove unnecessary TODO 2016-11-07 22:28:02 -05:00
Drew DeVault
a6593505b3 Say NO to RelativeSizeAxes = Both 2016-11-07 22:19:02 -05:00
Drew DeVault
4d04eb6fb1 Rearrange some options a bit, update framework 2016-11-07 22:15:48 -05:00
Drew DeVault
cbbac0565f Remove unused using statements 2016-11-07 21:28:06 -05:00
Drew DeVault
1ce6a7285a Rearrange options namespaces 2016-11-07 21:24:41 -05:00
Drew DeVault
b2bbdfa284 Refactor how the sidebar buttons are created/used 2016-11-07 18:04:49 -05:00
Drew DeVault
e6c3fc1091 Implement scrolling to each section 2016-11-07 17:07:55 -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
Dean Herbert
d57d5daac9 Support generic FlowContainer. 2016-11-07 21:17:29 +09:00
Dean Herbert
a61fb5ef5d Initial updates to make generic containers work. 2016-11-07 21:13:56 +09: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
8037f1233f Merge branch 'master' 2016-11-07 18:58:35 +08:00
Dean Herbert
f14a35d480 Update FontAwesome definitions. 2016-11-07 17:59:00 +09:00
Thomas Müller
90c889a7ce Smoothen wedged buttons in main menu and the wedges on song select background. 2016-11-06 19:34:44 +01:00
Thomas Müller
103176826f Ensure transformations are never used prior to being added to the Drawable tree. 2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks 
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
 2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2 Remove now obsolete clock usages. 2016-11-06 10:06:09 +01: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
Thomas Müller
8894e5f73a Fade the options overlay to prevent unnecessary updates to its content. 2016-11-06 08:54:36 +01:00
Thomas Müller
a6c0fd29f2 Make use of new timing system in Drawables and Transforms. 2016-11-06 08:25:21 +01:00
Maciej
bcc1d7c669 Background scaling different approach 2016-11-06 04:37:41 +01:00
Maciej
c4132339a6 Working beatmap background scaling fix 
Add a check for the working beatmap background width and assign a proper
scaling value to cover the whole box
 2016-11-06 04:12:35 +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
3c8f94dd0f Merge pull request #136 from Tom94/general-fixes 
Fix wrong initial state of beatmap panels.
 2016-11-05 23:04:37 +09:00
Thomas Müller
7c7e2160ec Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 2016-11-05 14:05:42 +01:00
Thomas Müller
619d97c642 Fix indentation and typo. 2016-11-05 13:51:52 +01:00
Thomas Müller
07e74068e7 Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
 2016-11-05 13:35:15 +01:00
Huo Yaoyuan
e69dac7745 Fix lock object. 2016-11-05 20:21:08 +08:00
Huo Yaoyuan
f2b37e1fe7 Add lock on each property of WorkingBeatmap. 2016-11-05 20:01:46 +08:00
Thomas Müller
ba39a9df8e Fix wrong initial state of beatmap panels. 2016-11-05 12:24:15 +01:00
Dean Herbert
a11d534067 Add beatmap backgrounds. 2016-11-05 20:00:14 +09:00
Dean Herbert
7cc19d74c6 Add full Exo font set and bring song select panels closer to final design. 2016-11-05 18:22:09 +09:00
Dean Herbert
8fe63689a4 Fix thread safety issue when accessing files in beatmap (zip) files. 2016-11-05 18:19:01 +09: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
10f2ed4387 Add explicit privates. 2016-11-04 16:12:35 +09:00
Dean Herbert
b17d219ace Share Triangles logic. 2016-11-04 16:11:22 +09:00
Dean Herbert
108b7092c9 Fix regression in hitcircle appearance. 2016-11-04 16:08:04 +09:00
Dean Herbert
9df43c6d33 Fix draw order of hitobjects. 2016-11-04 15:43:53 +09:00
Dean Herbert
da18e2d4f6 Fix off-by-one colour retrieval. 2016-11-04 15:43:53 +09:00
Dean Herbert
b72e9221fd Only add valid hitobjects. 2016-11-04 15:43:53 +09:00
Dean Herbert
74c655ebfc Fix input not working. 2016-11-04 15:43:53 +09:00
Dean Herbert
b40ccccbe4 Add HitObject colours back in the mix. 2016-11-04 15:43:53 +09:00
Dean Herbert
92b85b251e Fix scale more. 2016-11-04 15:43:53 +09:00
Dean Herbert
e939746159 Fix scale ratio of gamefield. 2016-11-04 15:43:53 +09:00
Dean Herbert
788cba6f4d Add autoplay toggle (const). 2016-11-04 15:43:53 +09:00
Dean Herbert
f5f5aa9eac Fix some incorrect default values. 2016-11-04 15:43:53 +09:00
Dean Herbert
a4e2f25065 Flush recursively, more transform tidying. 2016-11-04 15:43:53 +09:00
Dean Herbert
1854160321 Add hit time and the ability for an external operator to block hits. 2016-11-04 15:43:53 +09:00
Dean Herbert
fbaae94ba4 Limit state changes to apply only once. 2016-11-04 15:43:53 +09:00
Dean Herbert
8d4e7038b3 Part -> Layer. 2016-11-04 15:43:53 +09:00
Dean Herbert
bc53642cab Fix some warnings. 2016-11-04 15:40:05 +09: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
40e667b2d8 Add default values from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
89d3f4c2be Import enum from old osu 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
Drew DeVault
2aaff01675 Implement config persistence through BasicStorage 2016-11-03 19:06:22 -04:00
Huo Yaoyuan
9e0fbed748 Use PreLoad on music controller. 2016-11-03 22:38:10 +08:00
Huo Yaoyuan
f2a8cc0c29 Merge branch 'master' 2016-11-03 20:38:34 +08:00
Dean Herbert
439204b4fa Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow 2016-11-03 16:44:49 +09:00
Dean Herbert
54dbb0a355 Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow 
# Conflicts:
#	osu.Game/Beatmaps/Drawable/Panel.cs
 2016-11-02 16:43:35 +09:00
Dean Herbert
617a3f5c4f Adjust glow colour slightly. 2016-11-02 10:22:46 +09:00
Dean Herbert
2811d55e13 Merge pull request #120 from Tom94/fix-beatmap-panel-border-alpha 
Fix beatmap panel border alpha being way too large.
 2016-11-02 09:57:32 +09:00
Thomas Müller
50de8528a5 Use better glow in beatmap selection. 2016-11-01 22:57:11 +01:00
Thomas Müller
128ec8f767 Fix beatmap panel border alpha being way too large. 2016-11-01 22:21:09 +01:00
Dean Herbert
3d611dd57b Improve coodination of startup sequence. 2016-11-02 01:02:48 +09:00
Dean Herbert
c78e3efc66 Schedule some illegal calls. 2016-11-02 01:02:34 +09:00
Dean Herbert
774b47c1fe Don't cache drawable for no reason. 2016-11-02 00:53:13 +09:00
Drew DeVault
0edfeaaff9 Move wedgeContainer transition to OnEntering 2016-11-01 09:22:49 -06:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Drew DeVault
e5f948dccc Fade song select wedges in 2016-10-31 16:16:11 -06:00
Adonais Romero González
fd0900eb3c I knew I forgot something >:( 2016-10-29 18:42:40 -05:00
Adonais Romero González
ef9d2b5b3c Minor improvements to combo counters 2016-10-29 18:26:12 -05:00
Dean Herbert
d8ca11bf0d Use Any instead of First to avoid potential throw. 2016-10-29 04:29:43 +09:00
Dean Herbert
a2f995ebe0 Remove forgotten parens. 2016-10-29 03:44:27 +09:00
Dean Herbert
d47924ff7b Fix selection not collapsing when clicking set headers exclusively. 2016-10-29 03:43:52 +09:00
Dean Herbert
c969e0b4f0 Remove forced disposal of WorkingBeatmap. 2016-10-29 03:31:40 +09:00
Dean Herbert
eb30882b09 More comments. 2016-10-28 23:40:12 +09:00
Dean Herbert
f0e4a252a5 Add some warning comments. 2016-10-28 23:35:49 +09:00
Dean Herbert
42ad96778e Tidy shit up; reduce number of unnecssesary events being fired. 2016-10-28 23:29:21 +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
6aba03e1ca OsuGameMode<-WorkingBeatMap->OsuGameBase. 2016-10-28 21:03:59 +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
Dean Herbert
5dc495e41d Avoid accessing the beatmap too early. 2016-10-28 21:08:32 +09:00
Huo Yaoyuan
7d14e6e6cf Make prev and next work again. 2016-10-28 20:08:27 +08:00
Huo Yaoyuan
b7ada4866e Merge remote-tracking branch 'peppy/lets-play' into music-controller 2016-10-28 19:47:35 +08:00
Huo Yaoyuan
7d6e4a8ad2 Make music controller uses WorkingBeatmap. 2016-10-28 19:39:02 +08:00
Dean Herbert
10ef34b805 Lazy parse beatmap; Don't reload audio track if it hasn't changed. 2016-10-28 20:24:14 +09:00
Huo Yaoyuan
7e2350cb13 Merge remote-tracking branch 'refs/remotes/peppy/lets-play' 2016-10-28 19:07:29 +08:00
Dean Herbert
74f1a9622f Add initial game-wide beatmap flow. 2016-10-28 19:55:48 +09:00
Dean Herbert
0f5614ffa2 Only allow osu! mode maps to be played for now. 2016-10-28 18:07:42 +09:00
Dean Herbert
209f09df91 Don't exception on inability to read audio track. 2016-10-28 18:03:26 +09:00
Dean Herbert
13b5fb0578 Update transforms to not accept clock. 2016-10-28 17:42:00 +09:00
Dean Herbert
0e39c5cc9c Move Results to own namespace. 2016-10-28 16:10:10 +09:00
Dean Herbert
856e056515 Remove unnecessary finaliser. 2016-10-28 14:18:00 +09:00
Dean Herbert
feccb7286c Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect. 2016-10-28 14:14:45 +09:00
Dean Herbert
2cdda98b47 Add the ability to retrieve (fallback) metadata from a beatmap. 2016-10-28 14:13:52 +09:00
Dean Herbert
012c29addb Minor fixes to player flow. 2016-10-27 22:27:45 +09:00
Huo Yaoyuan
eab8caaa0c Ensure track is playing after seek. 2016-10-27 19:51:38 +08:00
Dean Herbert
d6ed055682 Don't hard-crash on failing to load a beatmap. 2016-10-27 20:37:01 +09:00
Dean Herbert
d9dfc324c1 Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible. 2016-10-27 19:52:48 +09: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
Dean Herbert
c828b1bc7b Add comment about optional database parameter. 2016-10-27 17:53:47 +09:00
Dean Herbert
9074bc3396 Allow Player to load from BeatmapInfo. 2016-10-27 17:53:37 +09:00
Dean Herbert
a764a97602 Use memory database again, local to TestCasePlaySongSelect. 2016-10-27 17:35:00 +09:00
Dean Herbert
33ef55df88 Allow BeatmapDatabase to be constructed without a host. 2016-10-27 17:34:50 +09:00
Dean Herbert
f16cc430f8 Stop using memory database. Load sample data local to TestCase. 
Also makes the connection private.
 2016-10-27 17:08:53 +09: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
debea59bab Merge pull request #61 from SirCmpwn/song-select 
Song select
 2016-10-27 13:54:34 +09:00
Dean Herbert
456169f182 Move BeatmapGroupState to outside class definition. 2016-10-27 13:42:37 +09:00
Dean Herbert
abfad501b6 beatmapSet can be private. 2016-10-27 13:41:30 +09:00
Dean Herbert
ce73ae792f Change panel selection logic to avoid looping. 2016-10-27 13:36:04 +09:00
Dean Herbert
ba5b2f2d73 Remove difficulty width offsets and tidy up flow of information. 2016-10-27 12:31:45 +09:00
Dean Herbert
f846505a92 Tidy namespaces. 2016-10-27 12:01:13 +09:00
Dean Herbert
104cedba19 Merge pull request #109 from peppy/volume-control-input-fix 
Fix volume control input handling.
 2016-10-27 11:45:09 +09:00
Drew DeVault
9c27c33e18 Use IStateful and improve collapse logic 2016-10-26 12:49:16 -04:00
Drew DeVault
55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -04:00
Drew DeVault
157512b45f Merge branch 'master' into song-select 2016-10-26 10:37:18 -04:00
Dean Herbert
3f23900347 Framework & OpenTK updates. 2016-10-26 23:13:44 +09:00
Dean Herbert
ee8b678989 Fix volume controls handling mouse wheel at a higher level than anything else game-wide. 2016-10-26 18:45:48 +09:00
Drew DeVault
5e9495d21d Fix performance issues with song select 2016-10-25 16:49:10 -04:00
Drew DeVault
063fdd9a2d Add test data to db for VisualTests 
Also fixes the broken IPC condition
 2016-10-24 14:57:00 -04:00
Drew DeVault
a1019f91ba Fix auto size on BeatmapSetBox difficulties 2016-10-24 11:39:53 -04:00
Drew DeVault
b0898a3ce0 Fix sizing of setList flow container 2016-10-24 11:39:53 -04:00
Drew DeVault
86bbe8688b Fix issues with invisible beatmaps 2016-10-24 11:39:53 -04:00
Drew DeVault
ff1a5187cd Implement fixes related to auto size changes 2016-10-24 11:39:53 -04:00
Drew DeVault
e5168f8da8 Implement handoff to Player 2016-10-24 11:39:53 -04:00
Drew DeVault
cfc920c9c1 Implement Play button, drop textures 2016-10-24 11:39:53 -04:00
Dean Herbert
d3a857edb9 Make importing work properly. 
Moves import code to BeatmapDatabase.
 2016-10-24 11:39:53 -04:00
Dean Herbert
0c9e26e546 Return the populated item when calling GetChildren to write more elegant code. 2016-10-24 11:39:18 -04:00
Dean Herbert
6f80efdb29 Add a database reset method. 2016-10-24 11:39:18 -04:00
Dean Herbert
7650bb1707 Don't insert to database until we're completely finished importing a beatmap. 2016-10-24 11:39:18 -04:00
Dean Herbert
ee6c810df5 Fix cascading inserts. 2016-10-24 11:39:18 -04:00
Drew DeVault
42f8d19c73 Sort by difficulty and fix relationship 2016-10-24 11:39:18 -04:00
Drew DeVault
8d6431b35e Add star counter to difficulty select 2016-10-24 11:39:18 -04:00
Drew DeVault
910a079bda Add animation, selection indicator to difficulties 2016-10-24 11:39:18 -04:00
Drew DeVault
4b6a1486a6 Increase spacing to match mockups 2016-10-24 11:39:18 -04:00
Drew DeVault
61a7ccaece Remove dependency on DeferredSprite 2016-10-24 11:39:18 -04:00
Drew DeVault
33fc60716d Fix assertion failures 2016-10-24 11:39:18 -04:00
Drew DeVault
cfa637b763 Select first difficulty by default 2016-10-24 11:39:18 -04:00
Drew DeVault
51791bba7f Tweak play button 2016-10-24 11:39:18 -04:00
Drew DeVault
4dcdc8638e Add beatmap difficulty selection logic 2016-10-24 11:39:18 -04:00
Drew DeVault
941687e091 Add glow to beatmap groups 2016-10-24 11:39:18 -04:00
Drew DeVault
bc959f74a5 Add background textures to beatmap sets 
Needs osu-framework#189
 2016-10-24 11:39:18 -04:00
Drew DeVault
6da092ab30 Fix additional bugs, tweak L+F 2016-10-24 11:39:18 -04:00
Drew DeVault
8d4a211419 Fix initialization of BeatmapInfo 2016-10-24 11:39:18 -04:00
Drew DeVault
3ee0bf2b80 Fix cascade insert 2016-10-24 11:39:18 -04:00
Drew DeVault
641855c790 Fix issues with beatmap import file contention 2016-10-24 11:39:18 -04:00
Drew DeVault
c41b3d92c6 Fix up wrt upstream development 2016-10-24 11:39:18 -04:00
Drew DeVault
8e31965fb4 Refactor beatmap import secondary process 
Doesn't launch a new game window and now supports several files at once.
 2016-10-24 11:39:18 -04:00
Drew DeVault
9426629853 Don't crash if you leave and return to song select 
During visual tests
 2016-10-24 11:39:18 -04:00
Dean Herbert
9a66d766e9 Don't bail on no beatmaps in database. 2016-10-24 11:39:18 -04:00
Drew DeVault
9b88798274 Fix up padding on song select 
@peppy btw scrolling beyond the ends of the ScrollContainer behaves
weirdly for this container
 2016-10-24 11:39:18 -04:00
Drew DeVault
05d803483f Fix width of beatmaps 2016-10-24 11:39:18 -04:00
Drew DeVault
07e44560be Use beatmap author in listing 2016-10-24 11:39:18 -04:00
Drew DeVault
7a22c60c7c Get some more of the design's layout in place 2016-10-24 11:39:18 -04:00
Drew DeVault
e13374ed23 Tweak layout of beatmap groups 2016-10-24 11:39:18 -04:00
Drew DeVault
3d53af155f Add background to song select 2016-10-24 11:39:18 -04:00
Drew DeVault
71f58285fc Add selection interactions 2016-10-24 11:39:18 -04:00
Drew DeVault
bc6e705e2b Add test case for song selection 2016-10-24 11:39:18 -04:00
Drew DeVault
d21b7f0050 Fix up song select based on upstream changes 2016-10-24 11:39:18 -04:00
Drew DeVault
22fdb3e49a Adjust PlaySongSelect to match UI standards 2016-10-24 11:39:11 -04:00
Drew DeVault
674f624bfc Improve song selection layout, database loading 
Also adds event that notifes the song select when a beatmap is added.
 2016-10-24 11:39:11 -04:00
Drew DeVault
a14edc06c8 Pull beatmap list from db and render simple list 2016-10-24 11:39:11 -04:00
Dean Herbert
1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09:00
Dean Herbert
bd1a1644fd Fix window size saving to config incorrectly. 2016-10-23 01:35:11 +09:00
Dean Herbert
e4c74f9c77 Merge remote-tracking branch 'upstream/master' into general-fixes 2016-10-22 23:54:12 +09:00
Dean Herbert
baf68ba593 Merge pull request #99 from Tom94/general-improvements 
Fix secondary volume meters showing an incorrect volume until changed.
 2016-10-22 23:51:14 +09:00
Thomas Müller
7ced6046d7 Fix secondary volume meters showing an incorrect volume until changed. 2016-10-22 14:33:43 +02:00
Dean Herbert
3ce93608fb Fix one remaining FlowContainer. 2016-10-22 19:37:27 +09:00
Dean Herbert
808d5c75fb Fix unused field warning. 2016-10-22 19:08:40 +09:00
Dean Herbert
9021042d93 Fix CircularContainer usage. 2016-10-22 18:40:04 +09: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
Dean Herbert
43f0409893 Start to structure flow of information in Player. 
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
 2016-10-19 19:44:03 +09:00
Dean Herbert
e78e0d37b4 Make playfield dark, not light. No masking either. 2016-10-19 18:15:49 +09:00
Dean Herbert
a1d961dc87 Make the Player class more friendly and add a test case. 2016-10-19 18:00:35 +09:00
Dean Herbert
94968a8b7c Add initial implementation of osu! HitCircle. 2016-10-19 16:19:01 +09:00
Dean Herbert
ee463dc65c Merge pull request #77 from NeoAdonis/counters-a 
Rolling counters
 2016-10-19 15:06:00 +09:00
Dean Herbert
c81c4cbbcd Fix missing Metadata initialisation. 2016-10-19 12:28:48 +09:00
Dean Herbert
6705902710 Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes 2016-10-19 12:22:16 +09:00
Drew DeVault
7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
Drew DeVault
768dd38fa0 s/AddBeatmap/ImportBeatmap/g 2016-10-18 15:42:07 -04:00
Drew DeVault
105bba6178 Rework duplicate detection in AddBeatmap 2016-10-18 15:41:46 -04:00
Drew DeVault
ad14462369 Add lifecycle management to BeatmapDatabase 2016-10-18 15:38:59 -04:00
Drew DeVault
8ca4a2067e $(SolutionDir) 2016-10-18 13:58:24 -04:00
Drew DeVault
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04: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
Adonais Romero González
eeacd85073 Protect RollingCounter props 2016-10-17 21:40:50 -05:00
Dean Herbert
cce2094392 Framework update. 2016-10-18 11:20:16 +09:00
Adonais Romero González
5abc3ba898 Merge remote-tracking branch 'upstream/master' into counters-a 2016-10-17 20:36:04 -05:00
Dean Herbert
bfbc26738c Merged branch master into round_masking 2016-10-17 12:08:31 +09: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
Adonais Romero González
72c4dc344e Misc. fixes and improvements 2016-10-16 18:30:25 -05:00
Adonais Romero González
a671765a4f Modified ManiaComboCounter behavior 
This to match more with the current behavior in osu!mania.
 2016-10-16 17:45:37 -05:00
Adonais Romero González
2c06764b79 Better safe than sorry 2016-10-16 17:10:08 -05:00
Thomas Müller
53076f6446 Modify osu! logo to use new CircularContainer. 2016-10-16 19:26:56 +02: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
Dean Herbert
02dc8dc167 Change the way VolumeControl handles global input. 2016-10-16 21:57:15 +09:00
Thomas Müller
b3e531b98c Remove implementation of WedgedBox and use Shear transformation instead. 2016-10-16 14:10:24 +02:00
Thomas Müller
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
Dean Herbert
620c4e6ab7 Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes 2016-10-16 18:24:10 +09:00
Huo Yaoyuan
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
Dean Herbert
4edefb935c Improve the initialisation logic of OsuGameBase. 2016-10-16 17:33:53 +09:00
Adonais Romero González
15c6a563be Moved ComboResultCounter to right namespace 2016-10-15 22:24:03 -05:00
Adonais Romero González
862dc1d7c7 Tidying code and restricting methods 2016-10-15 19:07:07 -05:00
Adonais Romero González
84dcb63ad2 Changed ComboCounter format... 
...to improve value management.
 2016-10-15 18:06:31 -05:00
Adonais Romero González
10b47859c3 Delay order on StarCounter changed 2016-10-15 18:04:00 -05:00
Adonais Romero González
0ceb72ba42 More refactoring 2016-10-15 15:16:02 -05:00
Adonais Romero González
a15f4cda44 Tidying 2016-10-15 15:03:51 -05:00
Adonais Romero González
c268500f89 Minor variable change 2016-10-15 14:01:11 -05:00
Adonais Romero González
2625d06553 Why calling StopAnimation() on StarCounter's ctor()? 2016-10-15 13:53:39 -05:00
Adonais Romero González
9241287c79 Merge branch 'master' into counters-a 2016-10-15 13:45:55 -05:00
Dean Herbert
7a4bbb6921 Merge pull request #80 from autismpp/logger 
Replace Console.WriteLine with Logger.Log.
 2016-10-15 23:02:24 +09:00
Thomas Müller
1d8ff5fe46 Use circular hover region for osu! logo. 2016-10-15 15:31:16 +02:00
autismpp
7276038ca7
Replace Console.WriteLine with Logger.Log. 2016-10-15 06:13:50 +03:00
Adonais Romero González
6bd3eaf37d Changes according to review + Refactor 2016-10-14 18:23:27 -05:00
Dean Herbert
123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up 
Strongly type specifications
 2016-10-14 18:57:42 +09:00
Huo Yaoyuan
cb54d33c6e Make converter instance per-convert. 2016-10-14 17:48:07 +08:00
Dean Herbert
c3b745bfef Merge pull request #57 from UselessToucan/VolumeControl 
VolumeControl: add controls for Effects and Music
 2016-10-14 15:50:45 +09:00
TocoToucan
ade925937a Set text position using Origin property 2016-10-14 09:46:40 +03:00
Adonais Romero González
53cd698b3a Merge branch 'master' into counters-a 2016-10-13 22:57:24 -05:00
Dean Herbert
6597b09a55 Merge pull request #79 from peppy/general-fixes 
Update framework version.
 2016-10-14 12:54:52 +09:00
Adonais Romero González
edbbe8daef Delete unnecessary class attributes 2016-10-13 22:54:02 -05:00
Dean Herbert
8c7ff58310 Fix regressions caused by overlay class. 2016-10-14 12:50:03 +09:00
John Leuenhagen
fedfb8a22a
Converted all .cs files to use CRLF line endings. 2016-10-13 23:33:58 -04:00
Dean Herbert
b425d14ea1 Merge pull request #73 from huoyaoyuan/overlay 
Overlay proposals
 2016-10-14 10:49:13 +09:00
Adonais Romero González
9ccff6ec48 Tidying up 2016-10-13 19:50:06 -05:00
Adonais Romero González
0deb5b4e22 Removed unneeded vars 2016-10-13 18:07:06 -05:00
Adonais Romero González
69621eb6d3 Star animation delay micro fix 2016-10-13 18:00:36 -05:00
Adonais Romero González
f10a03dcef Merge with master 2016-10-13 17:20:35 -05:00
Adonais Romero González
ce07a45456 Improved code 2016-10-13 17:13:20 -05:00
Huo Yaoyuan
254cc87578 Use name ToggleVisibility. 2016-10-14 05:02:13 +08:00
TocoToucan
8cca8861fa Fix formatting 2016-10-13 19:11:51 +03:00
TocoToucan
7d27406131 Fix merge conflict in osu.Game/osu.Game.csproj 2016-10-13 18:23:50 +03:00
Huo Yaoyuan
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
TocoToucan
d5cb331eb3 Unsubscribe from ValueChanged events 2016-10-13 17:52:49 +03:00
Drew DeVault
25d08c8e2c Improve beatmap loading and hydration 2016-10-13 10:29:30 -04: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
Drew DeVault
fd10e6e582 Copy imported beatmaps into beatmap storage 2016-10-13 10:15:08 -04:00
Huo Yaoyuan
ac66c08991 Make converter per-instance. 2016-10-13 21:55:49 +08:00
Huo Yaoyuan
aad5c6a44d Use DateTimeOffset for message timestamp. 2016-10-13 21:42:51 +08:00
Huo Yaoyuan
45a9249306 Move implementation of HitRender.Converter to base class using an abstract Converter property. 2016-10-13 21:14:18 +08:00
Huo Yaoyuan
80d5fa7243 Specify HitObjectConvertException. 2016-10-13 20:53:42 +08:00
Dean Herbert
5e3e949fd6 Revert all counter commits. Requires much further review. 2016-10-13 14:45:41 +09:00
Dean Herbert
fde3ab420a Merge branch 'master' 
Conflicts:
	osu.Game/osu.Game.csproj
 2016-10-13 12:23:36 +09:00
Dean Herbert
edd8f3871e Add TODO regarding parsing. 2016-10-13 12:19:20 +09:00
Drew DeVault
65e3e13aa2 Fix reference paths in osu.Game.csproj 2016-10-13 12:19:15 +09:00
Drew DeVault
deff5ad61e Use @strings where appropriate 2016-10-13 12:19:10 +09:00
Drew DeVault
dd86e75ea7 Minor fixes 2016-10-13 12:19:06 +09:00
Drew DeVault
ddac0e8c8f Update osu-framework 2016-10-13 12:18:23 +09:00
Drew DeVault
45c0bc5428 Import beatmaps into the database via IPC 2016-10-13 12:18:17 +09:00
Drew DeVault
3a163de0f7 Follow changes to osu-framework 2016-10-13 12:18:10 +09:00
Drew DeVault
94f2898f52 Implement beatmap sending/receiving over IPC 2016-10-13 12:18:04 +09:00
Drew DeVault
c7d12bc072 Remove unnecessary setters 2016-10-13 12:17:58 +09:00
Drew DeVault
880399f5a5 Fix casing on private properties 2016-10-13 12:17:52 +09:00
Drew DeVault
dc4bd48f29 Fix casing issues 
Cheers @RemieRichards
 2016-10-13 12:17:46 +09:00
Drew DeVault
c39179d299 Add test for hit objects 2016-10-13 12:17:40 +09:00
Drew DeVault
7a4501323b Decode beatmap colours 2016-10-13 12:17:35 +09:00
Drew DeVault
c0022f3515 Add more tests for legacy decoder 2016-10-13 12:17:31 +09:00
Drew DeVault
30f2eeda7c Implement IDisposable in ArchiveReaders 2016-10-13 12:17:18 +09:00
Drew DeVault
0267eb7649 Fixup 2016-10-13 12:17:13 +09:00
Drew DeVault
4851f49ad5 Add basic osu! hit object parsing 2016-10-13 12:17:08 +09:00
Drew DeVault
9b4bc3e36d Implement most of the legacy beatmap decoder 
Missing timing points, events, and hit object decoders remain to be
written
 2016-10-13 12:17:03 +09:00
Drew DeVault
32ab8f97bb Add more decoding (including full BeatmapMetadata) 2016-10-13 12:16:58 +09:00
Drew DeVault
2a3f047895 Start implementing legacy decoder 2016-10-13 12:16:48 +09:00
Adonais Romero González
1d8d2fa9c9 Implicit base() 2016-10-12 21:46:51 -05:00
Adonais Romero González
8f0093f133 Comments in StarCounter 2016-10-12 21:36:52 -05:00
Adonais Romero González
55420d4356 Improvements in transformCount handling 2016-10-12 21:33:55 -05:00
Adonais Romero González
bf832ebe71 uint for ids 2016-10-12 21:03:41 -05:00
Adonais Romero González
71d7de5326 Leading zeroes now part of ScoreCounter ctor 2016-10-12 20:57:06 -05:00
Adonais Romero González
73e4359e9d Adjusted StarCounter ctor 2016-10-12 20:51:50 -05:00
Dean Herbert
2566d6bfe0 Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Adonais Romero González
e9a38f0c4d Fixed some animations 2016-10-12 17:24:06 -05:00
Adonais Romero González
fa67ab86ed Adjusted Combo Counter animation 2016-10-12 15:28:24 -05:00
Adonais Romero González
11e0429fd3 Children creation off-load to ctors 2016-10-12 14:38:48 -05:00
Adonais Romero González
798e7241d8 Make counters work again 2016-10-12 14:33:04 -05:00
TocoToucan
059e2a3c5a Improve appearing of the volume meters 2016-10-12 22:17:53 +03:00
Dean Herbert
8707c7f746 Fix regression causing multi-line (wrapped) chat messages to overlap. 2016-10-13 03:06:06 +09:00
TocoToucan
00db36fdbe Update code in accordance with the code review 2016-10-12 20:45:42 +03:00
TocoToucan
ce391301fa Merge VolumeControl.cs 2016-10-12 19:17:53 +03:00
Drew DeVault
c9a057b510 Update AddBeatmap accordingly 2016-10-12 11:32:40 -04:00
Drew DeVault
e9a45de51f Refactor database to reuse existing types 2016-10-12 11:32:40 -04:00
Drew DeVault
23bc26ddac Implement OszArchiveReader 2016-10-12 11:32:40 -04:00
Drew DeVault
bc69aa1455 Initial support code for beatmap loading 2016-10-12 11:32:40 -04:00
Drew DeVault
768c3bc31e Use PlayMode instead of GameMode 2016-10-12 11:32:40 -04:00
Drew DeVault
005dc9e8cb Drop GameMode 2016-10-12 11:32:40 -04:00
Drew DeVault
e8de245032 Use @strings 2016-10-12 11:32:40 -04:00
Drew DeVault
f6b6446a9c MetadataID -> BeatmapMetadataID 2016-10-12 11:32:27 -04:00
Drew DeVault
72c4a26aea Move control of databases into osu-framework 2016-10-12 11:32:27 -04:00
Drew DeVault
2d810f72fa Add initial DB schema and support code 2016-10-12 11:32:07 -04:00
TocoToucan
06288d3f7c Change "Master" volume if particular meter is not selected. 2016-10-12 17:36:42 +03: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
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