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
Dean Herbert
43f0409893
Start to structure flow of information in Player.
...
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
Dean Herbert
a1d961dc87
Make the Player class more friendly and add a test case.
2016-10-19 18:00:35 +09:00
Dean Herbert
94968a8b7c
Add initial implementation of osu! HitCircle.
2016-10-19 16:19:01 +09:00
Adonais Romero González
72c4dc344e
Misc. fixes and improvements
2016-10-16 18:30:25 -05:00
Adonais Romero González
a671765a4f
Modified ManiaComboCounter behavior
...
This to match more with the current behavior in osu!mania.
2016-10-16 17:45:37 -05:00
Adonais Romero González
862dc1d7c7
Tidying code and restricting methods
2016-10-15 19:07:07 -05:00
Adonais Romero González
0ceb72ba42
More refactoring
2016-10-15 15:16:02 -05:00
Adonais Romero González
6bd3eaf37d
Changes according to review + Refactor
2016-10-14 18:23:27 -05:00
Adonais Romero González
9ccff6ec48
Tidying up
2016-10-13 19:50:06 -05:00
Adonais Romero González
c48e3a74f8
Add score counter test again
2016-10-13 17:33:26 -05:00
Adonais Romero González
f10a03dcef
Merge with master
2016-10-13 17:20:35 -05:00
Adonais Romero González
ce07a45456
Improved code
2016-10-13 17:13:20 -05:00
Dean Herbert
5e3e949fd6
Revert all counter commits. Requires much further review.
2016-10-13 14:45:41 +09:00
Adonais Romero González
cd7884f00e
More descriptive var names in test
2016-10-12 20:58:43 -05:00
Adonais Romero González
71d7de5326
Leading zeroes now part of ScoreCounter ctor
2016-10-12 20:57:06 -05:00
Dean Herbert
2566d6bfe0
Fix regressions with HitRenderers, while also cleaning them up.
2016-10-13 10:10:15 +09:00
Adonais Romero González
e9a38f0c4d
Fixed some animations
2016-10-12 17:24:06 -05:00
Adonais Romero González
fa67ab86ed
Adjusted Combo Counter animation
2016-10-12 15:28:24 -05:00
Dean Herbert
aa96d98822
Merge branch 'master' into limit-game-access
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
osu.Game/GameModes/Menu/ButtonSystem.cs
osu.Game/Online/Chat/Display/ChatLine.cs
osu.Game/OsuGame.cs
osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
Dean Herbert
e800649633
Merge remote-tracking branch 'upstream/master' into limit-game-access
2016-10-12 16:03:03 +09:00
Dean Herbert
b2c31d3047
Updates post-master-merge.
2016-10-12 16:01:23 +09:00
Dean Herbert
4052a665bf
Remove all non-load Game access.
2016-10-12 15:47:08 +09:00
Dean Herbert
79b62d4373
Merge remote-tracking branch 'refs/remotes/upstream/master'
...
Conflicts:
osu-framework
osu.Desktop.VisualTests/Program.cs
2016-10-12 15:20:23 +09:00
Dean Herbert
c0ea061bd4
Update framework; amend ToolbarButton to use padding and Children initialiser.
2016-10-12 12:24:07 +09:00
Drew DeVault
5306141f5f
Merge pull request #49 from NeoAdonis/counters
...
Rolling counters (initial)
2016-10-11 15:04:46 -04:00
Dean Herbert
0b0e79d29f
Merge remote-tracking branch 'upstream/master' into SirCmpwn/specify-game-name
...
Conflicts:
osu-framework
2016-10-10 14:35:43 +09:00
Adonais Romero González
841707b61f
Not animate stars over MaxStars
2016-10-09 14:09:07 -05:00
Adonais Romero González
707effb591
Completed StarCounter
...
More complex than the other counters, but hopefully functional.
I subestimated you and your silly bouncing animations.
>.>
2016-10-09 14:02:44 -05:00
Dean Herbert
cb5e4287e2
Post-merge fixes.
2016-10-09 22:21:44 +09:00
Dean Herbert
25de055802
Merge branch 'master' into stateful-drawables
...
Conflicts:
osu.Game/GameModes/Menu/Intro.cs
2016-10-09 22:08:32 +09:00
Thomas Müller
36bb4a3988
Don't call Container.Add within KeyCounterCollection.Reset.
2016-10-09 20:06:15 +09: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
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
Drew DeVault
eb7486f109
Update osu-framework and specify game name
2016-10-08 10:26:35 -04:00
Dean Herbert
3067c890ce
General improvements to chat querying and logic organisation.
2016-10-08 19:23:21 +09:00
Dean Herbert
656aee41e2
Never Prefer32bit.
2016-10-08 15:54:04 +09:00
Dean Herbert
4f2bb25853
Remove "Deploy" configuration.
2016-10-08 15:54:03 +09:00
Dean Herbert
a5adbc0615
Update namespace references.
2016-10-08 15:54:02 +09:00
Dean Herbert
e5dc8bad2f
Bring up-to-date with latest framework.
2016-10-08 15:53:52 +09:00
Adonais Romero González
a3b4a34a1a
TestCase buttons + minor fixes
2016-10-07 17:15:36 -05:00
Adonais Romero González
00cfc51004
Rolling counters (initial)
2016-10-07 02:05:02 -05:00
Dean Herbert
ac16bffe49
Bring framework and resources up-to-date.
2016-10-01 19:05:26 +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
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
7dcf2c6269
Add TestCase for main menu ButtonSystem.
2016-09-29 23:46:24 +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
3755ca0501
Add missing SizeMode.
2016-09-28 14:40:27 +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
b4e65e7011
Add clear to ensure no pile-up of messages.
2016-09-27 18:41:58 +09:00
Dean Herbert
28045b7136
Add back basic API support for channel/message retrieval.
2016-09-27 18:33:52 +09:00