Dean Herbert
|
042a34e1c2
|
Add migration to ensure database aligns to changed enum
|
2018-01-31 16:10:48 +09:00 |
|
Dean Herbert
|
28b67e3d77
|
Merge branch 'master' into url-parsing-support
|
2018-01-30 17:47:55 +09:00 |
|
smoogipoo
|
b4cd8ea716
|
GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
|
2018-01-30 14:54:30 +09:00 |
|
smoogipoo
|
ef3fb8c05a
|
InputManager -> Container where KeyBindings are involved
|
2018-01-30 14:49:12 +09:00 |
|
Dean Herbert
|
0879366a30
|
Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support
|
2018-01-29 13:52:21 +09:00 |
|
Dean Herbert
|
2b14438fe4
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
|
2018-01-29 12:55:32 +09:00 |
|
Dean Herbert
|
247833174c
|
Fix incorrect case on migration file
|
2018-01-27 23:20:49 +09:00 |
|
Dean Herbert
|
a5b0d51205
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-01-27 14:06:58 +09:00 |
|
TocoToucan
|
615c831069
|
Merge from ppy/master
|
2018-01-26 21:56:17 +03:00 |
|
FreezyLemon
|
8f0ab2040f
|
Add Jetbrains.Annotations NuGet package
|
2018-01-26 12:46:28 +01:00 |
|
Dean Herbert
|
03154dbc63
|
Fix incorrect initial migration
Also adds variant to settings
|
2018-01-25 23:41:03 +09:00 |
|
Dean Herbert
|
53c6526b22
|
Remove unused code file
|
2018-01-24 18:04:54 +09:00 |
|
Dean Herbert
|
5a00ae36d1
|
Add database-based configuration for rulesets
|
2018-01-24 17:45:28 +09:00 |
|
TocoToucan
|
e88f514cf4
|
Resolve merge conflicts
|
2018-01-21 18:32:21 +03:00 |
|
smoogipoo
|
0b7e1ce667
|
Add a way to have ruleset-specific configs
|
2018-01-17 19:45:18 +09:00 |
|
Dean Herbert
|
54b0f4b912
|
Merge branch 'master' into url-parsing-support
|
2018-01-17 16:16:55 +09:00 |
|
TocoToucan
|
a81f32a388
|
PlayerGroup -> PlayerSettingsGroup
|
2018-01-15 20:52:52 +03:00 |
|
Dean Herbert
|
0796d33e66
|
Merge branch 'master' into fix-skipbutton-ordering
|
2018-01-15 15:54:18 +09:00 |
|
smoogipoo
|
43f8a8e8c5
|
Rename OsuCursorVisualiser -> CursorOverrideContainer
|
2018-01-15 14:00:13 +09:00 |
|
TocoToucan
|
6e35484160
|
Fix osu.Game.csproj which was broken during resolving merge conflict
|
2018-01-13 23:09:43 +03:00 |
|
TocoToucan
|
43d2ae348a
|
Rename ReplaySomething -> PlayerSomething
|
2018-01-13 22:25:09 +03:00 |
|
smoogipoo
|
78441c05cb
|
OsuCursorContainer -> OsuCursorVisualiser
|
2018-01-12 19:45:09 +09:00 |
|
smoogipoo
|
16d739580b
|
IProvideLocalCursor -> IProvideCursor
|
2018-01-12 19:37:03 +09:00 |
|
Dean Herbert
|
45301d07fd
|
Merge branch 'master' into url-parsing-support
|
2018-01-12 19:34:44 +09:00 |
|
smoogipoo
|
512e4d2c9f
|
Rewrite the way that cursor overrides are done game-wide
|
2018-01-12 18:13:17 +09:00 |
|
Dean Herbert
|
29c8400ec7
|
Merge branch 'master' into scrolling-hitobjects-rewrite
|
2018-01-12 17:35:24 +09:00 |
|
smoogipoo
|
8a04c954a9
|
Cleanup
|
2018-01-12 17:19:59 +09:00 |
|
smoogipoo
|
441e8aced5
|
Better namings for the speed change "algorithms"
|
2018-01-12 17:18:34 +09:00 |
|
TocoToucan
|
c48c7b085c
|
Visual settings initial commit
|
2018-01-10 02:24:51 +03:00 |
|
Dean Herbert
|
72624aea18
|
Use a better method of link compilation
Adds word wrap back, simplifies a lot.
|
2018-01-09 20:33:20 +09:00 |
|
Dean Herbert
|
b035a92bda
|
Merge branch 'master' into url-parsing-support
|
2018-01-09 14:28:20 +09:00 |
|
smoogipoo
|
c4d1922c8b
|
Add scrolling algorithm to global settings
|
2018-01-08 11:34:37 +09:00 |
|
smoogipoo
|
4ab3b0d76b
|
Implement local scrolling hit object container
|
2018-01-07 13:24:09 +09:00 |
|
smoogipoo
|
117ab8a26d
|
Split out scrolling algorithm
|
2018-01-07 13:23:16 +09:00 |
|
Aergwyn
|
e6b581e259
|
Merge branch 'master' into expand-social-tab
|
2018-01-06 10:48:27 +01:00 |
|
smoogipoo
|
1276e2c71a
|
Merge branch 'master' into scrolling-hitobjects-rewrite
|
2018-01-05 14:58:57 +09:00 |
|
Aergwyn
|
038fa682f7
|
Merge branch 'master' into expand-social-tab
|
2018-01-04 11:49:35 +01:00 |
|
Aergwyn
|
bf64b8fc69
|
added hover effects to panels in social
at least partially QQ
|
2018-01-04 11:42:50 +01:00 |
|
smoogipoo
|
a7aab21a29
|
Re-namespace files
|
2018-01-04 19:22:15 +09:00 |
|
smoogipoo
|
e0c921ff5c
|
Split out ScrollingHitObjectContainer into new file
|
2018-01-04 19:20:43 +09:00 |
|
smoogipoo
|
651e24e3cc
|
Implement proper scrolling directions
|
2018-01-04 19:17:40 +09:00 |
|
smoogipoo
|
f34131f8f4
|
Initial game-wide replacement of scrolling playfields
|
2018-01-04 18:50:17 +09:00 |
|
smoogipoo
|
6d253fd33c
|
Add a way to adjust the conversion process with mods
|
2018-01-03 19:06:20 +09:00 |
|
Dan Balasescu
|
262a7f7d19
|
Merge branch 'master' into large-texture-store
|
2018-01-03 13:56:39 +09:00 |
|
Dean Herbert
|
faf1181fc3
|
Merge branch 'master' into url-parsing-support
|
2018-01-02 17:51:50 +09:00 |
|
Dean Herbert
|
c0dd812a4c
|
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
|
2018-01-02 15:33:08 +09:00 |
|
Aergwyn
|
cc4ef5d0aa
|
Merge branch 'master' into expand-social-tab
|
2018-01-01 12:00:50 +01:00 |
|
FreezyLemon
|
e7721d71f3
|
Changed chat link implementation according to review
|
2017-12-31 00:51:47 +01:00 |
|
Dean Herbert
|
f2d302f8dc
|
Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
|
2017-12-31 07:05:04 +09:00 |
|
Aergwyn
|
ccb69d16d9
|
move HitResult in Scoring namespace to replace HitCount
|
2017-12-30 21:23:18 +01:00 |
|
Dean Herbert
|
d9a80dae5d
|
Male NoFail use an applicable interface
|
2017-12-31 04:10:29 +09:00 |
|
Dean Herbert
|
fea4e1ff68
|
Add a base interface for applicable mods
|
2017-12-31 04:09:51 +09:00 |
|
Dean Herbert
|
3f8f778004
|
Merge branch 'master' into standard-hd-support
|
2017-12-29 15:56:38 +09:00 |
|
Dean Herbert
|
2ca10b28c6
|
Use a non-broken opentk library
|
2017-12-29 15:42:51 +09:00 |
|
FreezyLemon
|
7454633f63
|
Refactor and general tidying up
|
2017-12-28 20:11:21 +01:00 |
|
Aergwyn
|
b029f019b2
|
Merge branch 'master' into expand-social-tab
|
2017-12-28 19:36:22 +01:00 |
|
Aergwyn
|
66f076815f
|
query friends endpoint to fetch friendlist
|
2017-12-28 19:32:06 +01:00 |
|
Aergwyn
|
dbcf87267d
|
Merge branch 'master' into standard-hd-support
|
2017-12-27 21:26:39 +01:00 |
|
smoogipoo
|
5b529511ec
|
Update OpenTK nuget package
Fixes the recent AppVeyor errors
|
2017-12-27 13:18:34 +09:00 |
|
Aergwyn
|
4c2554595e
|
implement hidden (mostly)
some things work and others don't, I dunno
|
2017-12-26 17:25:18 +01:00 |
|
Dean Herbert
|
cf71ffdb6c
|
Merge branch 'master' into fix-taiko-stronghit
|
2017-12-26 18:06:07 +09:00 |
|
Dan Balasescu
|
f7a54a203b
|
Merge branch 'master' into beatmap-import-prompt
|
2017-12-26 16:00:37 +09:00 |
|
smoogipoo
|
58c35b8ba5
|
Merge remote-tracking branch 'FreezyLemon/master' into fix-taiko-stronghit
|
2017-12-26 12:28:40 +09:00 |
|
FreezyLemon
|
a30448095e
|
Merge branch 'master' into url-parsing-support
|
2017-12-25 19:12:23 +01:00 |
|
Dean Herbert
|
3c8d30f8e6
|
Add a dialog offering to import beatmaps from stable
|
2017-12-26 00:52:11 +09:00 |
|
Aergwyn
|
bb4b5bebf9
|
fix supporter icon in profile missing its background
also it doesn't show up on profiles without supporter anymore
|
2017-12-25 15:30:42 +01:00 |
|
smoogipoo
|
d288d8a51f
|
Remove SampleInfoList
|
2017-12-25 15:40:01 +09:00 |
|
Dan Balasescu
|
7ec4d230b9
|
Merge branch 'master' into fix-leaderboard-placeholder
|
2017-12-23 20:04:05 +09:00 |
|
Dean Herbert
|
5026c7a95e
|
SoundControlPoint -> SampleControlPoint
|
2017-12-23 16:34:34 +09:00 |
|
Dean Herbert
|
4d40004e97
|
Merge branch 'master' into beatmap-serialization
|
2017-12-22 22:45:00 +09:00 |
|
Dean Herbert
|
bdda1570d1
|
Move Placeholder classes to own files
|
2017-12-22 22:44:18 +09:00 |
|
Dean Herbert
|
82909f6585
|
RankChart -> RankGraph
|
2017-12-22 19:25:18 +09:00 |
|
Dan Balasescu
|
a3d947301b
|
Merge branch 'master' into beatmap-serialization
|
2017-12-22 07:38:05 +09:00 |
|
smoogipoo
|
e8e5e8270b
|
Rename decoder
|
2017-12-21 14:19:37 +09:00 |
|
smoogipoo
|
c99ea32574
|
Merge branch 'master' into beatmap-serialization
|
2017-12-21 13:39:39 +09:00 |
|
Dean Herbert
|
a6496e35ec
|
Merge branch 'master' into url-parsing-support
|
2017-12-20 14:41:12 +09:00 |
|
Aergwyn
|
bfe986230d
|
Merge branch 'master' into add-confirmation-dialog
|
2017-12-18 17:29:06 +01:00 |
|
Aergwyn
|
6ac33e3c00
|
made DeleteAll-button pink
|
2017-12-18 17:04:35 +01:00 |
|
Dean Herbert
|
a74ac278fe
|
Merge remote-tracking branch 'upstream/master' into editor-selection-tool
|
2017-12-18 21:48:01 +09:00 |
|
smoogipoo
|
09c51df2bd
|
Marker* -> Handle
|
2017-12-18 19:21:26 +09:00 |
|
smoogipoo
|
3999940538
|
DragSelector -> HitObjectSelectionBox
|
2017-12-18 19:17:26 +09:00 |
|
smoogipoo
|
918e7c9a4b
|
MenuOverlay -> GameplayMenuOverlay
|
2017-12-18 16:40:50 +09:00 |
|
Dan Balasescu
|
35b6114d01
|
Merge branch 'master' into editor-selection-tool
|
2017-12-18 13:57:32 +09:00 |
|
Aergwyn
|
2e196661bb
|
Merge branch 'master' into add-confirmation-dialog
|
2017-12-15 18:11:13 +01:00 |
|
smoogipoo
|
66b19b6c97
|
Expose selected objects from SelectionLayer
|
2017-12-15 14:48:24 +09:00 |
|
Dean Herbert
|
b9298325a3
|
Rename weird config setting
|
2017-12-15 14:36:51 +09:00 |
|
Dean Herbert
|
99b00143eb
|
More clean-ups and event bindings
|
2017-12-15 14:36:51 +09:00 |
|
Dean Herbert
|
78dd975a35
|
Initial carousel infrastructue changes
|
2017-12-15 14:36:51 +09:00 |
|
smoogipoo
|
2f1063c5c0
|
Refactor into separate files + add xmldocs + rename some methods
|
2017-12-11 21:56:58 +09:00 |
|
FreezyLemon
|
2568ac1bf7
|
Fixed small merging mistake
|
2017-12-11 10:42:05 +01:00 |
|
FreezyLemon
|
f8bc52bbe6
|
Merged https://github.com/ppy/osu master branch
|
2017-12-11 09:27:54 +01:00 |
|
smoogipoo
|
7189446943
|
Merge remote-tracking branch 'origin/master' into editor-selection-tool
|
2017-12-11 16:34:27 +09:00 |
|
Dean Herbert
|
08727266e7
|
Merge branch 'master' into add-ruleset-shortname
|
2017-12-11 15:41:11 +09:00 |
|
Dean Herbert
|
5a6ac73fff
|
Fix broken tools making broken changes
|
2017-12-11 15:05:19 +09:00 |
|
Dean Herbert
|
7d8fb12332
|
DrawableScore -> DrawableProfileScore
Discern between the other class of the same name
|
2017-12-11 12:51:02 +09:00 |
|
Dean Herbert
|
98ce856de1
|
Use more sensible names for classes and methods
Adds xmldoc in places too.
|
2017-12-11 12:33:34 +09:00 |
|
Dean Herbert
|
9069f1ccba
|
Merge branch 'master' into most-played-beatmaps-section
|
2017-12-11 12:12:23 +09:00 |
|
Dean Herbert
|
d02e1ae896
|
Update RulesetInfo and add migration
|
2017-12-10 12:15:55 +09:00 |
|
Aergwyn
|
c97646bea6
|
added confirmation dialog for Delete ALL beatmaps
|
2017-12-08 14:27:07 +01:00 |
|
FreezyLemon
|
4a723f7382
|
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
|
2017-12-08 11:05:00 +01:00 |
|