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

145 Commits

Author SHA1 Message Date
Thomas Müller eef697d842 Wire up CircleSize to hitobjects. 
Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.
 2016-12-11 10:11:22 +01:00
Dean Herbert 40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00
Dean Herbert 63da7e5ea4 Merge pull request #225 from peppy/hitobject-improvements 
Slider & other hit object improvements.
 2016-12-08 16:11:50 +09:00
Dean Herbert bbc11c77ca Add (temporary) transitions to songselect and player. 2016-12-07 20:47:28 +09:00
Dean Herbert 87ad44b901 Fix HitObject test case not displaying properly. 2016-12-07 18:46:47 +09:00
Dean Herbert f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
Huo Yaoyuan 2eefc320fd Make KeyCounterCollection generic. 2016-12-03 15:58:27 +08:00
Dean Herbert c6b7e90739 Merge branch 'refs/heads/master' into online-improvements 2016-12-01 12:51:45 +09:00
Dean Herbert 18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00
Dean Herbert 34e91c8474 Add the concept of IOnlineComponents, registered tot he API for handling state changes. 2016-11-30 18:30:01 +09:00
Dean Herbert 5101297f53 Add drop shadows to main menu buttons. 2016-11-30 15:02:53 +09:00
Thomas Müller b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Dean Herbert ce13d813b7 Remove unnecessary null check. 2016-11-28 22:46:07 +09:00
Dean Herbert 54fc25e163 Fix disposal logic. 2016-11-28 12:25:20 +09:00
Dean Herbert cfb2285312 TestCasePlayer uses an actual beatmap if available. 2016-11-28 11:38:32 +09:00
Dean Herbert 82a708d2c0 Merge pull request #189 from SirCmpwn/general-fixes 
General fixes
 2016-11-26 16:56:07 +09:00
Dean Herbert 396ca9fe91 Remove HitJudgementResolver; reimplement in DrawableHitObject. 2016-11-26 16:51:51 +09:00
Drew DeVault c85454d034 Reset db on dispose 2016-11-25 05:12:01 -05:00
Dean Herbert ef0f975960 Fix TestCaseHitObjects. 2016-11-25 16:41:00 +09:00
Dean Herbert f9f72f25a2 Add basic flow for hitobject judgement. 2016-11-25 16:26:50 +09:00
Drew DeVault 89effca12e Remove need for PlaySongSelect ctor to take a db 2016-11-25 00:44:46 -05:00
Thomas Müller c6d688898f Initial implementation of a beatmap carousell and various minor improvements to song select. 
No big optimizations yet, but groundwork is laid out.
 2016-11-20 20:34:16 +01:00
Thomas Müller 57e7c7097d Update framework and add rudimentary fading to song select screen. 2016-11-20 12:16:54 +01:00
Dean Herbert 3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert acb85d0140 Fix regressions in combo counters and tidy up naming of SpriteTexts. 2016-11-19 16:19:54 +09:00
Dean Herbert 4c61a13e71 Make slider parsing kind of exist. 2016-11-18 17:40:06 +09:00
Dean Herbert fba748b24e DrawableCircle -> DrawableHitCircle. 2016-11-16 16:20:58 +09:00
Dean Herbert da1f6eeab5 Circle -> HitCircle. 2016-11-16 16:16:45 +09:00
Dean Herbert 37edbd355e Fix rulesets not being registered for VisualTests. 2016-11-16 15:49:59 +09:00
Dean Herbert abdfe42388 Merge branch 'refs/heads/master' into better-anchors 
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
 2016-11-15 14:33:13 +09:00
Tom94 c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01:00
Dean Herbert 5dd4e31011 Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Dean Herbert 4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Dean Herbert 06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00
Dean Herbert 0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Thomas Müller ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
 2016-11-12 20:18:26 +09:00
Drew DeVault 0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
Drew DeVault fe9034323b Get the game running, though not perfectly 2016-11-10 16:42:29 -05:00
Drew DeVault ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Drew DeVault dc03f36793 Use DI for Player 2016-11-10 16:38:44 -05:00
Dean Herbert 788c11de10 Merge pull request #103 from huoyaoyuan/music-controller 
Music controller
 2016-11-10 12:54:56 +09:00
Drew DeVault 1bca78f4b6 Wire up one of the settings to the config 
One step at a time, right
 2016-11-07 22:36:24 -05:00
Huo Yaoyuan c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00
Thomas Müller 07e74068e7 Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
 2016-11-05 13:35:15 +01:00
Dean Herbert 8fe63689a4 Fix thread safety issue when accessing files in beatmap (zip) files. 2016-11-05 18:19:01 +09:00
Huo Yaoyuan 2d86cb1e81 Merge branch 'master' 2016-11-05 16:21:59 +08:00
Dean Herbert da18e2d4f6 Fix off-by-one colour retrieval. 2016-11-04 15:43:53 +09:00
Dean Herbert b40ccccbe4 Add HitObject colours back in the mix. 2016-11-04 15:43:53 +09:00
Dean Herbert e939746159 Fix scale ratio of gamefield. 2016-11-04 15:43:53 +09:00