RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
326 Commits 4 Branches 650 Tags 351 MiB
Commit Graph

70 Commits

Author SHA1 Message Date
Huo Yaoyuan 1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
Huo Yaoyuan acd54d1ebc Single Visibility enum type. 2016-10-13 22:22:27 +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
Drew DeVault 65e3e13aa2 Fix reference paths in osu.Game.csproj 2016-10-13 12:19:15 +09:00
Drew DeVault 32ab8f97bb Add more decoding (including full BeatmapMetadata) 2016-10-13 12:16:58 +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 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
Adonais Romero González 37115c8c9f Merge branch 'master' into counters 2016-10-08 22:02:43 -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 9594b7193c Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem 2016-10-08 23:27:46 +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 3067c890ce General improvements to chat querying and logic organisation. 2016-10-08 19:23:21 +09:00
Dean Herbert b2d899feb5 Add basic intro sequence. 2016-10-08 15:54:04 +09:00
Dean Herbert bdb72d7b82 Add basic VolumeControl and saving of volume to config. 2016-10-08 15:54:00 +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
Adonais Romero González 00cfc51004 Rolling counters (initial) 2016-10-07 02:05:02 -05:00
Dean Herbert c0f25a2683 Improve white-boxed game modes. 2016-10-05 20:08:58 +09:00
Dean Herbert 03aea04a00 Add BackgroundMode stack. 2016-10-05 20:06:55 +09:00
Dean Herbert cc52580568 Implement mode selector highlight line. 2016-10-04 19:41:18 +09:00
Dean Herbert 11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
Dean Herbert f0681f35c4 Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout 
# Conflicts:
#	osu.Game/OsuGame.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/osu.Game.csproj
 2016-10-01 17:10:27 +09:00
Dean Herbert b110a879a7 Merge branch 'refs/heads/master' into api-channels-messages 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
 2016-10-01 17:05:56 +09:00
Dean Herbert 5afb038025 Use explicit cast to OsuGame rather than in-between derived classes. 
# Conflicts:
#	osu.Game/GameModes/Menu/MainMenu.cs
 2016-10-01 17:02:57 +09:00
Dean Herbert cc14aeb802 Add basic background display system. 2016-09-30 18:45:55 +09:00
Dean Herbert d93718d953 Add template toolbar. 2016-09-30 18:45:27 +09:00
Dean Herbert 357c94ed8a Add OsuGameMode. Standardise naming of classes. 2016-09-30 13:30:55 +09:00
Dean Herbert 643ae0cefe Merge remote-tracking branch 'upstream/master' into beatmap_framework 2016-09-30 00:13:08 +09:00
Dean Herbert b4c9dca54b Merge remote-tracking branch 'upstream/master' into api-channels-messages 
Conflicts:
	osu.Game/Online/Chat/Message.cs
 2016-09-29 23:54:33 +09:00
Dean Herbert 154226b9a3 Basic white-boxing of all game modes. 2016-09-29 23:51:17 +09:00
Dean Herbert 2db962dc33 Add basic tweening mouse cursor. 
# Conflicts:
#	osu-framework
 2016-09-29 23:46:33 +09:00
Dean Herbert 8650e951e5 Merge branch 'refs/heads/master' into api-channels-messages 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
 2016-09-28 16:30:00 +09:00
Dean Herbert eaab1b718e Merge branch 'refs/heads/master' into beatmap_framework 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
 2016-09-28 16:09:26 +09:00
Dean Herbert 67652a6d8e Improve formatting of chat lines. 2016-09-27 20:45:26 +09:00
Dean Herbert 28045b7136 Add back basic API support for channel/message retrieval. 2016-09-27 18:33:52 +09:00
Dean Herbert f0284ce57c Use the old naming style for now. 2016-09-26 15:07:29 +09:00
Dean Herbert ae100e3137 Move PlayTest to the VisualTests project. 2016-09-25 13:59:38 +09:00
Dean Herbert 58ed5c00e4 Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework 
# Conflicts:
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/OsuGame.cs
 2016-09-25 13:40:06 +09:00
Huo Yaoyuan 63535df6dc Fix typo and missnaming. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan c70bf53486 Rename counter classes to avoid confusing. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan 81f269ee69 MouseCount and KeyBoardCount, input handling. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan 55a1a3827a Implement KeyCounter and base Count class. 2016-09-24 19:46:10 +08:00
Dean Herbert 7bdb2fcfc7 Add basic implementation of VisualTest framework for osu! project. 
Comes with one complimentary test.
 2016-09-24 15:47:17 +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