Commit Graph

270 Commits

Author SHA1 Message Date
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
011d2cc7cc oops 2017-02-23 16:44:59 +09:00
da2bfe6d3c Framework updates. 2017-02-23 16:42:12 +09:00
aec5fa9d72 Remove unused local variable. 2017-02-23 12:17:42 +09:00
416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
aef0eb49a1 Add loading screen. 2017-02-22 21:53:59 +09:00
fbb16295ae Improved delegate syntax 2017-02-21 18:43:10 +01:00
a6fbfc8349 Using random generator from osu-framework 2017-02-20 17:49:02 +01:00
2a099bb56c Stop TestCaseChatDisplay basically reimplementing ChatOverlay. 2017-02-19 17:06:51 +09:00
87ec0e36ea Complying with rule "Instance fields (private)" 2017-02-18 16:45:46 +01:00
21cf96ec10 More sorting rookie mistakes 2017-02-18 16:23:13 +01:00
f48c83b787 Fix silly sorting mistakes 2017-02-18 15:56:29 +01:00
d92382c1aa Merge remote-tracking branch 'upstream/master' 2017-02-18 15:18:26 +01:00
6bbbbd8f96 Implemented sorting in TestCasePlaySong 2017-02-18 15:11:40 +01:00
006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
cf8b6c0697 Fix backgrounds in TestCasePlayer dimming to gray instead of black. 2017-02-18 15:54:26 +09:00
e6ef9f67aa GameMode -> Screen. 2017-02-17 19:23:58 +09:00
9fc3726925 ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly 2017-02-16 18:32:27 -04:00
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
8bf3902cbd Add the concept of nested DrawableHitObjects.
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
c90f5e247d Add a TickDistance to TestCaseHitObjects. 2017-02-16 13:20:40 +09:00
10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09: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
aaaf7163e0 Update framework. 2017-02-13 17:46:50 +09:00
874af48de6 Merge remote-tracking branch 'upstream/master' into installer-updater 2017-02-12 17:18:04 +09:00
7ad9cd6b6e add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
ac548dc9ec Rework notifications to be more flexible. 2017-02-12 14:50:42 +09:00
e23202c449 Merge remote-tracking branch 'upstream/master' into desktop-unit-tests 2017-02-10 17:22:38 +09:00
8ec927899f Implement notifications. 2017-02-10 16:30:23 +09:00
e0b7517535 Add desktop unit tests project. 2017-02-09 19:24:53 +09:00
38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
6b011a50d2 Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
756fd78a88 Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
7ce5fc08ee Merge branch 'master' into skip-button
# Conflicts:
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
2c12568a0d Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser 2017-01-31 20:51:26 -04:00
91a5d0b3cf Made requested changes 2017-01-31 09:17:47 -04:00
ecaa88a0d2 Changed TestCasePauseOverlay to use AddButton and removed background gradient(not needed) 2017-01-31 08:42:14 -04:00
c642660896 Made TestCasePauseOverlay.retryCount reset on Retry, fixed an issue with PauseButton where if the user moved the cursor in/out very fast and clicked than the glow wouldn't fade out 2017-01-30 16:15:56 -04:00
9ab49247b2 Forgot one 2017-01-30 08:08:38 -04:00
8f6a6143d6 Removed excess parenthesis 2017-01-30 08:07:37 -04:00
f8cbc35f8e Small cleanups 2017-01-30 04:43:06 -04:00
d70cbd37dd Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player 2017-01-30 04:08:14 -04:00
6b57456681 Removed depth setting from PauseOverlay, removed shadow offset on PauseButton color(why was that even there?), fixed the triangles on PauseButton not masking to the sheared container, made PauseButton call it's action on MouseUp instead of MouseDown to match stable 2017-01-28 20:30:37 -04:00