h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Code Issues Releases Wiki Activity
45,607 Commits 3 Branches 661 Tags 368 MiB
7db8bdfb7c
Commit Graph

2182 Commits

Author SHA1 Message Date
Dean Herbert
611619fd9c Fix some namespaces. 2016-11-23 12:00:17 +09:00
Thomas Müller
030a20a3f2 Fix minor issues with alpha fading at edges. 2016-11-22 21:58:46 +01:00
Thomas Müller
9bf23bc4ad Only handle beatmap panels that are visible in song select. 2016-11-22 21:41:48 +01:00
Thomas Müller
2596e71494 Improve smooth movement in beatmap carousel. 2016-11-22 20:10:04 +01:00
Dean Herbert
4cf2dd90d6 Standardise and simplify the amount of beatmap information passed around song select. 2016-11-22 22:07:15 +09:00
Dean Herbert
b73cdba08c Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation. 2016-11-22 21:38:46 +09:00
Dean Herbert
3bc38268a0 Make MusicController more async. 2016-11-22 20:47:28 +09:00
Dean Herbert
f576b4bf82 Don't use texture atlases for beatmap backgrounds. 2016-11-22 20:14:58 +09:00
Dean Herbert
0109c79cae Async load of panel backgrounds (failing for on-screen panels). 2016-11-22 19:48:51 +09:00
Dean Herbert
7df8324957 Explicit disposal via using() to WorkingBeatmap. 2016-11-22 14:57:53 +09:00
Dean Herbert
41a84ba00c Add finalizer logic for WorkingBeatmap for now. 2016-11-21 21:35:10 +09:00
Thomas Müller
c6d688898f Initial implementation of a beatmap carousell and various minor improvements to song select. 
No big optimizations yet, but groundwork is laid out.
 2016-11-20 20:34:16 +01:00
Dean Herbert
d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Dean Herbert
06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Huo Yaoyuan
7c8ef2a82b Select and unselect BeatmapPanel when selecting BeatmapGroup. 2016-11-14 04:22:06 +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
18c0e431c1 Fix some nullrefs. 2016-11-12 18:25:58 +09:00
Drew DeVault
d49b418449 Implement ShowUnicode option behavior 2016-11-10 21:35:58 -05:00
Drew DeVault
fe9034323b Get the game running, though not perfectly 2016-11-10 16:42:29 -05:00
Drew DeVault
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Huo Yaoyuan
c59cad2478 AudioEquals method for BeatmapInfo. 2016-11-07 21:52:23 +08:00
Dean Herbert
f14a35d480 Update FontAwesome definitions. 2016-11-07 17:59:00 +09: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
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
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
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
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
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
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
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Dean Herbert
d47924ff7b Fix selection not collapsing when clicking set headers exclusively. 2016-10-29 03:43:52 +09:00
Dean Herbert
eb30882b09 More comments. 2016-10-28 23:40:12 +09:00
Dean Herbert
42ad96778e Tidy shit up; reduce number of unnecssesary events being fired. 2016-10-28 23:29:21 +09:00
Dean Herbert
5dc495e41d Avoid accessing the beatmap too early. 2016-10-28 21:08:32 +09: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
Dean Herbert
74f1a9622f Add initial game-wide beatmap flow. 2016-10-28 19:55:48 +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
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
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
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
Drew DeVault
55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -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
8d4a211419 Fix initialization of BeatmapInfo 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
d21b7f0050 Fix up song select based on upstream changes 2016-10-24 11:39:18 -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
808d5c75fb Fix unused field warning. 2016-10-22 19:08:40 +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
94968a8b7c Add initial implementation of osu! HitCircle. 2016-10-19 16:19:01 +09:00
Drew DeVault
7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
Drew DeVault
105bba6178 Rework duplicate detection in AddBeatmap 2016-10-18 15:41:46 -04:00
Drew DeVault
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
Dean Herbert
123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up 
Strongly type specifications
 2016-10-14 18:57:42 +09:00
John Leuenhagen
fedfb8a22a
Converted all .cs files to use CRLF line endings. 2016-10-13 23:33:58 -04:00
Drew DeVault
25d08c8e2c Improve beatmap loading and hydration 2016-10-13 10:29:30 -04:00
Drew DeVault
fd10e6e582 Copy imported beatmaps into beatmap storage 2016-10-13 10:15:08 -04:00
Huo Yaoyuan
80d5fa7243 Specify HitObjectConvertException. 2016-10-13 20:53:42 +08: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
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
45c0bc5428 Import beatmaps into the database via IPC 2016-10-13 12:18:17 +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
Dean Herbert
2566d6bfe0 Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09: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
005dc9e8cb Drop GameMode 2016-10-12 11:32:40 -04:00
Drew DeVault
2d810f72fa Add initial DB schema and support code 2016-10-12 11:32:07 -04:00
Dean Herbert
f0284ce57c Use the old naming style for now. 2016-09-26 15:07:29 +09:00
Dean Herbert
e0c06a4f19 Merge branch 'refs/heads/general-fixes' into beatmap_framework 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/FieldTest.cs
#	osu.Game/GameModes/FontTest.cs
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/Graphics/UserInterface/TextBox.cs
#	osu.Game/OsuGame.cs
#	osu.Game/osu.Game.csproj
 2016-09-20 16:36:42 +09:00
Dean Herbert
ec25a50249 Add basic structure for catch mode objects. 2016-09-06 21:41:16 +09:00
Dean Herbert
49110cf8d8 Add mania Note and HoldNote. 2016-09-06 21:41:16 +09:00
Dean Herbert
0a0c8e2014 Fix some base classes not being abstract. 2016-09-06 21:41:16 +09:00
Dean Herbert
c75d74c84c Taiko notes should have scale, not bool Big. 2016-09-06 21:41:16 +09:00
Dean Herbert
cf12f4764f Add basic structure for osu! mode objects. 2016-09-06 21:41:16 +09:00
Dean Herbert
9d6b19a2ee Add duration to BaseHit. 2016-09-06 21:41:16 +09:00
Dean Herbert
7cee44ab1d HitObject -> HitBase. Also add BaseHits for each game mode. 2016-09-06 21:41:16 +09:00
Dean Herbert
ef98e4ee3c Move beatmap metadata to separate class. 2016-09-06 21:41:16 +09:00
Dean Herbert
abe8ff21f6 Add more timing and sample related classes. 2016-09-06 21:41:16 +09:00
Dean Herbert
3098204dda Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00