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

9213 Commits

Author SHA1 Message Date
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 656aee41e2 Never Prefer32bit. 2016-10-08 15:54:04 +09:00
Dean Herbert 4f2bb25853 Remove "Deploy" configuration. 2016-10-08 15:54:03 +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
Dean Herbert e5dc8bad2f Bring up-to-date with latest framework. 2016-10-08 15:53:52 +09:00
Dean Herbert 9ed4da556e Update framework version. 2016-10-08 15:50:46 +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
Dean Herbert eca76c2a81 Merge pull request #46 from peppy/background-stack 
Game Mode Backgrounds & More
 2016-10-07 23:29:15 +09:00
Dean Herbert 2ca7a74e63 Bring framework up-to-date. 2016-10-07 22:54:37 +09: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
Drew DeVault 3c01f59e00 Merge pull request #43 from peppy/toolbar 
Basic toolbar implementation
 2016-10-04 14:30:42 -04:00
Dean Herbert a768e4ec16 Framework update. 2016-10-05 03:27:29 +09:00
Dean Herbert 3891f467a3 Fix being able to click two toolbar buttons at once. 2016-10-04 20:00:55 +09:00
Dean Herbert 836083667f Clean up a bit. 2016-10-04 19:57:32 +09:00
Dean Herbert cc52580568 Implement mode selector highlight line. 2016-10-04 19:41:18 +09:00
Dean Herbert c2d4672b8d Add osu! prefix to mode descriptions. 2016-10-04 19:40:56 +09:00
Dean Herbert 11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
UselessToucan 2f588a2d2c Merge pull request #1 from ppy/master 
Actualize fork
 2016-10-03 18:41:10 +03:00
Dean Herbert 51cf13460f Remove performance overlay. 2016-10-03 23:56:25 +09:00
Dean Herbert ddcd5ec286 Add basic layout for toolbar. 2016-10-03 20:39:32 +09:00
Dean Herbert 2b905df58c Merge pull request #41 from peppy/game-modes-layout 
Basic white-boxing of all game modes.
 2016-10-01 19:33:03 +09:00
Dean Herbert ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert 7db555be5d Move toolbar to OsuGame. 2016-10-01 18:01:52 +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 cdbc47ef7a Merge pull request #40 from peppy/api-channels-messages 
API: channels & messages
 2016-10-01 17:07:05 +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 af91341704 Remove unused variable. 2016-10-01 17:03:47 +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 40e5a449bf Add parallax to ButtonSystem. 2016-10-01 17:02:20 +09:00
Dean Herbert 4ad618abc9 Adjust scale and outwards transition of ButtonSystem. 2016-10-01 17:02:01 +09:00