1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 04:22:54 +08:00
Commit Graph

47065 Commits

Author SHA1 Message Date
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
cd7884f00e More descriptive var names in test 2016-10-12 20:58:43 -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
UselessToucan
7db9e1a8bf Merge pull request #4 from ppy/master
Actualize master
2016-10-12 20:14:24 +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
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