h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 03:52:55 +08:00
Code Issues Releases Wiki Activity
55,741 Commits 3 Branches 657 Tags 364 MiB
9c4ae768f1
Commit Graph

35524 Commits

Author SHA1 Message Date
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
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
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
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
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
Dean Herbert
665352f706 Improve the transition and look of white-boxed game modes. 2016-10-01 17:01:09 +09:00
Dean Herbert
0178e23b73 Ensure we always remain fully visible on any aspect ratio (including very tall ones). 2016-09-30 18:46:34 +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
463f606004 Add delay for exit process. 2016-09-30 13:31:05 +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
a114463678 Add null check. 2016-09-29 23:52:51 +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
ae6fb0553d Add contains override to allow correct rendering by CursorContainer on window bounds. 2016-09-29 23:46:30 +09:00
Dean Herbert
a69c5b4fc0 Fix a few warnings. 2016-09-29 23:46:27 +09:00
Dean Herbert
7dcf2c6269 Add TestCase for main menu ButtonSystem. 2016-09-29 23:46:24 +09:00
Dean Herbert
7c98ef1b3d Move initialisation of ChatLine to Load. 2016-09-28 16:33:20 +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
aad58532ec Remove getter on Objects. 2016-09-28 15:49:47 +09:00
Dean Herbert
67652a6d8e Improve formatting of chat lines. 2016-09-27 20:45:26 +09:00
Dean Herbert
754d9c78bd Simple chat message display functionality. 2016-09-27 19:22:22 +09:00
Dean Herbert
154b914a3a Fix API scheduling. 2016-09-27 19:22:08 +09:00
Dean Herbert
28045b7136 Add back basic API support for channel/message retrieval. 2016-09-27 18:33:52 +09:00
Huo Yaoyuan
25fecfca06 Relative size and position for text layer. 2016-09-26 16:56:39 +08:00
Huo Yaoyuan
bb13da2b32 Add ResetCount method for Counter. 2016-09-26 14:23:22 +08:00
Huo Yaoyuan
b4bb3d6317 Update private methods implementation. 2016-09-26 14:21:40 +08:00
Huo Yaoyuan
756e7a6a67 Add missing lincense header, remove unnecessary comment and field. 2016-09-26 14:21:25 +08: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
ec2bc4720d Comma seperator in numbers. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ed4fae53cb Add FadeTime and allow setting custom styles directly from container. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
f4ac1f630d Adjust visual tree of counter. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
0da0d4f35e Avoid accessing container in each counter. 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
16f1dff849 Make counter public. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
d8666deaa0 IsLit Adjustment. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ba19fe1b97 Move IsCounting to KeyCounter. 2016-09-24 19:46:10 +08:00
Huo Yaoyuan
409bb0d068 Counter animation. 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
e5ef3e1d02 Adjust children position of Counter. 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
9891e72114 Fix indentation. 2016-09-24 15:35:27 +09:00
Dean Herbert
c64dfca82e Remove silly textboxes. 2016-09-24 00:09:59 +09:00
Dean Herbert
f936618156 Add back TextAwesome and osu!font. 2016-09-24 00:05:09 +09:00
Dean Herbert
997c6f45f6 Update framework again. 2016-09-21 17:37:33 +09:00
Dean Herbert
33e46facec Use children for initialisation. 2016-09-21 13:25:23 +09:00
Dean Herbert
3a5f37444c Add back Playfield masking. 2016-09-21 13:21:55 +09:00
Dean Herbert
1712a142a5 Add proper HitObject expiration. 2016-09-21 13:12:15 +09:00
Dean Herbert
f1688499e4 Bring framework up-to-date. 2016-09-21 13:12:05 +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
Dean Herbert
b2e7f290f2 Fix window size. 2016-09-20 16:26:07 +09:00
Dean Herbert
b9de26aa26 Framework updates. 2016-09-20 14:41:55 +09:00
Remie Richards
3b1ef0b991 Reverts a small bandaid fix that's no longer necessary relating to the order in which osulogo is initialised. 2016-09-19 01:57:15 +01:00
Remie Richards
3c297064b6 Fixes invalid button scaling, Fixes invalid button location (they were oddly shifted to the right) 2016-09-19 01:47:14 +01:00
Remie Richards
320f76d860 Fixes over-scaling, Brings osu! logo back to the front 2016-09-19 01:35:50 +01:00
Remie Richards
80dfad9af9 Missed an extra set of () on an object initialiser 2016-09-18 20:49:01 +01:00
Remie Richards
314b0dfc04 Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency 2016-09-18 20:41:53 +01:00
Remie Richards
4732a4db19 An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end. 2016-09-18 16:42:59 +01:00
Remie Richards
f2fa9f611a Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs 2016-09-17 22:11:27 +01:00
Remie Richards
4754c0e2d1 Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface 2016-09-17 21:54:52 +01:00
Remie Richards
1a5c2b5221 Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax 2016-09-17 21:33:46 +01:00
Dean Herbert
36ae4dd271 Fix osu! playfield (was using inheriting sizemode when it shouldn't). 2016-09-15 23:58:02 +09:00
Dean Herbert
375406bc97 Bring framework up-to-date. 2016-09-11 17:23:43 +09:00
Dean Herbert
4a85d8627d Update to latest framework version. 2016-09-11 03:04:47 +09:00
Dean Herbert
851ef4fbbf Framework updates. 2016-09-11 02:27:42 +09:00
Dean Herbert
b6bbea392b Merge branch 'general-fixes' into beatmap_framework 
Conflicts:
	osu-framework
 2016-09-11 02:24:15 +09:00
Dean Herbert
842fb1892f Update to latest framework version. 2016-09-11 02:23:26 +09:00
Dean Herbert
753a67fb3d Update to use new transform logic. 2016-09-06 21:42:45 +09:00
Dean Herbert
9e76feb159 Add remaining HitRenderers. 
Many general improvements.
 2016-09-06 21:42:45 +09:00
Dean Herbert
97d101310d Make OsuPlayfield box a bit larger. 2016-09-06 21:42:45 +09:00
Dean Herbert
024ae1d1c2 Move playfields to own class. 2016-09-06 21:42:45 +09:00
Dean Herbert
93744f7372 Add basic TaikoHitRenderer. 2016-09-06 21:42:45 +09:00
Dean Herbert
677a1b0e56 Add basic box background to OsuPlayfield. 2016-09-06 21:42:45 +09:00
Dean Herbert
2ea5a5c675 Add basic HitRenderer framework. 2016-09-06 21:42:45 +09:00
Dean Herbert
ec25a50249 Add basic structure for catch mode objects. 2016-09-06 21:41:16 +09:00
Dean Herbert
49110cf8d8 Add mania Note and HoldNote. 2016-09-06 21:41:16 +09:00
Dean Herbert
0a0c8e2014 Fix some base classes not being abstract. 2016-09-06 21:41:16 +09:00
Dean Herbert
c75d74c84c Taiko notes should have scale, not bool Big. 2016-09-06 21:41:16 +09:00
Dean Herbert
cf12f4764f Add basic structure for osu! mode objects. 2016-09-06 21:41:16 +09:00
Dean Herbert
9d6b19a2ee Add duration to BaseHit. 2016-09-06 21:41:16 +09:00
Dean Herbert
7cee44ab1d HitObject -> HitBase. Also add BaseHits for each game mode. 2016-09-06 21:41:16 +09:00
Dean Herbert
016521240a Add playtest class. 2016-09-06 21:41:16 +09:00
Dean Herbert
ef98e4ee3c Move beatmap metadata to separate class. 2016-09-06 21:41:16 +09:00
Dean Herbert
abe8ff21f6 Add more timing and sample related classes. 2016-09-06 21:41:16 +09:00
Dean Herbert
3098204dda Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00
Dean Herbert
7e3d2ebe80 Update nuget packages and framework reference once more. 2016-09-06 20:41:18 +09:00
Dean Herbert
49a0e3d9ac Framework namespace rename. 2016-09-04 18:32:19 +09:00
Dean Herbert
7254c31a92 Drawable is abstract, let's not instantiate it. 2016-09-04 18:32:14 +09:00
Dean Herbert
23111821f5 Update naming conventions. 2016-09-04 18:31:58 +09:00
smoogipooo
59a69ca59c Remove unused System.Drawing reference. 2016-09-03 23:02:55 +09:30
smoogipooo
dde748b8c1 Fix loaded not being set on textbox Load. 2016-09-03 21:18:07 +09:30
Dean Herbert
7d9cb85289 Hook up new TextInputSource to TextBox. 2016-09-02 14:41:42 +09:00
Dean Herbert
ebd15d6f7c Remove System.Drawing dependency. 2016-09-02 14:30:08 +09:00
Dean Herbert
49a4d64fad Fix TextBox always taking keyboard focus. 2016-09-01 22:55:02 +09:00
Dean Herbert
600223a65c Add proper keyboard sound effects back. 2016-09-01 22:51:45 +09:00
Dean Herbert
923fc228e9 Fix cursor horizontal position. 2016-09-01 22:51:03 +09:00
Dean Herbert
a2fc339a45 Update Transforms to new style. 2016-09-01 22:51:03 +09:00
Dean Herbert
586aaad2b0 Add sample TextBox and SpriteText to MainMenu for comparison. 2016-09-01 22:51:03 +09:00
Dean Herbert
41c03ab255 Move ctor content to Load(). Schedule some prop updates. 2016-09-01 22:51:03 +09:00
Dean Herbert
7f0212f93f TextSize -> SpaceWidth (temporary). 2016-09-01 22:51:03 +09:00
Dean Herbert
b3e2339175 Make TextBox rendering work again. 2016-09-01 22:51:03 +09:00
Dean Herbert
6e836708bd Remove unnecessary file extension. 
# Conflicts:
#	osu.Game/GameModes/Menu/MainMenu.cs
 2016-09-01 22:47:48 +09:00
Dean Herbert
af3e024c7b Update SampleManager Get method call. 2016-09-01 22:47:48 +09:00
Dean Herbert
7d2f303e61 Update font logic to override framework default. 
# Conflicts:
#	osu.Game/OsuGame.cs
 2016-09-01 22:47:48 +09:00
Dean Herbert
9585a9105e Update resolution handling logic. 2016-09-01 22:47:48 +09:00
Dean Herbert
cb3dfe094e Add minimum resolution settings. 2016-09-01 22:47:48 +09:00
Huo Yaoyuan
6826391b7a Replace custom delegates by generic delegates. 2016-09-01 00:48:28 +08:00
Dean Herbert
013cf1cf3f Fix broken namespaces. 2016-08-31 20:16:05 +09:00
Dean Herbert
8870935a4b Add basic online API support. 2016-08-31 20:14:01 +09:00
Dean Herbert
e3ec485a9d New style transformations. 2016-08-31 12:23:44 +09:00
Dean Herbert
81f9ce657f License -> Licence. 2016-08-26 17:27:49 +09:00
Dean Herbert
6cbbeaaac0 Initial commit. 2016-08-26 14:41:47 +09:00