h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 11:03:22 +08:00
Code Issues Releases Wiki Activity
389 Commits 3 Branches 657 Tags 358 MiB
29b67334c6
Commit Graph

279 Commits

Author SHA1 Message Date
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
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
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
af76dc09d3 Move direction declaration to usage. 2016-10-12 15:33:04 +09:00
Dean Herbert
f737090c6b Make CentreTarget public. 2016-10-12 15:28:28 +09:00
Dean Herbert
1c0b769451 Centralise the maximum chat history variable. 2016-10-12 15:25:07 +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
79b62d4373 Merge remote-tracking branch 'refs/remotes/upstream/master' 
Conflicts:
	osu-framework
	osu.Desktop.VisualTests/Program.cs
 2016-10-12 15:20:23 +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
Drew DeVault
5306141f5f Merge pull request #49 from NeoAdonis/counters 
Rolling counters (initial)
 2016-10-11 15:04:46 -04:00
TocoToucan
f3c1c60ab7 Change volume in VolumeMeter 2016-10-10 17:19:05 +03:00
Adonais Romero González
2954c19345 Misc. fixes 2016-10-09 15:19:35 -05:00
Adonais Romero González
4d0c8ed441 StarAnimationEasing 2016-10-09 14:55:50 -05:00
Adonais Romero González
fd1cbfd8fa Hide VisibleCount from transformStar 2016-10-09 14:53:06 -05:00
Adonais Romero González
01da3ca474 More line wrapping 2016-10-09 14:48:24 -05:00
Adonais Romero González
841707b61f Not animate stars over MaxStars 2016-10-09 14:09:07 -05:00
Adonais Romero González
707effb591 Completed StarCounter 
More complex than the other counters, but hopefully functional.
I subestimated you and your silly bouncing animations.
>.>
 2016-10-09 14:02:44 -05:00
TocoToucan
89d7de31ee VolumeControl: add controls for Effects and Music 2016-10-09 20:45:34 +03:00
Thomas Müller
c62f29dcae Merge branch 'master' of github.com:ppy/osu into general-improvements 2016-10-09 16:02:35 +02:00
Thomas Müller
9ed0748d73 No need to enforce scheduling of task anymore. 2016-10-09 15:40:32 +02:00
Dean Herbert
cb5e4287e2 Post-merge fixes. 2016-10-09 22:21:44 +09:00
Dean Herbert
25de055802 Merge branch 'master' into stateful-drawables 
Conflicts:
	osu.Game/GameModes/Menu/Intro.cs
 2016-10-09 22:08:32 +09:00
Thomas Müller
934523e347 Update framework version. 2016-10-09 13:31:16 +02:00
Thomas Müller
dd04b33232 Use AddInternal instead of AddTopLevel. 2016-10-09 20:06:23 +09:00
Thomas Müller
bcb5a02221 Don't rely on return value of Container.Add. 2016-10-09 20:06:20 +09:00
Thomas Müller
d9486e790a Use AddInternal instead of AddTopLevel. 2016-10-09 11:56:41 +02:00
Thomas Müller
99c8f618af Don't rely on return value of Container.Add. 2016-10-09 11:55:52 +02:00
Dean Herbert
76f1653090 Merge pull request #53 from Tom94/use_drawable_scheduler 
Use drawable scheduler
 2016-10-09 15:25:22 +09:00
Adonais Romero González
67d3d772f6 Minor fix with StarCounter width 2016-10-08 22:15:25 -05:00
Adonais Romero González
37115c8c9f Merge branch 'master' into counters 2016-10-08 22:02:43 -05:00
Adonais Romero González
accf365fd1 More styling. 2016-10-08 21:58:53 -05:00
Adonais Romero González
0d18680eeb StarCounter styling using absolute positioning. 2016-10-08 21:45:01 -05:00
Adonais Romero González
5ebb2fc289 Refactor + Stars Counter (initial) 
Moved a few things to allow using common transforms
for a star counter. This implementation is basic and
hacky, but good enough as proof of concept.
 2016-10-08 19:11:01 -05: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
