Dan Balasescu
|
5a1edaa93c
|
Merge branch 'master' into cancel-select-random
|
2017-06-14 14:11:45 +09:00 |
|
Dan Balasescu
|
df79fff996
|
Merge pull request #931 from peppy/fix-hacky-tabs
Fix hacky channel selector tab
|
2017-06-13 19:51:51 +09:00 |
|
smoogipooo
|
99a93d98dc
|
Merge remote-tracking branch 'origin/master' into fix-hacky-tabs
|
2017-06-13 19:46:01 +09:00 |
|
smoogipooo
|
cd2db315b8
|
Update framework.
|
2017-06-13 19:45:01 +09:00 |
|
Dan Balasescu
|
0e7afc91fa
|
Merge pull request #932 from peppy/nuget-update
Update nuget packages
|
2017-06-13 16:07:19 +09:00 |
|
Dean Herbert
|
3ca80eb149
|
Add readonly
|
2017-06-13 15:54:26 +09:00 |
|
Dean Herbert
|
19236dcd1e
|
Merge branch 'improved-loading-animation' into nuget-update
|
2017-06-13 15:50:21 +09:00 |
|
Dean Herbert
|
178e2b716e
|
Merge branch 'master' into us
|
2017-06-13 15:46:53 +09:00 |
|
Dean Herbert
|
d6e042aec0
|
Merge pull request #930 from EVAST9919/context_menu
Context menu (osu-side)
|
2017-06-13 15:40:33 +09:00 |
|
Dean Herbert
|
700d6f9d38
|
Adjust appearance slightly
|
2017-06-13 15:27:47 +09:00 |
|
Dean Herbert
|
679786c76f
|
Move MenuItemType to correct namespace
|
2017-06-13 15:20:21 +09:00 |
|
Dean Herbert
|
cec9053f0b
|
Update framework
|
2017-06-13 14:01:56 +09:00 |
|
Dean Herbert
|
41d4aee4f5
|
Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
|
2017-06-13 11:50:46 +09:00 |
|
EVAST9919
|
9f8c66b8c6
|
Forgot to add dropdown-like animation
|
2017-06-12 13:39:45 +03:00 |
|
EVAST9919
|
41eb084191
|
CI fixes
|
2017-06-12 13:37:13 +03:00 |
|
EVAST9919
|
1711258038
|
Context Menu
|
2017-06-12 12:56:07 +03:00 |
|
EVAST9919
|
6c71e8447c
|
update framework
|
2017-06-12 12:55:58 +03:00 |
|
Dean Herbert
|
3efe8629d6
|
Fix hacky tabs
|
2017-06-12 18:39:22 +09:00 |
|
Dean Herbert
|
e94425f311
|
Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
|
2017-06-12 17:04:42 +09:00 |
|
Dean Herbert
|
8bd9c112ba
|
Merge pull request #927 from smoogipooo/general-fixes
Update framework.
|
2017-06-12 13:02:36 +09:00 |
|
smoogipooo
|
157e0e569a
|
Remove unused file.
|
2017-06-12 12:57:34 +09:00 |
|
smoogipooo
|
ffbb46f668
|
Update in line with framework.
|
2017-06-12 12:48:47 +09:00 |
|
EVAST9919
|
e552c39444
|
change function to a property
|
2017-06-11 22:04:35 +03:00 |
|
EVAST9919
|
c3f4b1b3cb
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
|
2017-06-11 21:56:55 +03:00 |
|
Dan Balasescu
|
df899d3de3
|
Merge pull request #921 from smoogipooo/dynamic-vertex-attributes
Dynamically determine vertex attributes (framework update)
|
2017-06-10 17:31:58 +09:00 |
|
smoogipooo
|
0521d4b761
|
Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
# osu-framework
|
2017-06-10 17:26:16 +09:00 |
|
Dean Herbert
|
c8212e5d35
|
Merge pull request #922 from nairaner/unix-nuget-issue
Fix unix nuget issue
|
2017-06-09 21:18:01 +09:00 |
|
Dean Herbert
|
50e6bdf773
|
Merge branch 'master' into unix-nuget-issue
|
2017-06-09 21:07:37 +09:00 |
|
Dan Balasescu
|
c525784141
|
Merge pull request #920 from peppy/raw-input-osd
Add on-screen display support for RawInput and CursorSensitivity
|
2017-06-09 21:06:49 +09:00 |
|
Krzysztof "Nairaner" Machura
|
e7a732068c
|
Fix issue where nuget was only sometimes updating modules case-sensitive
|
2017-06-09 12:03:18 +02:00 |
|
Dean Herbert
|
3be4db2e83
|
Update framework
|
2017-06-08 21:30:37 +09:00 |
|
Dean Herbert
|
1b0e96f411
|
Fix some discrepancies when changing settings
|
2017-06-08 20:57:21 +09:00 |
|
Dean Herbert
|
72cbf76a48
|
Update framework
|
2017-06-08 20:41:19 +09:00 |
|
Dean Herbert
|
83cdec3ee6
|
Merge remote-tracking branch 'upstream/master' into raw-input-osd
|
2017-06-08 20:41:04 +09:00 |
|
Dean Herbert
|
6047bfc3ec
|
Merge pull request #917 from johnneijzen/master
More Clean Up
|
2017-06-08 20:39:53 +09:00 |
|
Dean Herbert
|
a454ca606f
|
Merge remote-tracking branch 'upstream/master' into johnneijzen-master
|
2017-06-08 20:33:39 +09:00 |
|
Dean Herbert
|
b2b1c08432
|
Merge pull request #918 from peppy/update-framework
Update framework
|
2017-06-08 20:24:40 +09:00 |
|
Dan Balasescu
|
ad3d6f8fb4
|
Merge branch 'master' into update-framework
|
2017-06-08 19:55:21 +09:00 |
|
Dean Herbert
|
e3403c619c
|
Merge branch 'better-invalidations' into update-framework
|
2017-06-08 19:46:19 +09:00 |
|
Dean Herbert
|
028364b2d9
|
Add on-screen display support for RawInput and CursorSensitivity
Also allows resetting both at once using Ctrl+Alt+R.
- Depends on https://github.com/ppy/osu-framework/pull/807
|
2017-06-08 17:58:57 +09:00 |
|
smoogipooo
|
513ec4f05f
|
Merge remote-tracking branch 'origin/master' into dynamic-vertex-attributes
|
2017-06-08 17:57:39 +09:00 |
|
smoogipooo
|
25ff4de39a
|
Update with framework changes.
|
2017-06-08 17:57:06 +09:00 |
|
Thomas Müller
|
067a5a2401
|
Merge pull request #907 from Drezi126/osu-difficulty-refactor
Refactor ppv2 to allow integration of pp+ features.
|
2017-06-08 10:27:06 +02:00 |
|
Thomas Müller
|
0438fd2058
|
Merge branch 'master' into osu-difficulty-refactor
|
2017-06-08 10:16:11 +02:00 |
|
Dean Herbert
|
64682a741c
|
Update framework
|
2017-06-08 17:05:25 +09:00 |
|
Tom94
|
5f7270ee4b
|
Use new invalidation rules
|
2017-06-08 09:53:45 +02:00 |
|
John Neijzen
|
2f7d9655fd
|
More Clean up
|
2017-06-08 15:27:35 +08:00 |
|
John Neijzen
|
d9a9616125
|
EOF remove blank spaces
|
2017-06-08 14:56:03 +08:00 |
|
John Neijzen
|
4abad17b92
|
Fix Black Space after } and Symbol Spacing
|
2017-06-08 14:48:42 +08:00 |
|
John Neijzen
|
431d225a60
|
Keyword Spacing and Brackets Fixing
|
2017-06-08 14:35:10 +08:00 |
|