Dean Herbert
|
bc01935a89
|
Move around some namespaces.
|
2017-03-03 20:42:22 +09:00 |
|
Dean Herbert
|
4a109fcc55
|
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.
|
2017-03-03 20:21:11 +09:00 |
|
Dean Herbert
|
9789d1e602
|
Add missing acronyms in TestCaseDrawings.
|
2017-03-03 20:07:36 +09:00 |
|
smoogipooo
|
5a4d07d770
|
Better way to initialize team lists.
|
2017-03-03 18:47:56 +09:00 |
|
Seth
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
smoogipooo
|
7cac2680b1
|
Make test case add test drawings file.
|
2017-03-03 16:33:40 +09:00 |
|
Dean Herbert
|
b0ee728528
|
Remove full-screen background layer and add half-height holder.
Doesn't interact well with dialog popups. May add back later with complementing logic.
|
2017-03-03 16:11:23 +09:00 |
|
Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
Seth
|
2e74b4be60
|
Merge branch 'master' into beatmap-options
|
2017-03-03 00:52:45 -04:00 |
|
Dan Balasescu
|
09a2d39e3e
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 13:06:18 +09:00 |
|
DrabWeb
|
b4091eff30
|
Fixed visual test
|
2017-03-02 21:24:34 -04:00 |
|
Dean Herbert
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
DrabWeb
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04:00 |
|
Dean Herbert
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +09:00 |
|
Dean Herbert
|
471b9daa93
|
Merge branch 'master' into mod-overlay
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
|
2017-03-02 20:27:04 +09:00 |
|
Dean Herbert
|
51950eef43
|
Merge branch 'master' into master
|
2017-03-02 18:06:31 +09:00 |
|
Dean Herbert
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
Dean Herbert
|
4bd85fe5cb
|
Fix audio disposal issues and share more code between visualtests.
|
2017-03-02 16:08:37 +09:00 |
|
Thomas Müller
|
9c853b0465
|
Update framewörk
|
2017-03-01 19:33:01 +01:00 |
|
Thomas Müller
|
d46e68b36b
|
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
|
2017-03-01 18:05:58 +01:00 |
|
Dean Herbert
|
b6e7e054c3
|
wankoz
|
2017-03-01 22:56:20 +09:00 |
|
Dean Herbert
|
58ae9e888d
|
Basic partial replay support.
|
2017-03-01 22:04:20 +09:00 |
|
smoogipooo
|
35d246b59d
|
Merge remote-tracking branch 'origin/master' into tournament_drawings
|
2017-03-01 19:32:33 +09:00 |
|
DrabWeb
|
d5d8352b62
|
Testing build
|
2017-02-28 17:09:31 -04:00 |
|
DrabWeb
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04:00 |
|
DrabWeb
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
DrabWeb
|
50d172be39
|
Added DialogManager(not wired up for desktop project yet)
|
2017-02-28 00:59:36 -04:00 |
|
Dean Herbert
|
e60cead483
|
Merge remote-tracking branch 'upstream/master' into warning_fixes
|
2017-02-28 13:49:19 +09:00 |
|
DrabWeb
|
b3a231185b
|
Conform to naming conventions
|
2017-02-27 20:55:10 -04:00 |
|
DrabWeb
|
3094c01a40
|
Merge https://github.com/ppy/osu into popup-dialog
|
2017-02-27 16:40:04 -04:00 |
|
Andrey Zavadskiy
|
3487dfe236
|
Removed unused variables and parameters
|
2017-02-27 17:32:32 +03:00 |
|
Alex Amadori
|
8b336156f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-27 14:55:44 +01: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 |
|
smoogipooo
|
25a1c7a8ad
|
Initial groups implementation.
|
2017-02-27 14:19:07 +09:00 |
|
DrabWeb
|
d78dca3d85
|
New design
|
2017-02-26 23:35:13 -04:00 |
|
default0
|
1b92519a86
|
Update usages of AddToggle in Tests
|
2017-02-26 21:31:40 +01: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 |
|
DrabWeb
|
a009268370
|
Merge https://github.com/ppy/osu into popup-dialog
|
2017-02-25 21:22:47 -04:00 |
|
Alex Amadori
|
51b6075210
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-24 16:54:37 +01:00 |
|
Alex Amadori
|
e2ae03e798
|
Merge with upstream/master
|
2017-02-24 16:54:27 +01: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 |
|
DrabWeb
|
c94da4fcf0
|
Added popup dialog
|
2017-02-24 00:05:37 -04: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 |
|
Alex Amadori
|
fbb16295ae
|
Improved delegate syntax
|
2017-02-21 18:43:10 +01:00 |
|
Alex Amadori
|
a6fbfc8349
|
Using random generator from osu-framework
|
2017-02-20 17:49:02 +01:00 |
|
Dean Herbert
|
2a099bb56c
|
Stop TestCaseChatDisplay basically reimplementing ChatOverlay.
|
2017-02-19 17:06:51 +09:00 |
|
Alex Amadori
|
87ec0e36ea
|
Complying with rule "Instance fields (private)"
|
2017-02-18 16:45:46 +01:00 |
|
Alex Amadori
|
21cf96ec10
|
More sorting rookie mistakes
|
2017-02-18 16:23:13 +01:00 |
|
Alex Amadori
|
f48c83b787
|
Fix silly sorting mistakes
|
2017-02-18 15:56:29 +01:00 |
|
Alex Amadori
|
d92382c1aa
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-18 15:18:26 +01:00 |
|
Alex Amadori
|
6bbbbd8f96
|
Implemented sorting in TestCasePlaySong
|
2017-02-18 15:11:40 +01: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 |
|