1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 10:57:30 +08:00
Commit Graph

48207 Commits

Author SHA1 Message Date
Dean Herbert
1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09:00
Thomas Müller
e541008d73 Merge pull request #102 from peppy/general-fixes
Fix window size saving to config incorrectly.
2016-10-23 14:45:51 +02:00
Dean Herbert
bd1a1644fd Fix window size saving to config incorrectly. 2016-10-23 01:35:11 +09:00
Thomas Müller
01fd7b82e8 Merge pull request #100 from peppy/general-fixes
Fixes in-line with framework update.
2016-10-22 17:02:12 +02:00
Dean Herbert
e4c74f9c77 Merge remote-tracking branch 'upstream/master' into general-fixes 2016-10-22 23:54:12 +09:00
Dean Herbert
57f678150b Framework update. 2016-10-22 23:54:04 +09:00
Dean Herbert
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
Thomas Müller
7ced6046d7 Fix secondary volume meters showing an incorrect volume until changed. 2016-10-22 14:33:43 +02:00
Dean Herbert
3ce93608fb Fix one remaining FlowContainer. 2016-10-22 19:37:27 +09:00
Dean Herbert
808d5c75fb Fix unused field warning. 2016-10-22 19:08:40 +09:00
Dean Herbert
9021042d93 Fix CircularContainer usage. 2016-10-22 18:40:04 +09:00
Dean Herbert
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
Dean Herbert
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
Dean Herbert
e26a9de5b5 Merge pull request #97 from peppy/hitcircles-and-more
Hitcircles and more
2016-10-22 00:00:30 +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
e78e0d37b4 Make playfield dark, not light. No masking either. 2016-10-19 18:15:49 +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
Dean Herbert
ee463dc65c Merge pull request #77 from NeoAdonis/counters-a
Rolling counters
2016-10-19 15:06:00 +09:00
Dean Herbert
68799f93bb Merge pull request #96 from peppy/general-fixes
General fixes
2016-10-19 12:36:24 +09:00
Dean Herbert
c81c4cbbcd Fix missing Metadata initialisation. 2016-10-19 12:28:48 +09:00
Dean Herbert
6705902710 Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes 2016-10-19 12:22:16 +09:00
Dean Herbert
0e9a155be5 Merge branch 'refs/heads/db-refactor' into general-fixes 2016-10-19 12:22:04 +09:00
Dean Herbert
6dc600d287 Framework updates. 2016-10-19 12:21:13 +09:00
Drew DeVault
7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
Drew DeVault
768dd38fa0 s/AddBeatmap/ImportBeatmap/g 2016-10-18 15:42:07 -04:00
Drew DeVault
105bba6178 Rework duplicate detection in AddBeatmap 2016-10-18 15:41:46 -04:00
Drew DeVault
ad14462369 Add lifecycle management to BeatmapDatabase 2016-10-18 15:38:59 -04:00
Drew DeVault
8ca4a2067e $(SolutionDir) 2016-10-18 13:58:24 -04:00
Drew DeVault
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
Thomas Müller
406ffdafbc Merge pull request #93 from peppy/general-fixes
General fixes
2016-10-18 18:55:37 +02:00
Thomas Müller
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
Adonais Romero González
eeacd85073 Protect RollingCounter props 2016-10-17 21:40:50 -05:00
Dean Herbert
cce2094392 Framework update. 2016-10-18 11:20:16 +09:00
Adonais Romero González
5abc3ba898 Merge remote-tracking branch 'upstream/master' into counters-a 2016-10-17 20:36:04 -05:00
Dean Herbert
29b67334c6 Update framework. 2016-10-17 16:59:11 +09:00
Dean Herbert
3a77fc16c3 Merge pull request #89 from Tom94/round_masking
Update framework.
2016-10-17 12:11:23 +09:00
Dean Herbert
18f4d4ed1c Update framework. 2016-10-17 12:09:05 +09:00
Dean Herbert
bfbc26738c Merged branch master into round_masking 2016-10-17 12:08:31 +09:00
Dean Herbert
9576a7c0e7 Merge pull request #90 from Lunar-Dust/patch-1
Reorder ToolbarButton instantiation for consistency
2016-10-17 10:09:34 +09:00
Lunar Dust
8e47d72f93 Reorder ToolbarButton instantiation for consistency
Might as start good standards now rather than later
2016-10-16 18:42:40 -05: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
2c06764b79 Better safe than sorry 2016-10-16 17:10:08 -05:00
Thomas Müller
53076f6446 Modify osu! logo to use new CircularContainer. 2016-10-16 19:26:56 +02:00
Dean Herbert
96095f34e2 Merge pull request #87 from Tom94/unified_shader
Unified shader
2016-10-16 22:34:50 +09:00
Thomas Müller
d3fd16f209 Update framework. 2016-10-16 15:34:30 +02:00
Thomas Müller
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
Thomas Müller
b514293004 Merge pull request #88 from peppy/general-fixes
General fixes & framework updates.
2016-10-16 15:09:12 +02:00