h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 20:47:26 +08:00
Code Issues Releases Wiki Activity
672 Commits 3 Branches 654 Tags 358 MiB
4426a683ed
Commit Graph

499 Commits

Author SHA1 Message Date
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
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
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