RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,877 Commits 3 Branches 650 Tags 352 MiB
Commit Graph

204 Commits

Author SHA1 Message Date
DrabWeb 416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
DrabWeb 99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
Dean Herbert 2a099bb56c Stop TestCaseChatDisplay basically reimplementing ChatOverlay. 2017-02-19 17:06:51 +09:00
DrabWeb 006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
Dean Herbert cf8b6c0697
Fix backgrounds in TestCasePlayer dimming to gray instead of black. 2017-02-18 15:54:26 +09:00
Dean Herbert e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
DrabWeb 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
DrabWeb 0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
Dean Herbert 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
Dean Herbert c90f5e247d
Add a TickDistance to TestCaseHitObjects. 2017-02-16 13:20:40 +09:00
Dean Herbert 10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09:00
Dean Herbert f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert ce29f0b0be
Add background layer to VisualTestGame. 2017-02-14 18:09:46 +09:00
Thomas Müller aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Dean Herbert 874af48de6 Merge remote-tracking branch 'upstream/master' into installer-updater 2017-02-12 17:18:04 +09:00
John Leuenhagen 7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Dean Herbert ac548dc9ec Rework notifications to be more flexible. 2017-02-12 14:50:42 +09:00
Dean Herbert e23202c449
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests 2017-02-10 17:22:38 +09:00
Dean Herbert 8ec927899f
Implement notifications. 2017-02-10 16:30:23 +09:00
Dean Herbert e0b7517535
Add desktop unit tests project. 2017-02-09 19:24:53 +09:00
Damnae 38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
Dean Herbert 6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert 50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert 756fd78a88
Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
Dean Herbert 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
DrabWeb 2c12568a0d Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser 2017-01-31 20:51:26 -04:00
DrabWeb 91a5d0b3cf Made requested changes 2017-01-31 09:17:47 -04:00
DrabWeb ecaa88a0d2 Changed TestCasePauseOverlay to use AddButton and removed background gradient(not needed) 2017-01-31 08:42:14 -04:00
DrabWeb 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
DrabWeb 9ab49247b2 Forgot one 2017-01-30 08:08:38 -04:00
DrabWeb 8f6a6143d6 Removed excess parenthesis 2017-01-30 08:07:37 -04:00
DrabWeb f8cbc35f8e Small cleanups 2017-01-30 04:43:06 -04:00
DrabWeb 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
DrabWeb 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
DrabWeb feba3f35ba Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place 2017-01-27 15:28:39 -04:00
Dean Herbert 3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00
Dean Herbert 420e61fa97 TwoLayerButton 2017-01-27 21:08:36 +09:00
DrabWeb 8c6d9bdf2e Added commas to the end of UI creation to match how the rest of the project does, moved PauseButton audio loading to PauseOverlay, much more reliable(still using placeholder assets), made it so the player can't spam pause, cools down to one second 2017-01-27 08:03:32 -04:00
DrabWeb 811cf4b04e Added newline, thanks Xamarin 2017-01-27 07:12:20 -04:00
DrabWeb 3ed88ea043 Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed 2017-01-27 07:11:22 -04:00
DrabWeb f35974021a Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing 2017-01-27 06:19:52 -04:00
DrabWeb dedd6a4bcf Small cleanups 2017-01-27 05:39:15 -04:00
DrabWeb fe265c01cb Added current work on pause overlay 2017-01-27 05:24:49 -04:00
Dean Herbert 8987a09741 Merge pull request #293 from peppy/general-fixes 
Fix some nullrefs when running visualtests with no maps loaded.
 2017-01-27 16:12:46 +09:00
Dean Herbert 9f44e634a4 Allow visualtests to share config etc. with osu!. 2017-01-27 00:39:00 +09:00
Dean Herbert d4e30f65db Adjust timing of TestCaseHitObjects a bit. 2017-01-27 00:16:02 +09:00
Dean Herbert a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
Dean Herbert c07001b566 Fix TestCasePlayer not working on consecutive executions (clock being set where it isn't necessary). 2017-01-27 00:16:02 +09:00
Dean Herbert 4aa2834082 Fix TestCasePlaySongSelect not working on consecutive executions. 2017-01-27 00:16:02 +09:00
Dean Herbert 162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00