|
|
c1d5a68e4d
|
Merge branch 'master' into VisualSettingsOverlay
|
2018-02-01 16:37:04 +09:00 |
|
|
|
d332a2dddd
|
Merge branch 'master' into url-parsing-support
|
2018-02-01 16:13:32 +09:00 |
|
|
|
042a34e1c2
|
Add migration to ensure database aligns to changed enum
|
2018-01-31 16:10:48 +09:00 |
|
|
|
28b67e3d77
|
Merge branch 'master' into url-parsing-support
|
2018-01-30 17:47:55 +09:00 |
|
|
|
b4cd8ea716
|
GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
|
2018-01-30 14:54:30 +09:00 |
|
|
|
ef3fb8c05a
|
InputManager -> Container where KeyBindings are involved
|
2018-01-30 14:49:12 +09:00 |
|
|
|
0879366a30
|
Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support
|
2018-01-29 13:52:21 +09:00 |
|
|
|
2b14438fe4
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
|
2018-01-29 12:55:32 +09:00 |
|
|
|
247833174c
|
Fix incorrect case on migration file
|
2018-01-27 23:20:49 +09:00 |
|
|
|
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 |
|
|
|
615c831069
|
Merge from ppy/master
|
2018-01-26 21:56:17 +03:00 |
|
|
|
8f0ab2040f
|
Add Jetbrains.Annotations NuGet package
|
2018-01-26 12:46:28 +01:00 |
|
|
|
03154dbc63
|
Fix incorrect initial migration
Also adds variant to settings
|
2018-01-25 23:41:03 +09:00 |
|
|
|
53c6526b22
|
Remove unused code file
|
2018-01-24 18:04:54 +09:00 |
|
|
|
5a00ae36d1
|
Add database-based configuration for rulesets
|
2018-01-24 17:45:28 +09:00 |
|
|
|
e88f514cf4
|
Resolve merge conflicts
|
2018-01-21 18:32:21 +03:00 |
|
|
|
0b7e1ce667
|
Add a way to have ruleset-specific configs
|
2018-01-17 19:45:18 +09:00 |
|
|
|
54b0f4b912
|
Merge branch 'master' into url-parsing-support
|
2018-01-17 16:16:55 +09:00 |
|
|
|
a81f32a388
|
PlayerGroup -> PlayerSettingsGroup
|
2018-01-15 20:52:52 +03:00 |
|
|
|
0796d33e66
|
Merge branch 'master' into fix-skipbutton-ordering
|
2018-01-15 15:54:18 +09:00 |
|
|
|
43f8a8e8c5
|
Rename OsuCursorVisualiser -> CursorOverrideContainer
|
2018-01-15 14:00:13 +09:00 |
|
|
|
6e35484160
|
Fix osu.Game.csproj which was broken during resolving merge conflict
|
2018-01-13 23:09:43 +03:00 |
|
|
|
43d2ae348a
|
Rename ReplaySomething -> PlayerSomething
|
2018-01-13 22:25:09 +03:00 |
|
|
|
78441c05cb
|
OsuCursorContainer -> OsuCursorVisualiser
|
2018-01-12 19:45:09 +09:00 |
|
|
|
16d739580b
|
IProvideLocalCursor -> IProvideCursor
|
2018-01-12 19:37:03 +09:00 |
|
|
|
45301d07fd
|
Merge branch 'master' into url-parsing-support
|
2018-01-12 19:34:44 +09:00 |
|
|
|
512e4d2c9f
|
Rewrite the way that cursor overrides are done game-wide
|
2018-01-12 18:13:17 +09:00 |
|
|
|
29c8400ec7
|
Merge branch 'master' into scrolling-hitobjects-rewrite
|
2018-01-12 17:35:24 +09:00 |
|
|
|
8a04c954a9
|
Cleanup
|
2018-01-12 17:19:59 +09:00 |
|
|
|
441e8aced5
|
Better namings for the speed change "algorithms"
|
2018-01-12 17:18:34 +09:00 |
|
|
|
c48c7b085c
|
Visual settings initial commit
|
2018-01-10 02:24:51 +03:00 |
|
|
|
72624aea18
|
Use a better method of link compilation
Adds word wrap back, simplifies a lot.
|
2018-01-09 20:33:20 +09:00 |
|
|
|
b035a92bda
|
Merge branch 'master' into url-parsing-support
|
2018-01-09 14:28:20 +09:00 |
|
|
|
c4d1922c8b
|
Add scrolling algorithm to global settings
|
2018-01-08 11:34:37 +09:00 |
|
|
|
4ab3b0d76b
|
Implement local scrolling hit object container
|
2018-01-07 13:24:09 +09:00 |
|
|
|
117ab8a26d
|
Split out scrolling algorithm
|
2018-01-07 13:23:16 +09:00 |
|
|
|
e6b581e259
|
Merge branch 'master' into expand-social-tab
|
2018-01-06 10:48:27 +01:00 |
|
|
|
1276e2c71a
|
Merge branch 'master' into scrolling-hitobjects-rewrite
|
2018-01-05 14:58:57 +09:00 |
|
|
|
038fa682f7
|
Merge branch 'master' into expand-social-tab
|
2018-01-04 11:49:35 +01:00 |
|
|
|
bf64b8fc69
|
added hover effects to panels in social
at least partially QQ
|
2018-01-04 11:42:50 +01:00 |
|
|
|
a7aab21a29
|
Re-namespace files
|
2018-01-04 19:22:15 +09:00 |
|
|
|
e0c921ff5c
|
Split out ScrollingHitObjectContainer into new file
|
2018-01-04 19:20:43 +09:00 |
|
|
|
651e24e3cc
|
Implement proper scrolling directions
|
2018-01-04 19:17:40 +09:00 |
|
|
|
f34131f8f4
|
Initial game-wide replacement of scrolling playfields
|
2018-01-04 18:50:17 +09:00 |
|
|
|
6d253fd33c
|
Add a way to adjust the conversion process with mods
|
2018-01-03 19:06:20 +09:00 |
|
|
|
262a7f7d19
|
Merge branch 'master' into large-texture-store
|
2018-01-03 13:56:39 +09:00 |
|
|
|
faf1181fc3
|
Merge branch 'master' into url-parsing-support
|
2018-01-02 17:51:50 +09:00 |
|
|
|
c0dd812a4c
|
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
|
2018-01-02 15:33:08 +09:00 |
|
|
|
cc4ef5d0aa
|
Merge branch 'master' into expand-social-tab
|
2018-01-01 12:00:50 +01:00 |
|
|
|
e7721d71f3
|
Changed chat link implementation according to review
|
2017-12-31 00:51:47 +01:00 |
|
