Commit Graph

38297 Commits

Author SHA1 Message Date
edcc48c49b Merge pull request #28 from peppy/general-fixes
Framework updates.
2016-09-21 17:39:36 +09:00
997c6f45f6 Update framework again. 2016-09-21 17:37:33 +09:00
33e46facec Use children for initialisation. 2016-09-21 13:25:23 +09:00
3a5f37444c Add back Playfield masking. 2016-09-21 13:21:55 +09:00
1712a142a5 Add proper HitObject expiration. 2016-09-21 13:12:15 +09:00
f1688499e4 Bring framework up-to-date. 2016-09-21 13:12:05 +09:00
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
b2e7f290f2 Fix window size. 2016-09-20 16:26:07 +09:00
b9de26aa26 Framework updates. 2016-09-20 14:41:55 +09:00
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
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
3c297064b6 Fixes invalid button scaling, Fixes invalid button location (they were oddly shifted to the right) 2016-09-19 01:47:14 +01:00
320f76d860 Fixes over-scaling, Brings osu! logo back to the front 2016-09-19 01:35:50 +01:00
80dfad9af9 Missed an extra set of () on an object initialiser 2016-09-18 20:49:01 +01:00
314b0dfc04 Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency 2016-09-18 20:41:53 +01:00
4732a4db19 An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end. 2016-09-18 16:42:59 +01:00
30db97d72d Updates to latest stable framework version. 2016-09-18 16:29:05 +01:00
f2fa9f611a Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs 2016-09-17 22:11:27 +01:00
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
1a5c2b5221 Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax 2016-09-17 21:33:46 +01:00
36ae4dd271 Fix osu! playfield (was using inheriting sizemode when it shouldn't). 2016-09-15 23:58:02 +09:00
b52c3074ef Merge pull request #26 from peppy/general-fixes
Bring framework up-to-date.
2016-09-11 10:33:06 +02:00
375406bc97 Bring framework up-to-date. 2016-09-11 17:23:43 +09:00
be962e681d Merge pull request #25 from peppy/general-fixes
Update to latest framework version.
2016-09-10 20:08:31 +02:00
4a85d8627d Update to latest framework version. 2016-09-11 03:04:47 +09:00
851ef4fbbf Framework updates. 2016-09-11 02:27:42 +09:00
b6bbea392b Merge branch 'general-fixes' into beatmap_framework
Conflicts:
	osu-framework
2016-09-11 02:24:15 +09:00
842fb1892f Update to latest framework version. 2016-09-11 02:23:26 +09:00
e27eb996bc Merge pull request #23 from peppy/general-fixes
Framework updates
2016-09-07 17:51:51 +09:00
f29bf8e914 And again. 2016-09-07 18:20:54 +09:30
753a67fb3d Update to use new transform logic. 2016-09-06 21:42:45 +09:00
9e76feb159 Add remaining HitRenderers.
Many general improvements.
2016-09-06 21:42:45 +09:00
97d101310d Make OsuPlayfield box a bit larger. 2016-09-06 21:42:45 +09:00
024ae1d1c2 Move playfields to own class. 2016-09-06 21:42:45 +09:00
93744f7372 Add basic TaikoHitRenderer. 2016-09-06 21:42:45 +09:00
677a1b0e56 Add basic box background to OsuPlayfield. 2016-09-06 21:42:45 +09:00
2ea5a5c675 Add basic HitRenderer framework. 2016-09-06 21:42:45 +09:00
ec25a50249 Add basic structure for catch mode objects. 2016-09-06 21:41:16 +09:00
49110cf8d8 Add mania Note and HoldNote. 2016-09-06 21:41:16 +09:00
0a0c8e2014 Fix some base classes not being abstract. 2016-09-06 21:41:16 +09:00
c75d74c84c Taiko notes should have scale, not bool Big. 2016-09-06 21:41:16 +09:00
cf12f4764f Add basic structure for osu! mode objects. 2016-09-06 21:41:16 +09:00
9d6b19a2ee Add duration to BaseHit. 2016-09-06 21:41:16 +09:00
7cee44ab1d HitObject -> HitBase. Also add BaseHits for each game mode. 2016-09-06 21:41:16 +09:00
016521240a Add playtest class. 2016-09-06 21:41:16 +09:00
ef98e4ee3c Move beatmap metadata to separate class. 2016-09-06 21:41:16 +09:00
abe8ff21f6 Add more timing and sample related classes. 2016-09-06 21:41:16 +09:00
3098204dda Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00
7e3d2ebe80 Update nuget packages and framework reference once more. 2016-09-06 20:41:18 +09:00
8e96a99ac5 Merge pull request #22 from peppy/general-fixes
General fixes.
2016-09-04 19:09:54 +09:30