Commit Graph

337 Commits

Author SHA1 Message Date
a14edc06c8 Pull beatmap list from db and render simple list 2016-10-24 11:39:11 -04:00
1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09:00
bd1a1644fd Fix window size saving to config incorrectly. 2016-10-23 01:35:11 +09:00
e4c74f9c77 Merge remote-tracking branch 'upstream/master' into general-fixes 2016-10-22 23:54:12 +09:00
baf68ba593 Merge pull request #99 from Tom94/general-improvements
Fix secondary volume meters showing an incorrect volume until changed.
2016-10-22 23:51:14 +09:00
7ced6046d7 Fix secondary volume meters showing an incorrect volume until changed. 2016-10-22 14:33:43 +02:00
3ce93608fb Fix one remaining FlowContainer. 2016-10-22 19:37:27 +09:00
808d5c75fb Fix unused field warning. 2016-10-22 19:08:40 +09:00
9021042d93 Fix CircularContainer usage. 2016-10-22 18:40:04 +09:00
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
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
e78e0d37b4 Make playfield dark, not light. No masking either. 2016-10-19 18:15:49 +09:00
a1d961dc87 Make the Player class more friendly and add a test case. 2016-10-19 18:00:35 +09:00
94968a8b7c Add initial implementation of osu! HitCircle. 2016-10-19 16:19:01 +09:00
ee463dc65c Merge pull request #77 from NeoAdonis/counters-a
Rolling counters
2016-10-19 15:06:00 +09:00
c81c4cbbcd Fix missing Metadata initialisation. 2016-10-19 12:28:48 +09:00
6705902710 Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes 2016-10-19 12:22:16 +09:00
7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
768dd38fa0 s/AddBeatmap/ImportBeatmap/g 2016-10-18 15:42:07 -04:00
105bba6178 Rework duplicate detection in AddBeatmap 2016-10-18 15:41:46 -04:00
ad14462369 Add lifecycle management to BeatmapDatabase 2016-10-18 15:38:59 -04:00
8ca4a2067e $(SolutionDir) 2016-10-18 13:58:24 -04:00
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
68476eafb9 Use DrawSize instead of Size whereever Size was previously read due to framework changes.
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
eeacd85073 Protect RollingCounter props 2016-10-17 21:40:50 -05:00
cce2094392 Framework update. 2016-10-18 11:20:16 +09:00
5abc3ba898 Merge remote-tracking branch 'upstream/master' into counters-a 2016-10-17 20:36:04 -05:00
bfbc26738c Merged branch master into round_masking 2016-10-17 12:08:31 +09:00
8e47d72f93 Reorder ToolbarButton instantiation for consistency
Might as start good standards now rather than later
2016-10-16 18:42:40 -05:00
72c4dc344e Misc. fixes and improvements 2016-10-16 18:30:25 -05:00
a671765a4f Modified ManiaComboCounter behavior
This to match more with the current behavior in osu!mania.
2016-10-16 17:45:37 -05:00
2c06764b79 Better safe than sorry 2016-10-16 17:10:08 -05:00
53076f6446 Modify osu! logo to use new CircularContainer. 2016-10-16 19:26:56 +02:00
fec127eb8c Merge branch 'master' of github.com:ppy/osu into unified_shader
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options.cs
2016-10-16 15:17:24 +02:00
02dc8dc167 Change the way VolumeControl handles global input. 2016-10-16 21:57:15 +09:00
b3e531b98c Remove implementation of WedgedBox and use Shear transformation instead. 2016-10-16 14:10:24 +02:00
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
620c4e6ab7 Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes 2016-10-16 18:24:10 +09:00
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
4edefb935c Improve the initialisation logic of OsuGameBase. 2016-10-16 17:33:53 +09:00
15c6a563be Moved ComboResultCounter to right namespace 2016-10-15 22:24:03 -05:00
862dc1d7c7 Tidying code and restricting methods 2016-10-15 19:07:07 -05:00
84dcb63ad2 Changed ComboCounter format...
...to improve value management.
2016-10-15 18:06:31 -05:00
10b47859c3 Delay order on StarCounter changed 2016-10-15 18:04:00 -05:00
0ceb72ba42 More refactoring 2016-10-15 15:16:02 -05:00
a15f4cda44 Tidying 2016-10-15 15:03:51 -05:00
c268500f89 Minor variable change 2016-10-15 14:01:11 -05:00
2625d06553 Why calling StopAnimation() on StarCounter's ctor()? 2016-10-15 13:53:39 -05:00
9241287c79 Merge branch 'master' into counters-a 2016-10-15 13:45:55 -05:00