RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
66 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

66 Commits

Author SHA1 Message Date
Dean Herbert 9a5874b063 Merge pull request #27 from RemieRichards/update_to_new_children_syntax 
Updates to latest osu-framework, Updates Load()s to use new Children syntax
 2016-09-19 10:12:54 +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 30db97d72d Updates to latest stable framework version. 2016-09-18 16:29:05 +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
Thomas Müller b52c3074ef Merge pull request #26 from peppy/general-fixes 
Bring framework up-to-date.
 2016-09-11 10:33:06 +02:00
Dean Herbert 375406bc97 Bring framework up-to-date. 2016-09-11 17:23:43 +09:00
Thomas Müller be962e681d Merge pull request #25 from peppy/general-fixes 
Update to latest framework version.
 2016-09-10 20:08:31 +02:00
Dean Herbert 4a85d8627d Update to latest framework version. 2016-09-11 03:04:47 +09:00
Dean Herbert e27eb996bc Merge pull request #23 from peppy/general-fixes 
Framework updates
 2016-09-07 17:51:51 +09:00
smoogipooo f29bf8e914 And again. 2016-09-07 18:20:54 +09:30
Dean Herbert 7e3d2ebe80 Update nuget packages and framework reference once more. 2016-09-06 20:41:18 +09:00
Dan Balasescu 8e96a99ac5 Merge pull request #22 from peppy/general-fixes 
General fixes.
 2016-09-04 19:09:54 +09:30
Dean Herbert 8295c6b732 Update framework reference. 2016-09-04 18:38:51 +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
Dean Herbert eeb3494f04 Merge pull request #21 from smoogipooo/general_fixes 
General fixes
 2016-09-03 23:05:01 +09:00
smoogipooo 59a69ca59c Remove unused System.Drawing reference. 2016-09-03 23:02:55 +09:30
smoogipooo ffccaacfc4 Submodule ref. 2016-09-03 22:17:50 +09:30
smoogipooo dde748b8c1 Fix loaded not being set on textbox Load. 2016-09-03 21:18:07 +09:30
Dan Balasescu e31597bba3 Merge pull request #20 from peppy/textbox 
Implement TextBox
 2016-09-02 23:27:49 +09:30
smoogipooo c618686cbc Update submodule ref. 2016-09-02 23:25:55 +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
Dan Balasescu 460f260880 Merge pull request #19 from peppy/general-fixes 
Update resolution handling logic.
 2016-09-01 23:20:03 +09:30
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 56bdfae852 Add back DotSettings file. 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
Dean Herbert 93ebe523d5 Update submodules. 2016-09-01 22:46:26 +09:00
Dean Herbert a087658e80 Merge pull request #18 from peppy/master 
Update submodules.
 2016-09-01 14:23:00 +09:00
Dean Herbert 7e0c1a082b Update submodules. 2016-09-01 14:14:07 +09:00
Dean Herbert b7ff37cd8a Merge pull request #17 from huoyaoyuan/master 
Remove custom delegates references.
 2016-09-01 02:34:03 +09:00