1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

215 Commits

Author SHA1 Message Date
DrabWeb
3ed88ea043 Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed 2017-01-27 07:11:22 -04:00
DrabWeb
f35974021a Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing 2017-01-27 06:19:52 -04:00
DrabWeb
dedd6a4bcf Small cleanups 2017-01-27 05:39:15 -04:00
DrabWeb
fe265c01cb Added current work on pause overlay 2017-01-27 05:24:49 -04:00
Dean Herbert
8987a09741 Merge pull request #293 from peppy/general-fixes
Fix some nullrefs when running visualtests with no maps loaded.
2017-01-27 16:12:46 +09:00
Dean Herbert
9f44e634a4 Allow visualtests to share config etc. with osu!. 2017-01-27 00:39:00 +09:00
Dean Herbert
d4e30f65db Adjust timing of TestCaseHitObjects a bit. 2017-01-27 00:16:02 +09:00
Dean Herbert
a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
Dean Herbert
c07001b566 Fix TestCasePlayer not working on consecutive executions (clock being set where it isn't necessary). 2017-01-27 00:16:02 +09:00
Dean Herbert
4aa2834082 Fix TestCasePlaySongSelect not working on consecutive executions. 2017-01-27 00:16:02 +09:00
Dean Herbert
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
Dean Herbert
ee0b6be84b Merge pull request #266 from kizayoi/master
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
柯十六夜
acfbf2e32e Add prefix Online to BeatmapID and BeatmapSetID 2017-01-09 21:05:01 +08:00
Huo Yaoyuan
ca2531164a Add a label for slider bar. 2016-12-19 10:53:03 +08:00
Huo Yaoyuan
1982c8de46 Update to latest silder bar definition. 2016-12-18 12:36:49 +08:00
Huo Yaoyuan
1323c6a861 Merge branch 'master' into test-case 2016-12-18 12:30:50 +08:00
Huo Yaoyuan
eb1c5e0899 Put slider bar into ButtonsContainer. 2016-12-18 12:30:28 +08:00
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
cb8a07b653 Function of changing FadeTime. 2016-12-05 01:06:28 +08:00
Huo Yaoyuan
63ba3455fb Function of add random. 2016-12-05 01:03:18 +08:00
Huo Yaoyuan
92c21d8b12 Add button and sliderbar. 2016-12-05 00:58:52 +08: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
Dean Herbert
7e6d5a28b1 Scale up TestCaseHitObjects so detail is a bit more visible. 2016-11-04 15:43:53 +09:00
Drew DeVault
55821a1a2b Fix OpenTK reference in osu.Desktop.VisualTests 2016-11-03 19:06:22 -04:00
Drew DeVault
2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
Drew DeVault
9f78f8607b Implement General options section 2016-11-03 19:06:22 -04:00
Huo Yaoyuan
f2a8cc0c29 Merge branch 'master' 2016-11-03 20:38:34 +08:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Huo Yaoyuan
7d14e6e6cf Make prev and next work again. 2016-10-28 20:08:27 +08:00
Huo Yaoyuan
b7ada4866e Merge remote-tracking branch 'peppy/lets-play' into music-controller 2016-10-28 19:47:35 +08:00
Dean Herbert
10ef34b805 Lazy parse beatmap; Don't reload audio track if it hasn't changed. 2016-10-28 20:24:14 +09:00
Huo Yaoyuan
7e2350cb13 Merge remote-tracking branch 'refs/remotes/peppy/lets-play' 2016-10-28 19:07:29 +08:00
Dean Herbert
feccb7286c Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect. 2016-10-28 14:14:45 +09:00
Dean Herbert
d664c97279 Don't reinitialise fake data if we've already populated it. 2016-10-27 17:38:38 +09:00
Dean Herbert
ace31c68ea Imply we are using fake data in description. 2016-10-27 17:38:23 +09:00
Dean Herbert
a764a97602 Use memory database again, local to TestCasePlaySongSelect. 2016-10-27 17:35:00 +09:00
Dean Herbert
801e4bbb0d Remove unnecessary directory creation. 2016-10-27 17:33:17 +09:00
Dean Herbert
f16cc430f8 Stop using memory database. Load sample data local to TestCase.
Also makes the connection private.
2016-10-27 17:08:53 +09:00
Huo Yaoyuan
0da78c19a2 TestCase reset. 2016-10-27 13:34:51 +08:00
Huo Yaoyuan
b671a33911 Transition fixes and clock for VisualTest. 2016-10-27 13:34:51 +08:00
Huo Yaoyuan
e1f6ab1a42 Create MusicController UI class and visual test. 2016-10-27 13:34:43 +08:00
Drew DeVault
55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -04:00
Drew DeVault
157512b45f Merge branch 'master' into song-select 2016-10-26 10:37:18 -04:00
Dean Herbert
faca23163c Fix incorrect framework specification for VisualTests. 2016-10-26 19:11:17 +09:00
Dean Herbert
7ca5bf951c Add missing reference. 2016-10-26 10:18:08 +09:00
Drew DeVault
ddfa457ad3 Fix up sqlite 2016-10-25 19:39:09 -04:00
Drew DeVault
d986d66c2f Introduce TestStorage 2016-10-25 10:44:43 -04:00
Drew DeVault
cea660dce5 Fix up JSON reference 2016-10-24 15:02:13 -04:00
Drew DeVault
063fdd9a2d Add test data to db for VisualTests
Also fixes the broken IPC condition
2016-10-24 14:57:00 -04:00
Drew DeVault
bc6e705e2b Add test case for song selection 2016-10-24 11:39:18 -04:00
Dean Herbert
1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09:00
Dean Herbert
093197cba5 Don't show performance overlay by default in visual tests. 2016-10-19 19:46:21 +09:00