1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 02:37:25 +08:00
Commit Graph

6406 Commits

Author SHA1 Message Date
Dean Herbert
5cf8121d29 Merge pull request #1025 from huoyaoyuan/fixes
Implement Ctrl+Enter for Auto in song select.
2017-08-04 17:48:47 +09:00
Dean Herbert
083248872b Revert all changes on OsuGame 2017-08-04 17:36:31 +09:00
Dean Herbert
e8021c2b92 Move line inside if 2017-08-04 17:20:05 +09:00
Dean Herbert
0f8d46a990 Merge remote-tracking branch 'upstream/master' into fixes 2017-08-04 17:19:32 +09:00
Dan Balasescu
1c37efdd28 Merge pull request #1080 from peppy/visual-test-updates
Update to support new framework VisualTests structure
2017-08-04 17:44:45 +09:30
smoogipooo
17900f3353 Update VSCode with new configurations. 2017-08-04 17:18:44 +09:30
Huo Yaoyuan
74facb32b4 Use removeAutoModOnResume as a field. 2017-08-04 15:34:11 +08:00
Dean Herbert
fc97fdb8c1 Use a common build directory between both build ccnfigurations
There's no need to build to VisualTests when they share everything
2017-08-04 16:07:25 +09:00
Dean Herbert
7e89b1021d FirstOrDefault 2017-08-04 15:58:59 +09:00
Dean Herbert
104c25266d Add missing licence headers 2017-08-04 15:48:42 +09:00
Dean Herbert
e6ef50c4e4 Update framework 2017-08-04 15:40:28 +09:00
Dean Herbert
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b Pass input state in OnSelected. 2017-08-04 00:09:41 +08:00
smoogipooo
ba31bfcdf1 CI fixes. 2017-08-03 20:44:05 +09:30
smoogipooo
351d255355 Fix brokenness due to relative sizes. 2017-08-03 20:12:31 +09:30
smoogipooo
0a4464bbe8 Merge remote-tracking branch 'origin/master' into taiko-fixes
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
2017-08-03 20:02:19 +09:30
Dean Herbert
c86f23baea Merge pull request #1077 from MrTheMake/osulegacydecoder-parser
Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified
2017-08-03 16:36:01 +09:00
Dean Herbert
248486f8f9 Merge branch 'master' into osulegacydecoder-parser 2017-08-03 16:30:37 +09:00
Dan Balasescu
ecf102f568 Merge pull request #1079 from peppy/ruleset-icons-revamp
Allow Rulesets to create a non-FontAwesome icon
2017-08-03 16:28:51 +09:30
Dean Herbert
a5a5c1a315 Remove debug code 2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4 Improve class xmldoc 2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd Add comment explaining why we use scale 2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e Derive from CompositeDrawable instead
We need to expose EdgeEffect as it's used in places.
2017-08-03 15:45:59 +09:00
smoogipooo
74e9449a75 Make symbol pieces relative sized. 2017-08-03 15:57:45 +09:30
smoogipooo
09c0e18a04 Fix incorrect size reset function. 2017-08-03 15:47:23 +09:30
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
smoogipooo
8553e1cad3 Same default value for parameter. 2017-08-03 14:38:24 +09:30
smoogipooo
dc0d0a3602 CI. 2017-08-03 14:31:20 +09:30
smoogipooo
c2475f6721 Fix gravity. 2017-08-03 14:18:54 +09:30
smoogipooo
8ef949ce38 Remove TestCaseTaikoHitObjects. 2017-08-03 13:56:36 +09:30
smoogipooo
e55a406e4d Fix DrawableTaikoHitObject + drawable hit objects. 2017-08-03 13:54:13 +09:30
smoogipooo
786bad3d71 Simplify + fix up circle pieces. 2017-08-03 13:53:12 +09:30
smoogipooo
b2d69dfa02 Fix HitExplosion. 2017-08-03 13:36:49 +09:30
smoogipooo
14639ff8e3 Fix HitTarget. 2017-08-03 13:36:36 +09:30
smoogipooo
d796730e36 Fix KiaiHitExplosion. 2017-08-03 13:36:15 +09:30
smoogipooo
22ffc78757 Rework consts in TaikoHitObject to be relative size values. 2017-08-03 13:36:04 +09:30
smoogipooo
324fd456a7 Rework border + fillmodes + size in TaikoPlayfield. 2017-08-03 13:35:07 +09:30
smoogipooo
17cad76054 Make TestCaseTaikoPlayfield able to visualise kiai hits. 2017-08-03 13:33:46 +09:30
smoogipooo
13af804bbb Fix TestCaseTaikoPlayfield not correctly setting strong hit objects. 2017-08-03 13:11:53 +09:30
smoogipooo
358b7c9d3d Better InputDrum sizing + positioning. 2017-08-03 09:35:42 +09:30
smoogipooo
5352da277d Remove ScaleFixContainer. 2017-08-03 08:16:19 +09:30
MrTheMake
be3c7ec5f8 Added missing space 2017-08-02 16:17:33 +02:00
MrTheMake
79724e8018 Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified 2017-08-02 16:05:09 +02:00
Dan Balasescu
d72a479d9d Merge pull request #1075 from peppy/import-from-stable-part-two
Tidy up osu-stable import process
2017-08-02 17:18:39 +09:30
Dean Herbert
2c1767e496 Update framework 2017-08-02 16:37:20 +09:00
Dan Balasescu
1f205d87f8 Merge branch 'master' into import-from-stable-part-two 2017-08-02 17:05:46 +09:30
Dean Herbert
7cb87c7145 Run each import in a single transaction
Improves performance substantially.
2017-08-02 14:18:35 +09:00
Dean Herbert
211731d017 Merge pull request #955 from MrTheMake/musiccontroller-canbeatmapchange
Disable track changing buttons in the music controller depending on the current screen
2017-08-02 12:51:22 +09:00