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

223 Commits

Author SHA1 Message Date
DrabWeb 570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
Dean Herbert e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
Andrey Zavadskiy 3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Dean Herbert a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
Dean Herbert 21c6f66017
Fix TestCaseGamefield. 2017-02-27 18:30:10 +09:00
Dean Herbert 686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Thomas Müller 1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Dean Herbert 12db33ad4b
Visual and readability improvements to StarCounter. 2017-02-24 19:30:56 +09:00
Dean Herbert 3a89348413
Centralise access to WorkingBeatmaps. 
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
 2017-02-24 13:43:21 +09:00
Dean Herbert c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller 2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Seth b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
Dean Herbert 6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert 011d2cc7cc
oops 2017-02-23 16:44:59 +09:00
Dean Herbert da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert aec5fa9d72
Remove unused local variable. 2017-02-23 12:17:42 +09:00
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 d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
Dean Herbert aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09: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