Commit Graph

31092 Commits

Author SHA1 Message Date
bd4902a532 Merge pull request #358 from peppy/spinners
Add spinners and improve TestCaseHitObjects.
2017-02-15 12:58:21 +09:00
d570a6d308 Handle cases where HitObjects were not parsed. 2017-02-15 12:38:10 +09:00
753232533a Display Important/Error logging in notifications for now. 2017-02-15 12:37:57 +09:00
580584a015 Don't use osu! mode parser for other game modes for now (convert still works). 2017-02-15 12:36:47 +09:00
f2b0fd4de0 Throw exception on unknown hitobject. 2017-02-15 11:37:23 +09:00
a8271d02d8 Merge branch 'master' of https://github.com/ppy/osu 2017-02-14 20:17:44 +01:00
5873178df3 Merge branch 'master' into spinners 2017-02-15 01:32:54 +09:00
325054c7f7 Update framework. 2017-02-15 01:29:51 +09:00
ba7b61521f Merge pull request #354 from peppy/builder
Deploy automation
2017-02-15 01:28:05 +09:00
10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09:00
8e9a5e9faa Add the ability to make DrawableHitObjects non-interactive (for use in other contexts). 2017-02-15 01:23:20 +09:00
396c8121d3 Better slider defaults. 2017-02-15 01:23:19 +09:00
e88d02d3c4 Ensure SliderCurve is assigned Calculated before used. 2017-02-15 01:23:19 +09:00
fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09:00
9a5ac64332 Make HitObjectType more accessible.
# Conflicts:
#	osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
2017-02-15 01:23:19 +09:00
9f96a511a7 Merge pull request #357 from peppy/general-fixes
General fixes.
2017-02-14 17:22:31 +01:00
13ed7db361 Merge branch 'master' into general-fixes 2017-02-15 01:14:25 +09:00
7fa9dde24f Merge pull request #355 from peppy/disable-unimplemented-options
Visually disable options which aren't yet wired up.
2017-02-14 17:11:01 +01:00
ace7a1d009 Fix slider ticks expiring before scoring happens. 2017-02-14 16:12:35 +01:00
e717daa504 Line length is calculated inline 2017-02-14 16:05:57 +01:00
9f890139d4 Cache drawable ticks. 2017-02-14 15:16:18 +01:00
1b08f6aca4 Line length is absolute now 2017-02-14 14:24:54 +01:00
3e7208c8a4 Add slider ticks. 2017-02-14 11:26:24 +01:00
f207da6041 Add/update license headers. 2017-02-14 18:17:35 +09:00
ce29f0b0be Add background layer to VisualTestGame. 2017-02-14 18:09:46 +09:00
311563d336 Merge remote-tracking branch 'upstream/master' into general-fixes 2017-02-14 18:06:10 +09:00
6fa84f3a81 Merge branch 'master' into disable-unimplemented-options 2017-02-14 08:35:40 +09:00
bad501c018 Merge branch 'master' into builder 2017-02-14 08:35:38 +09:00
3caa6ee5d2 Update framework. 2017-02-14 08:33:42 +09:00
c1ba53fa09 calculation is now a 'one-liner' 2017-02-13 16:56:15 +01:00
4f9d1a6c39 Visually disable options which aren't yet wired up. 2017-02-14 00:36:50 +09:00
3136bbeabc Merge pull request #342 from Damnae/followpoints
Add follow points.
2017-02-13 22:28:14 +09:00
343e48c195 Merge branch 'master' into followpoints 2017-02-13 22:23:57 +09:00
5c6e895644 Exclude vshost executables from packages. 2017-02-13 21:33:48 +09:00
d73c48c73d Only show first three segments of version (ignore revision number). 2017-02-13 20:23:47 +09:00
85e85d32fc Add dev build footer. 2017-02-13 20:06:51 +09:00
f52e9ddb05 Fix escape key being unnecessarily handled by VersionManager. 2017-02-13 19:08:59 +09:00
bc95666736 Merge pull request #339 from Damnae/osb_loading
Load beatmap data from an optional osb file.
2017-02-13 18:40:08 +09:00
11643d2e09 Remove unnecessary methods and local variables. 2017-02-13 18:30:51 +09:00
1aeb48b920 Merge remote-tracking branch 'upstream/master' into osb_loading 2017-02-13 18:22:29 +09:00
9d5a984e80 Don't build deploy project by default. 2017-02-13 18:00:15 +09:00
df03a6cac2 Move deploy to tools folder. 2017-02-13 17:59:35 +09:00
c86701f1cc Merge pull request #353 from Tom94/horizontal-scroll
Update framework.
2017-02-13 17:54:04 +09:00
aaaf7163e0 Update framework. 2017-02-13 17:46:50 +09:00
5bd82aae42 Tidy up and format better. 2017-02-13 17:40:41 +09:00
05a014958f Add complete publish automation.
Uses AppSettings to allow for secret storage.
2017-02-13 16:48:53 +09:00
2c95d7c67b Add ability to bootstrap the releases directory using github release API. 2017-02-13 12:31:55 +09:00
cef3454e9b Formatting and improvements. 2017-02-13 10:06:19 +09:00
1978984006 mode selector line has the correct length now 2017-02-12 17:49:30 +01:00
a073b1db0d very simple build automation. 2017-02-13 01:02:44 +09:00