h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 10:32:55 +08:00
Code Issues Releases Wiki Activity
23,141 Commits 5 Branches 664 Tags 368 MiB
a842d727c7
Commit Graph

23141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Drew DeVault
8dadc2b215 Merge pull request #63 from peppy/limit-game-access 
Limit game access
 2016-10-12 09:54:00 -04: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
Drew DeVault
fd55199114 Merge pull request #52 from peppy/stateful-drawables 
Stateful drawables & chat control
 2016-10-12 04:55:03 -04: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
Thomas Müller
48bd998f46 Merge pull request #59 from peppy/general-fixes 
Update framework to fix draw order.
 2016-10-10 08:16:52 +02:00
Dean Herbert
4ac2c9ad90 Update framework to fix draw order. 2016-10-10 15:12:21 +09:00
Dean Herbert
8706027155 Merge pull request #54 from SirCmpwn/specify-game-name 
Update osu-framework and specify game name
 2016-10-10 15:03:01 +09:00
Dean Herbert
3f83ffcb99 Bring framework up-to-date with upstream master. 2016-10-10 14:36:27 +09:00
Dean Herbert
0b0e79d29f Merge remote-tracking branch 'upstream/master' into SirCmpwn/specify-game-name 
Conflicts:
	osu-framework
 2016-10-10 14:35:43 +09:00
Dean Herbert
8b06778746 Merge pull request #56 from Tom94/general-improvements 
General improvements
 2016-10-10 14:20:17 +09:00
Dean Herbert
0b08c8ba15 Update framework. 2016-10-10 14:18:06 +09: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
UselessToucan
b004961d07 Merge pull request #2 from ppy/master 
Actualize fork
 2016-10-09 20:34:18 +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
5861e782e5 Update Framework version. 2016-10-09 16:02:25 +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
Dean Herbert
de24c86c81 Merge pull request #55 from Tom94/better-addtarget 
Better addtarget
 2016-10-09 20:13:30 +09: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
36bb4a3988 Don't call Container.Add within KeyCounterCollection.Reset. 2016-10-09 20:06:15 +09:00
Dean Herbert
0a10bf9a51 Update framework. 2016-10-09 20:06:07 +09:00
Thomas Müller
d9486e790a Use AddInternal instead of AddTopLevel. 2016-10-09 11:56:41 +02:00