97c2dcf590 Use PaddingContainer for better layout. 2016-10-08 23:25:38 +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
1e9e52aecc osuLogo handles less keys. 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
3067c890ce General improvements to chat querying and logic organisation. 2016-10-08 19:23:21 +09:00
Dean Herbert
5ff3767038 Fix typo in comment. 2016-10-08 19:18:50 +09:00
Dean Herbert
5a507838d6 Fix event not being unbound. 2016-10-08 19:12:31 +09:00
Thomas Müller
0c793dfe69 Use own Scheduler instead of Game.Scheduler. 2016-10-08 11:33:24 +02:00
Dean Herbert
556420ee58 Add proper toolbar state handling. 2016-10-08 15:54:09 +09:00
Dean Herbert
27a26cfaaf Ensure the correct background state is restored when skipping multiple levels 2016-10-08 15:54:09 +09:00
Dean Herbert
93f326bb9b Fix welcome sound being played twice. 2016-10-08 15:54:08 +09:00
Dean Herbert
243d2cdec5 Block window closing while intro is playing. 2016-10-08 15:54:07 +09:00
Dean Herbert
f2f3b69eee BackgroundModes shouldn't handle the escape key themselves. 2016-10-08 15:54:07 +09:00
Dean Herbert
08728b84d1 Make sure intro can't be exited unless the main menu has displayed once. 2016-10-08 15:54:06 +09:00
Dean Herbert
c5228b63cb Unify and smiplify exit logic. Now only OsuGame calls the final Exit. 2016-10-08 15:54:05 +09:00
Dean Herbert
c5ac851ba9 Add the ability to exit the game using escape. 2016-10-08 15:54:05 +09:00
Dean Herbert
b2d899feb5 Add basic intro sequence. 2016-10-08 15:54:04 +09:00
Dean Herbert
a5adbc0615 Update namespace references. 2016-10-08 15:54:02 +09:00
Dean Herbert
065b193b15 Fix the initial state of VolumeControl being wrong. 2016-10-08 15:54:01 +09:00
Dean Herbert
bdb72d7b82 Add basic VolumeControl and saving of volume to config. 2016-10-08 15:54:00 +09:00
Dean Herbert
e25e7319e9 Add sample usage of PlayMode bindable. 2016-10-08 15:54:00 +09:00
Dean Herbert
5ff9d828eb Add KeyCounter to Player for fun. 2016-10-08 15:53:59 +09:00
Dean Herbert
10468a566c Add some comments about future usage. 2016-10-08 15:53:58 +09:00
Dean Herbert
d1dfa120d1 Move BackgroundModes to their own files. 2016-10-08 15:53:57 +09:00
Dean Herbert
d6042bd689 Add intro and begin to create central logic nest. 2016-10-08 15:53:56 +09:00
Dean Herbert
9b76a0ffb8 Expose CursorContainer. 2016-10-08 15:53:55 +09:00
Dean Herbert
a23ca25e7d Remove unusable "tests" button from main menu system. 2016-10-08 15:53:54 +09:00
Dean Herbert
75c97a62e3 Add main menu music back. 2016-10-08 15:53:53 +09:00
Adonais Romero González
a3b4a34a1a TestCase buttons + minor fixes 2016-10-07 17:15:36 -05:00
Adonais Romero González
7277cf5af1 Reflection to simplify transforms + some refactoring 2016-10-07 16:59:52 -05:00
Adonais Romero González
965e542eaf Line wrapping 2016-10-07 16:14:35 -05:00
Adonais Romero González
35325fab95 Licence added 2016-10-07 02:24:46 -05:00
Adonais Romero González
00cfc51004 Rolling counters (initial) 2016-10-07 02:05:02 -05:00
Dean Herbert
b588f28856 Make play modes display playfield. 2016-10-05 20:49:31 +09:00
Dean Herbert
c0f25a2683 Improve white-boxed game modes. 2016-10-05 20:08:58 +09:00
Dean Herbert
4eb310c3a5 Remove unused button state. 2016-10-05 20:07:15 +09:00
Dean Herbert
698c1ef1ae Fix width of toolbar buttons with text. 2016-10-05 20:07:10 +09:00
Dean Herbert
03aea04a00 Add BackgroundMode stack. 2016-10-05 20:06:55 +09:00