h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 01:27:46 +08:00
Code Issues Releases Wiki Activity
2,008 Commits 3 Branches 653 Tags 356 MiB
68a359698d
Commit Graph

1406 Commits

Author SHA1 Message Date
Dean Herbert
56fe69852d Change beatmap database reset logic to only run a maximum of once. 2017-01-23 18:13:06 +09:00
Dean Herbert
ef8347fe53 Reset the beatmap database when it can't be read, rather than hard failing. 2017-01-23 13:02:03 +09:00
Dean Herbert
ae464fcace Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
TocoToucan
badc8def9a hitObjectsNumber -> hitObjectCount 2017-01-18 18:51:38 +03:00
Dean Herbert
2025e8ef71 Merge pull request #288 from peppy/hpdisplay 
Simple HP display implementation.
 2017-01-18 11:18:45 +08:00
Dean Herbert
cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +08:00
Drew DeVault
678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00
Drew DeVault
75de03bd88 Use OsuColour for green text 2017-01-17 18:26:43 -05:00
Drew DeVault
46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00
Drew DeVault
7559fc593a Use default background on empty song select screen 2017-01-17 16:43:53 -05:00
Drew DeVault
5eb1cda77b Rename FilterSongSelect, use OsuColour 2017-01-17 16:43:40 -05:00
Drew DeVault
63031fbc3d Move filter container z depth and add hover fx 2017-01-17 15:41:50 -05:00
Drew DeVault
73e46ee8c0 Initial layout of song select filtering UI 2017-01-17 15:41:50 -05:00
TocoToucan
259c0964fd Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations 2017-01-16 23:14:35 +03:00
Dean Herbert
ee0b6be84b Merge pull request #266 from kizayoi/master 
Add support for old beatmaps
 2017-01-16 16:02:22 +08:00
Dean Herbert
a3770adbc5 Merge branch 'master' into hpdisplay 2017-01-16 11:23:54 +08:00
Dean Herbert
4030413291 Merge branch 'refs/heads/SirCmpwn/colors' 2017-01-14 06:52:30 +08:00
Drew DeVault
e81073695f Implement disable mouse buttons 2017-01-13 17:17:04 -05:00
Drew DeVault
f5f545df62 Refactor OsuColour into injected instance class 
Which should allow you to change the color palette in the future for
skinning purposes.
 2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Andrey Zavadskiy
63fcfdbbde Fixed checkboxes state and better code 2017-01-11 10:28:24 +03:00
Drew DeVault
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Dean Herbert
1392cdfb9a Hook up naively. 2017-01-10 18:35:27 +08:00
Dean Herbert
7eab50b989 Add basic HP display support. 2017-01-10 16:08:01 +08:00
Drew DeVault
70ecf48ca7 Add central color class 
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
 2017-01-09 17:20:31 -05:00
柯十六夜
acfbf2e32e Add prefix Online to BeatmapID and BeatmapSetID 2017-01-09 21:05:01 +08:00
Andrey Zavadskiy
c0980437a6 Removed unnecessary api reference 2017-01-07 00:55:04 +03:00
Drew DeVault
4899d88d19 Update framework 2017-01-05 02:10:05 -05:00
Drew DeVault
b27139c2bd Simplify layout of dropdown menu item 2017-01-05 00:57:19 -05:00
Drew DeVault
af4aeeab09 Update following framework changes 2017-01-04 01:14:25 -05:00
Drew DeVault
a1f8c0df64 Style dropdown to match osu!stable 2017-01-03 23:00:28 -05:00
Huo Yaoyuan
6690d1bd72 Move logic into updateDisplay. 2017-01-04 02:12:18 +08:00
Huo Yaoyuan
794e4663d8 Fix PreferUnicode changing when nothing to play. 2017-01-04 01:00:08 +08:00
Andrey Zavadskiy
acc50e3473 fixed wrong parameter for token 2016-12-24 10:16:22 +03:00
Andrey Zavadskiy
eabfa11614 Minor fix 2016-12-24 10:04:43 +03:00
Andrey Zavadskiy
5fbc0e408b Remove unnesessary Username field check 2016-12-24 09:16:17 +03:00
Andrey Zavadskiy
ba1d0b3a84 Added Events for checkboxes 2016-12-24 09:09:01 +03:00
Andrey Zavadskiy
9f202ecba8 fix 2016-12-23 23:49:42 +03:00
Andrey Zavadskiy
70c8250021 Revert "Dependent checkboxes" 
This reverts commit 70dc3bae4a.
 2016-12-23 23:05:44 +03:00
Andrey Zavadskiy
70dc3bae4a Dependent checkboxes 2016-12-23 20:24:28 +03:00
Andrey Zavadskiy
cd3ab33d08 Remove the password field from game.ini 2016-12-23 00:43:43 +03:00
Andrey Zavadskiy
7c96102229 When we have empty login, api.Token becames empty 
So we can't sign in having Token without login
 2016-12-22 16:09:42 +03:00
Andrey Zavadskiy
4817d4bf10 Stop using password field in .ini at all 2016-12-22 15:41:06 +03:00
Andrey Zavadskiy
b066a7d905 Stop saving password 2016-12-22 15:26:31 +03:00
柯十六夜
e578e50721 Add support for old beatmaps 2016-12-21 16:29:57 +08:00
柯十六夜
ef11c3f389 Add default Beatmap ID 2016-12-21 14:47:56 +08:00
Andrey Zavadskiy
1c79ebff9f Fix loggining on start even after logout and exit 2016-12-21 01:51:01 +03:00
Andrey Zavadskiy
bba4c46ae3 TODO comment and deleted repeating lines 2016-12-21 01:05:10 +03:00
Andrey Zavadskiy
c7de449713 Token fix 
If "Save Password" is checked, Token will be saved
 2016-12-21 00:37:54 +03:00
柯十六夜
02f6e46105 Add support for v9 beatmaps 2016-12-20 23:56:49 +08:00
Andrey Zavadskiy
d519e28dda PasswordTextBox fix 2016-12-20 17:52:16 +03:00
Andrey Zavadskiy
21c6c23189 Login improvements 2016-12-20 17:28:27 +03:00
Dean Herbert
561b0928bb Merge pull request #263 from EVAST9919/fixes 
Remove unnecessary items from OptionsOverlay
 2016-12-20 01:18:51 +09:00
Andrey Zavadskiy
e23a1b8e92 Remove unnecessary items from OptionsOverlay 2016-12-19 19:17:04 +03:00
n4b3l
aebe87fefc better implementation 2016-12-19 16:09:29 +01:00
n4b3l
09f9f86b06 check if dimLevel is null on exit 2016-12-19 14:03:10 +01:00
n4b3l
c614d61b1a getbpm takes Beatmap instead of WorkingBeatmap 2016-12-18 19:34:20 +01:00
n4b3l
ded6588d3b minor style fixed 2016-12-18 17:21:05 +01:00
n4b3l
5f893d46c7 style fixes 2016-12-18 16:53:52 +01:00
Thomas Müller
db21fe062e Merge pull request #252 from n4b3l/background-dim 
basic background dim
 2016-12-18 16:04:10 +01:00
Thomas Müller
66435a515c Don't async/await song selection since audio operations are now on a separate thread. 2016-12-18 15:19:41 +01:00
Dean Herbert
1d5dc77c4d Keep reference to reader to avoid early disposal. 2016-12-18 20:47:00 +09:00
n4b3l
df305989d0 use config bindable directly 2016-12-18 10:48:59 +01:00
Dean Herbert
f14a9e7d6b Remove unused beatmap reference in BeatmapGroup. 2016-12-18 17:06:56 +09:00
Dean Herbert
5ac9402d5f Adjust fade out transform of difficulty panels to avoid overlap. 2016-12-18 17:06:03 +09:00
Dean Herbert
6e10a9bb29 Allow starting maps by clicking an active panel a second time. 2016-12-18 16:59:13 +09:00
Dean Herbert
2cbc528971 Remove janky beatmap info wedge animation, restore pixel snapping. 2016-12-18 16:50:39 +09:00
n4b3l
492581fa50 fixed length.seconds display 2016-12-18 04:03:11 +01:00
n4b3l
f551133b0e .. 2016-12-18 03:56:27 +01:00
n4b3l
3d64bee069 proper round + std bpm 2016-12-18 03:53:26 +01:00
n4b3l
63dd8893d9 bpm as ints 2016-12-18 02:53:43 +01:00
n4b3l
0fbd2d8bc8 removed random enter 2016-12-17 21:03:14 +01:00
n4b3l
224e6a877a responsive to dim changes 2016-12-17 20:59:41 +01:00
n4b3l
36049cc493 smoother transition 2016-12-17 20:29:20 +01:00
n4b3l
73532b9172 small code improvements 2016-12-17 19:57:58 +01:00
n4b3l
2f708a704d bpm range added + changed spacing 2016-12-17 19:31:34 +01:00
n4b3l
a04a0a7d2c fix allignment... 2016-12-17 15:58:51 +01:00
n4b3l
d812a7cb4e func for icons 2016-12-17 15:53:26 +01:00
n4b3l
c73fbe6e42 Remove unnecessary casts 2016-12-17 15:06:56 +01:00
n4b3l
9e6161b862 better scaling 2016-12-17 12:18:55 +01:00
n4b3l
e31e19f1b8 removed unnecessary padding 2016-12-17 12:04:42 +01:00
n4b3l
376b3df2f8 icons with TextAwesome 2016-12-17 11:57:52 +01:00
n4b3l
590db66b37 remove icons from resource 2016-12-17 11:30:30 +01:00
Dean Herbert
3e42fa4f90 Merge pull request #247 from peppy/song-select-async-player 
Load player async
 2016-12-17 16:05:50 +09:00
n4b3l
b78b40a629 implement icons 2016-12-17 01:58:39 +01:00
n4b3l
ba81222af6 basic background dim 2016-12-16 17:13:24 +01:00
n4b3l
881d58574e Design improvements 2016-12-16 14:21:12 +01:00
Drew DeVault
67d748f677 Adjust padding on sliders 2016-12-16 01:27:57 -05:00
Drew DeVault
796858f86f Fix transparency issues 2016-12-16 00:37:37 -05:00
Drew DeVault
96a6e30a21 Drop complicated type constraints 2016-12-16 00:27:06 -05:00
Drew DeVault
80574423cb Drop SliderBarEventSource 2016-12-16 00:27:06 -05:00
Drew DeVault
abc6db18b3 Add license header 2016-12-16 00:27:06 -05:00
Drew DeVault
a751cfcba3 Update SliderOption implementation 
Per @Tom94's suggestion, the bars track the nub in Update instead of
animating seperately. Also only animates when the event source is the
keyboard.
 2016-12-16 00:27:06 -05:00
Drew DeVault
10cc6f7885 Move where clause to next line 2016-12-16 00:27:06 -05:00
Drew DeVault
9e75ecab4f Fix up slider bugs 2016-12-16 00:27:06 -05:00
Drew DeVault
22c2a4757c Play slider sample as the value changes in 1/10ths 2016-12-16 00:27:06 -05:00
Drew DeVault
c642f6c34f Add sliderbar L+F 2016-12-16 00:27:06 -05:00
n4b3l
991ad298d9 more beatùa 2016-12-16 04:25:28 +01:00
BuildTools
d37ff8f153 Deleted unnecesary things (I guess) 2016-12-15 17:35:14 -06:00
BuildTools
b788878c95 Unnecesary things were removed (I guess) 2016-12-15 17:28:22 -06:00
BuildTools
a845a897b3 Add Base Preview Time 2016-12-15 17:11:48 -06:00
Dean Herbert
20260b43d1 Improve star animation. 2016-12-15 22:58:34 +09:00
Dean Herbert
8ce18e8986 Improve song select startup time via better database querying. Also fix difficulty displays. 2016-12-15 22:58:32 +09:00
Dean Herbert
cf8283582b Don't update LifetimeStart on HitObject state change. 2016-12-15 22:58:23 +09:00
Dean Herbert
d8e40d4fb1 Add naive lifetime calculation for drawable HitObjects. 2016-12-15 22:58:22 +09:00
Dean Herbert
0a9e3ce1b0 Don't handle input in triangle particle effect containers. 2016-12-15 22:58:19 +09:00
Dean Herbert
08ef8ed8ea Add comment about future implementation. 2016-12-15 22:58:18 +09:00
Dean Herbert
8d800dac99 Make Player load async. 2016-12-15 22:58:00 +09:00
Dean Herbert
9557821776 Start a map using enter key. 2016-12-15 22:57:28 +09:00
Dean Herbert
21f993d149 Add ability to navigate song select carousel using arrow keys. 2016-12-15 22:57:14 +09:00
Dean Herbert
c420c55291 Merge branch 'master' into hit-samples 
# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
 2016-12-13 17:57:24 +09:00
Dean Herbert
658f203c4e Merge pull request #236 from Tom94/fix-carousel-panel-x 
Fix panels that are moving off-screen having an incorrect X coordinat…
 2016-12-11 19:47:09 +09:00
Thomas Müller
882d5edf7d Fix dropped input outside of playfield. 2016-12-11 10:09:58 +01:00
Thomas Müller
9c4c713aa0 Fix panels that are moving off-screen having an incorrect X coordinate applied. 2016-12-10 11:30:22 +01:00
Dean Herbert
f8395c4d3f Fix slider ball not tracking when mouse hasn't been moved since slider appeared. 2016-12-08 21:07:20 +09:00
Dean Herbert
6cfb174f02 Fix exiting results screen returning to player. 2016-12-08 20:03:18 +09:00
Dean Herbert
c53743ca7d Fix unit test regression. 2016-12-08 20:00:24 +09:00
Dean Herbert
391767e01d Add very basic hitsound support. 2016-12-08 19:54:22 +09:00
Dean Herbert
63da7e5ea4 Merge pull request #225 from peppy/hitobject-improvements 
Slider & other hit object improvements.
 2016-12-08 16:11:50 +09:00
Dean Herbert
0538681f3b Merge branch 'refs/heads/master' into general-fixes 2016-12-08 13:29:59 +09:00
Drew DeVault
bf7ec397dd Wire dropdowns back to bindables 2016-12-07 09:42:53 -05:00
Drew DeVault
bf33bded24 Update star min/max type, just use sliders for now 2016-12-07 09:42:53 -05:00
Drew DeVault
9db8e63f83 Make star display min/max a double 2016-12-07 09:42:53 -05:00
Drew DeVault
b06f412ffb Use styled dropdown 2016-12-07 09:42:53 -05:00
Drew DeVault
0e07ce26bc Remove Height from dropdown 2016-12-07 09:42:53 -05:00
Drew DeVault
cf60c52f00 Switch to System.ComponentModel.Description 2016-12-07 09:42:53 -05:00
Drew DeVault
5456e0102c s/OptionsDropdown/DropdownOption/g 2016-12-07 09:42:52 -05:00
Drew DeVault
4757a1c433 Wire up enum-backed dropdowns 2016-12-07 09:42:52 -05:00
Drew DeVault
0378de8346 Add DisplayName 2016-12-07 09:42:37 -05:00
Drew DeVault
9daf524120 Add OptionsDropdown<T> and wire up one example 2016-12-07 09:42:37 -05:00
Drew DeVault
ff7ec88e66 s/OptionsSlider/SliderOption/g 2016-12-07 09:42:37 -05:00
Drew DeVault
b97902d006 Add missing sliders 2016-12-07 09:42:37 -05:00
Drew DeVault
92cf841589 Add and wire up all sliderbar-based options 2016-12-07 09:42:37 -05:00
Drew DeVault
3aefa4d6a5 Wire up remaining sliders, except for ints 2016-12-07 09:42:37 -05:00
Drew DeVault
a350e95e40 Add OptionsSlider and wire up volume sliders 2016-12-07 09:41:28 -05:00
Dean Herbert
08f8eb649c Make counters closer to what they should be looking like. 2016-12-07 21:05:29 +09:00
Dean Herbert
bbc11c77ca Add (temporary) transitions to songselect and player. 2016-12-07 20:47:28 +09:00
Dean Herbert
bc6c57c619 Make toolbar icons the same width as options icons. 2016-12-07 19:14:05 +09:00
Dean Herbert
87ad44b901 Fix HitObject test case not displaying properly. 2016-12-07 18:46:47 +09:00
Dean Herbert
ae72f91975 Reshuffle hit explosions to be on their own layer. 
Style misses better.
 2016-12-06 21:14:38 +09:00
Dean Herbert
f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
Dean Herbert
421dd19aaf Move initial state updates to DrawableHitObject. 2016-12-06 18:35:08 +09:00
Dean Herbert
ef8793ff24 Merge branch 'refs/heads/master' into more-sound-effects 2016-12-06 00:08:45 +09:00
Dean Herbert
e33aaa95a8 Merge pull request #222 from peppy/better-exit-process 
Move the actual outro sequence into Intro rather than MainMenu.
 2016-12-06 00:06:42 +09:00
Dean Herbert
3cb9cb647d Tidy up BackButton and adjust transitions a bit. 2016-12-05 21:36:42 +09:00
Dean Herbert
7bd9a87bda Add menu button sound effects. 2016-12-05 21:09:41 +09:00
Dean Herbert
3056bbda5d Add temporary workaround for crash. 2016-12-05 21:09:17 +09:00
Dean Herbert
8fc8ca3998 Add song select panel sound effects. 2016-12-05 20:09:56 +09:00
Dean Herbert
590ca3108c Add checkbox sound effects. 2016-12-05 19:45:54 +09:00
Dean Herbert
ff85ccca6d Move the actual outro sequence into Intro rather than MainMenu. 2016-12-05 19:34:52 +09:00
Dean Herbert
4d27101aca Add ability to adjust game clock's speed (pgup/pgdn). 
A bit hacky, probably need to expose rate better.
 2016-12-05 19:33:38 +09:00
Thomas Müller
a0131b8b25 Fix slider velocity not being applied. 2016-12-03 14:52:51 +01:00
Thomas Müller
773d64cd5e Update judgement after children have been updated. 2016-12-03 14:40:15 +01:00
Thomas Müller
b81bf7085f Add missing licence headers and fixup using statements. 2016-12-03 13:56:35 +01:00
Thomas Müller
c43b47da2a Add option toggles and configuration for snaking in and out sliders. 2016-12-03 13:56:19 +01:00
Huo Yaoyuan
2eefc320fd Make KeyCounterCollection generic. 2016-12-03 15:58:27 +08:00
Dean Herbert
a80c28ca37 ToolbarOverlayToggleButton 2016-12-02 21:57:01 +09:00
Dean Herbert
9bf36418a0 Make toolbar buttons more independent logic-wise. 
Also adds visual toggle state for toggleable buttons.
 2016-12-02 18:43:01 +09:00
Thomas Müller
1e8dc780ab Use new framework-level triangles. 2016-12-01 19:12:35 +01:00
Thomas Müller
20947623d5 Merge pull request #210 from peppy/online-improvements 
Add login support, better API state change handling.
 2016-12-01 18:50:54 +01:00
Dean Herbert
22905d2033 Align logo correctly between intro and main menu. 
Kinda hacky but will do for now.
 2016-12-01 21:59:32 +09:00
Dean Herbert
413138abe5 Delay movement of ParallaxContainers slightly. 2016-12-01 21:45:40 +09:00
Dean Herbert
2342a17dbc Move BufferedContainer usage to allow ripple to blend correctly with the background layer. 2016-12-01 21:29:14 +09:00
Dean Herbert
511dab32ef Remove masking from Triangles to simplify OsuLogo masking hierarchy. 2016-12-01 21:12:37 +09:00
Dean Herbert
4b74ea7586 Separate logo hover and bounce into separate containers to fix consecutive actions. 2016-12-01 20:52:26 +09:00
Dean Herbert
6909dbf60c Increase cursor trail density a bit. 2016-12-01 20:44:17 +09:00
Dean Herbert
1f370fe29c Add animated osu! logo. 2016-12-01 20:21:14 +09:00
Dean Herbert
858a79c402 Merge pull request #211 from huoyaoyuan/enhancement 
Minor enhancements
 2016-12-01 20:01:39 +09:00
Dean Herbert
918a3bc74f Add glow and bling to game mode selector. 2016-12-01 19:15:34 +09:00
Dean Herbert
3a5c41b970 Restore additive blending for toolbar button backgrounds. 2016-12-01 18:54:32 +09:00
Dean Herbert
11f958030f Make Triangles more flexible and more random. 2016-12-01 18:53:13 +09:00
Dean Herbert
6554a4ea58 Fix shadow not displaying around avatar. 2016-12-01 17:45:32 +09:00
Dean Herbert
25d3818e7a Fix game mode selector line regression. 2016-12-01 17:45:21 +09:00
Dean Herbert
6ccce88a0e Add proper user data retrieval on connect. 2016-12-01 16:44:24 +09:00
Dean Herbert
d7ab74363d Simplify toolbar width/padding calculations. Add avatar display (incorrect user id). 2016-12-01 16:05:54 +09:00
Dean Herbert
0b0fe2a857 Remove incorrect verbatim string specifications. 2016-12-01 16:04:58 +09:00
Dean Herbert
167b559a95 Move toolbar to own namespace. 2016-12-01 14:22:29 +09:00
Dean Herbert
13d26d0601 Tidy up options login section code; fix incorrect flow logic for online state. 2016-12-01 13:07:19 +09:00
Dean Herbert
9d05c132e8 Make Toolbar an IOnlineComponent to tidy up state change logic. 2016-12-01 13:03:40 +09:00
Dean Herbert
c6b7e90739 Merge branch 'refs/heads/master' into online-improvements 2016-12-01 12:51:45 +09:00
Huo Yaoyuan
3a4fb2ffed IsEnabled property for drag bar of music controller. 2016-12-01 08:20:24 +08:00
Thomas Müller
579b8328dc Revert "Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack." 
This reverts commit 27a13eec97.
 2016-11-30 20:50:41 +01:00
Thomas Müller
27a13eec97 Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack. 2016-11-30 20:22:23 +01:00
Dean Herbert
ed879f33df Add logout button and check for inputs before allowing login. 2016-11-30 19:43:03 +09:00
Dean Herbert
01dc7cb5c2 Thread safety, username saving correctly etc. 2016-11-30 19:22:36 +09:00
Dean Herbert
3fa80d2376 Update client id/secret and bring API endpoints up-to-date. 2016-11-30 18:30:24 +09:00
Dean Herbert
a980671c54 Add basic ChatOverlay state handling. 2016-11-30 18:30:19 +09:00
Dean Herbert
11f726ad45 Add basic login flow. 2016-11-30 18:30:15 +09:00
Dean Herbert
88748499fa Register chat overlay with API. 2016-11-30 18:30:10 +09:00
Dean Herbert
18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00
Dean Herbert
34e91c8474 Add the concept of IOnlineComponents, registered tot he API for handling state changes. 2016-11-30 18:30:01 +09:00
Dean Herbert
481b9d3208 Make opening options shift the rest of the screen as per design. 2016-11-30 18:28:18 +09:00
Dean Herbert
6809e2ce0a Use DI to get api for ChatConsole. 2016-11-30 17:07:36 +09:00
Dean Herbert
c26587ec3a Update depth comparer name. 2016-11-30 15:50:48 +09:00
Dean Herbert
5101297f53 Add drop shadows to main menu buttons. 2016-11-30 15:02:53 +09:00
Dean Herbert
d65a275e32 Improve transition of toolbar when hovering. 2016-11-30 13:50:30 +09:00
Dean Herbert
476168eec2 Add shadow to main menu button/icon text. 2016-11-30 13:15:34 +09:00
Dean Herbert
1e037b3eaa Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth 2016-11-30 12:21:12 +09:00
Dean Herbert
e49f312f3f Merge pull request #207 from Tom94/fix-back-button-hover 
Fix being able to hover the back button from outside of its shape.
 2016-11-30 12:20:34 +09:00
Thomas Müller
a456eb6f1b Fix being able to hover the back button from outside of its shape. 
Could alternatively done by shearing the entire button, but then you would need a positional x-offset depending on whether the anchor is top or bottom.
 2016-11-29 21:12:49 +01:00
Thomas Müller
d0065d2d20 Merge pull request #205 from peppy/scoring 
Wire up basic scoring.
 2016-11-29 20:56:53 +01:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Dean Herbert
53df2932ad Merge pull request #199 from stanriders/back-button 
Add stable-alike BackButton
 2016-11-30 03:20:03 +09:00
stanriders
988a9bbaad Switch to relative sizes 2016-11-29 20:27:59 +03:00
Dean Herbert
74e3a87f78 Add *very* basic ranking screen. 2016-11-29 23:59:56 +09:00
Dean Herbert
ca0bea7534 Rename MaximumCombo to HighestCombo. 2016-11-29 22:05:21 +09:00
Dean Herbert
d71b284642 Make ScoreProcessor abstract and avoid making AddJudgement virtual. 2016-11-29 22:02:37 +09:00
Dean Herbert
eb70ae788c Store max combo in ScoreProcessor. 2016-11-29 21:57:53 +09:00
Dean Herbert
18d331f869 Add combo info to JudgementInfo. 2016-11-29 21:46:30 +09:00
Dean Herbert
f8c1f4dd58 Add basic slider judgement handling. 2016-11-29 21:40:24 +09:00
Dean Herbert
2947121e48 Hook up ScoreProcessor to Scoreoverlay etc. 2016-11-29 21:28:43 +09:00
Dean Herbert
9d2a69f1e2 Add concept of ScoreProcessor. 2016-11-29 20:30:16 +09:00
Dean Herbert
fbf35c904d Fix Config regression with DI. 2016-11-29 18:49:03 +09:00
Dean Herbert
fa80cc84f8 Fix volume control fill being incorrect on first display. 2016-11-29 18:35:59 +09:00
Dean Herbert
139fe873f3 Remove silly weld weld weld. 2016-11-29 18:35:40 +09:00
Dean Herbert
9871960112 Basic score flow. 2016-11-29 17:34:16 +09:00
Dean Herbert
a47507fff3 Remove redundant property assignments. 2016-11-29 16:54:54 +09:00
Dean Herbert
3526c299ec Reformat code. 2016-11-29 16:24:37 +09:00
stanriders
2ecf72d0d7 More consts, less crap (probably) 2016-11-29 05:36:48 +03:00
Dean Herbert
a506e91b7c Fix compile issues. 2016-11-28 23:05:05 +09:00
Dean Herbert
49470318f2 Remove silly static using statement. 2016-11-28 22:48:28 +09:00
Dean Herbert
187a8bbfa7 Don't store beatmap reference in hitobjects. 2016-11-28 18:45:50 +09:00
Dean Herbert
bf63be0602 Add better slider duration calculation using bpm and difficulty information. 2016-11-28 15:31:54 +09:00
Dean Herbert
a5651427f6 Add basic ControlPoint parsing. 2016-11-28 15:12:11 +09:00
stanriders
775e8ac5d6 Hardcoded button size, fixed input handling, fixed flash not being visible 2016-11-27 18:56:05 +03:00
Thomas Müller
bd872f6ab8 Explicitly make various member variabled of CursorTrail private. 2016-11-27 15:04:56 +01:00
Thomas Müller
724f849543 Fix incorrect BeatmapPanel border caused by triangles. 2016-11-27 11:49:51 +01:00
stanriders
fb3d5a3b79 One more 2016-11-27 07:18:56 +03:00
stanriders
a3ceef48a6 More backbutton 2016-11-27 07:06:50 +03:00
stanriders
88ead18929 Backbutton improvements 2016-11-27 06:50:36 +03:00
stanriders
ba18c9a309 Merged ExtendableButton and BackButton 2016-11-27 05:48:31 +03:00
stanriders
af57984d5c Moved ExtendableButton out of framework 2016-11-27 04:41:17 +03:00
stanriders
e9343fe53d Add stable-alike BackButton 2016-11-27 04:21:12 +03:00
Thomas Müller
069a19a916 Make CursorTrail efficient and add colouring and transparency support. 2016-11-26 18:01:24 +01:00
Thomas Müller
23d0e52d4f Optimize draw portion of cursor trail. 2016-11-26 14:08:43 +01:00
Dean Herbert
be0cc7badc Code tidying. 2016-11-26 19:25:58 +09:00
Dean Herbert
c978a4c091 Tidy up code. Make trail smooth. 2016-11-26 19:22:56 +09:00
Dean Herbert
af18d25357 Move some styling inside BeatmapInfoWedge and fix initial transition happening too early. 2016-11-26 17:31:35 +09:00
Dean Herbert
5764bf8093 Improve IsAlive logic. 2016-11-26 17:22:58 +09:00
Dean Herbert
a1c3d15e6c Add triangles to difficulty panels. 2016-11-26 17:10:13 +09:00
Dean Herbert
ebab9d66bf Merge remote-tracking branch 'refs/remotes/upstream/master' into carousel-fixes 2016-11-26 17:08:40 +09:00
Dean Herbert
82a708d2c0 Merge pull request #189 from SirCmpwn/general-fixes 
General fixes
 2016-11-26 16:56:07 +09:00
Dean Herbert
396ca9fe91 Remove HitJudgementResolver; reimplement in DrawableHitObject. 2016-11-26 16:51:51 +09:00
Dean Herbert
e36a51acf0 Custom LifetimeList (experimental). 2016-11-25 18:30:13 +09:00
Dean Herbert
f9f72f25a2 Add basic flow for hitobject judgement. 2016-11-25 16:26:50 +09:00
Drew DeVault
89effca12e Remove need for PlaySongSelect ctor to take a db 2016-11-25 00:44:46 -05:00
Drew DeVault
69cb9cf4de Fix up volume encapsulation 2016-11-25 00:21:42 -05:00
Drew DeVault
a3db259071 Fix VolumeMeter.Bindable 2016-11-25 00:21:42 -05:00
Dean Herbert
4184dd2329 Change the way we set our initial y position on first display. 2016-11-25 12:50:18 +09:00
Dean Herbert
f540bf3765 Ensure set headers are above difficulties. 2016-11-25 12:48:59 +09:00
Dean Herbert
35a02aa972 Fade in headers but not difficulties by default. 2016-11-25 12:48:41 +09:00
Dean Herbert
12c74b1b0b Don't set hidden; make it based on alpha value. 2016-11-25 12:47:58 +09:00
Tom94
97b0da1d6b Merge branch 'master' of github.com:ppy/osu into general-fixes 2016-11-24 20:26:44 +01:00
Tom94
495cb926f7 Move beatmap panels back to an X of 0 when they are unselected. 2016-11-24 20:25:29 +01:00
Dean Herbert
6c69bd2ba3 Fix regression causing crash on using z/x in player mode. 2016-11-24 21:27:12 +09:00
Dean Herbert
3dff72ac6c Bypass masking checks for input on playfields. 2016-11-24 18:59:09 +09:00
Dean Herbert
c48acd4c3d Fix coordinates being in wrong space. 2016-11-24 16:17:40 +09:00
Dean Herbert
9938084343 Make parallax container work with global mouse state (so it ignores bounds checks). 2016-11-24 16:04:16 +09:00
Dean Herbert
ece3bc0e01 Refactor BeatmapInfoWedge to be async. 2016-11-24 13:48:48 +09:00
Dean Herbert
1eb04ff11e Don't use the overlay suffix for beatmapInfo wedge. 2016-11-24 13:35:25 +09:00
Dean Herbert
311b5c623c Adjust difficulty panel offsets slightly. 2016-11-24 13:33:32 +09:00
Tom94
718f2b13a8 Do not change depth value of drawables currently contained within a container. 2016-11-24 13:23:05 +09:00
Tom94
3e4ff27865 Simplify Y position computations and do not scroll to selected beatmap whenever Y positions are recomputed. 2016-11-23 17:42:21 +01:00
Dean Herbert
20ae8df2bd Refactor volume control to load asynchronously. 2016-11-23 16:12:21 +09:00
Dean Herbert
0c841cffdd Change GetChildren recursive default to false (should be more common). 2016-11-23 15:34:32 +09:00
Dean Herbert
1e0b7dffc0 Move WedgeBackground to its own class and improve display a bit. 2016-11-23 14:29:20 +09:00
Dean Herbert
622b127180 One missing carousel rename. 2016-11-23 13:28:49 +09:00
Dean Herbert
60d939f323 Use FillMode in more cases. 2016-11-23 13:18:22 +09:00
Dean Herbert
2e05ec0296 Fix scaling of BeatmapInfoOverlay wedge. 2016-11-23 13:07:35 +09:00
Dean Herbert
611619fd9c Fix some namespaces. 2016-11-23 12:00:17 +09:00
Dean Herbert
b3b7fb90c5 Add shadows to toolbar tooltips. 2016-11-23 11:35:52 +09:00
Thomas Müller
030a20a3f2 Fix minor issues with alpha fading at edges. 2016-11-22 21:58:46 +01:00
Thomas Müller
5cf5e8c80c Move BeatmapInfoOverlay into its own class. 
No loading async optimizations yet.
 2016-11-22 21:51:42 +01:00
Thomas Müller
9bf23bc4ad Only handle beatmap panels that are visible in song select. 2016-11-22 21:41:48 +01:00
Thomas Müller
ba1d3ab20e Carousell -> Carousel 2016-11-22 20:10:25 +01:00
Thomas Müller
2596e71494 Improve smooth movement in beatmap carousel. 2016-11-22 20:10:04 +01:00
Thomas Müller
20be2f4628 Terminate loop through beatmap groups when having found a selection. 2016-11-22 19:00:42 +01:00
Thomas Müller
b22762d0e1 Merge branch 'master' of github.com:ppy/osu into better-song-select 2016-11-22 18:55:13 +01:00
Dean Herbert
d71550d22a Don't do a recursive fill by default, we don't need it. 2016-11-22 22:07:28 +09:00
Dean Herbert
4cf2dd90d6 Standardise and simplify the amount of beatmap information passed around song select. 2016-11-22 22:07:15 +09:00
Dean Herbert
ccb00aeb94 Add comment about wedgedBeatmapInfo performance issues. 2016-11-22 21:43:35 +09:00
Dean Herbert
b73cdba08c Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation. 2016-11-22 21:38:46 +09:00
Dean Herbert
a3234a5269 Avoid synchronous queries in BackgroundModeBeatmap. 2016-11-22 21:22:12 +09:00
Dean Herbert
3bc38268a0 Make MusicController more async. 2016-11-22 20:47:28 +09:00
Dean Herbert
f576b4bf82 Don't use texture atlases for beatmap backgrounds. 2016-11-22 20:14:58 +09:00
Dean Herbert
0109c79cae Async load of panel backgrounds (failing for on-screen panels). 2016-11-22 19:48:51 +09:00
Dean Herbert
2ba365657e Tidy up some linq. 2016-11-22 17:21:42 +09:00
Dean Herbert
a251db804c Stop adding beatmaps to song select when disposed. 2016-11-22 16:13:38 +09:00
Dean Herbert
7df8324957 Explicit disposal via using() to WorkingBeatmap. 2016-11-22 14:57:53 +09:00
Dean Herbert
070c7dc621 Merge remote-tracking branch 'refs/remotes/upstream/master' into input-handler-improvements 2016-11-22 12:37:57 +09:00
Dean Herbert
3e9c398652 Update input handler logic to match framework changes. 2016-11-21 21:36:11 +09:00
Dean Herbert
41a84ba00c Add finalizer logic for WorkingBeatmap for now. 2016-11-21 21:35:10 +09:00
Thomas Müller
d32f11b5e2 Smoother movement within song select. 2016-11-21 07:59:46 +01:00
Thomas Müller
318fe2f9d6 Fix broken VisualTests SongSelect. 2016-11-20 20:43:43 +01:00
Thomas Müller
c6d688898f Initial implementation of a beatmap carousell and various minor improvements to song select. 
No big optimizations yet, but groundwork is laid out.
 2016-11-20 20:34:16 +01:00
Thomas Müller
40805ad32c Adjust size of wedged background overlay. 2016-11-20 12:29:38 +01:00
Thomas Müller
57e7c7097d Update framework and add rudimentary fading to song select screen. 2016-11-20 12:16:54 +01:00
Thomas Müller
0fdd505807 Add wedged background overlay to song select. 2016-11-20 10:02:20 +01:00
Thomas Müller
f8788bb24b Update the background according to the currently selected beatmap and blur it within song select. 2016-11-19 17:39:43 +01:00
Dean Herbert
3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert
acb85d0140 Fix regressions in combo counters and tidy up naming of SpriteTexts. 2016-11-19 16:19:54 +09:00
Dean Herbert
1242ae3f2a Add the concept of a HitJudgementResolver. 2016-11-19 16:19:26 +09:00
Dean Herbert
4db2a1e693 Split ApproachCircle out into its own class. 2016-11-18 17:47:47 +09:00
Dean Herbert
885df47864 Add simple implementation of HitExplosions. 2016-11-16 19:24:48 +09:00
Dean Herbert
b61521a93c Tidy up Player.cs. 2016-11-16 15:48:35 +09:00
Dean Herbert
42d2d39ade Merge pull request #171 from huoyaoyuan/improvements 
Various improvements
 2016-11-16 12:00:55 +09:00
Huo Yaoyuan
53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Dean Herbert
89bb87a6f3 Merge pull request #176 from Tom94/simpler-gradient 
Use gradient helper function to create toolbar tooltip gradient.
 2016-11-16 11:18:31 +09:00
Thomas Müller
e049f8582a Fix option checkbox losing its glow incorrectly in certain cases. 2016-11-15 19:11:36 +01:00
Thomas Müller
746c28246f Use gradient helper function to create toolbar tooltip gradient. 2016-11-15 19:09:30 +01:00
Thomas Müller
696d21f762 Merge pull request #174 from peppy/general-fixes 
General fixes
 2016-11-15 18:20:48 +01:00
Dean Herbert
d846246ef2 ShowToolbar -> ShowOverlays; include MusicController. 2016-11-15 20:55:57 +09:00
Dean Herbert
2af839cdbd Render musicController above toolbar. 2016-11-15 20:55:55 +09:00
Dean Herbert
0b8c307549 Toolbar should block Hover events. 2016-11-15 20:55:53 +09:00
Dean Herbert
a2d505af78 ToolbarButtons should still handle MouseDown events. 2016-11-15 20:55:52 +09:00
Dean Herbert
f415e5820f Add an implementation of the new design of checkboxes. 2016-11-15 19:35:01 +09:00
Dean Herbert
5b1711f797 Update some colour palette discrepancies in options. 2016-11-15 19:34:58 +09:00
Dean Herbert
1f73bb4cf0 Set drag bar to correct orange. 2016-11-15 19:34:55 +09:00
Dean Herbert
a92404413c Adjust padding and fonts of options. 2016-11-15 19:34:53 +09:00
Dean Herbert
2cbe2b34fd Change default font weight to Medium. 2016-11-15 19:34:50 +09:00
Dean Herbert
566e09083f Add gradient overlay when hovering toolbar to make tooltips more visible. 
Also adjusts opacity of toolbar.
 2016-11-15 16:25:41 +09:00
Dean Herbert
4b6c139c3e Toolbar buttons should handle on click, not mouse down. 2016-11-15 15:31:48 +09:00
Dean Herbert
867797a089 Change volume control mouse wheel behaviour to not gain full-screen focus. 2016-11-15 15:22:14 +09:00
Dean Herbert
51235343fd Fix ChatConsole regression. 2016-11-15 14:46:57 +09:00
Dean Herbert
abdfe42388 Merge branch 'refs/heads/master' into better-anchors 
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
 2016-11-15 14:33:13 +09:00
Thomas Müller
997bc16d63 Fix incorrect positioning of ButtonSystem. 2016-11-14 19:18:16 +01:00
Huo Yaoyuan
dcd3ba0915 Make Player.Autoplay can be set. 2016-11-15 01:49:06 +08:00
Huo Yaoyuan
f2f6fe8e00 Set option object to members. 2016-11-15 01:49:06 +08:00
Huo Yaoyuan
c8d23408d7 Fix ChatLine for now. 2016-11-15 01:49:05 +08:00
Huo Yaoyuan
1cddc4eb5b Use EqualityComparer<T> to avoid boxing and casting when comparing. 2016-11-15 01:49:05 +08:00
Tom94
c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01:00
Dean Herbert
08bf7c6d39 Make abstract ruleset no play mode. 2016-11-15 01:06:53 +09:00
Dean Herbert
e01057df3d Add thread safety somewhere it will never be required. 2016-11-14 23:13:47 +09:00
Dean Herbert
9a8003f6fa Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure 
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
 2016-11-14 22:08:30 +09:00
Dean Herbert
d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Dean Herbert
0011d7f720 Simplify linq. 2016-11-14 20:24:44 +09:00
Dean Herbert
5dd4e31011 Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Dean Herbert
07fee61989 Use reflection to load Rulesets. 2016-11-14 19:20:27 +09:00
Dean Herbert
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Dean Herbert
06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Dean Herbert
0b203a7bf4 Move enum to end of file. 2016-11-14 16:50:17 +09:00
Dean Herbert
dde3a68c8f Account for anchor when dragging MusicController (fixes VisualTest). 2016-11-14 16:40:13 +09:00
Dean Herbert
1d51e6af2a Merge pull request #168 from huoyaoyuan/fixes 
Fixes for music controller
 2016-11-14 16:11:31 +09:00
Dean Herbert
eb32d842cc Use switch instead of if-else. 2016-11-14 16:10:07 +09:00
Dean Herbert
57c4314cae Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements 2016-11-14 16:00:06 +09:00
Dean Herbert
c37afd7a81 Merge pull request #166 from Tom94/various-improvements 
Various improvements
 2016-11-14 15:59:17 +09:00
Huo Yaoyuan
86a6c7641d Make TransformDirection more clear. 2016-11-14 04:59:41 +08:00
Huo Yaoyuan
7c8ef2a82b Select and unselect BeatmapPanel when selecting BeatmapGroup. 2016-11-14 04:22:06 +08:00
Huo Yaoyuan
33a35ca711 Do not set WorkingBeatmap explicitly in mode stack. 2016-11-14 04:01:48 +08:00
Huo Yaoyuan
afab938794 Strongly typed TransformDirection for music controller. 2016-11-14 03:21:07 +08:00
Thomas Müller
ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Thomas Müller
16dc74df5b Avoid stack overflow when trying to push a not-yet async loaded background. 2016-11-12 18:33:47 +01:00
Dean Herbert
75be78752b Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 22:30:15 +09:00
Thomas Müller
6355c8bd45 Hide scrolldragger in options. 2016-11-12 13:10:53 +01:00
Thomas Müller
1c47773e0d Make sidebar behaviour feel a bit nicer. 2016-11-12 13:08:34 +01:00
Thomas Müller
e923da1998 Fix lastKnownScroll never being written to. 2016-11-12 12:30:12 +01:00
Thomas Müller
98b69bc6c6 Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 12:24:02 +01:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
 2016-11-12 20:18:26 +09:00
Dean Herbert
646fe5c5f4 Merge pull request #155 from peppy/player-improvements 
Introduce back the concept of Rulesets.
 2016-11-12 18:34:32 +09:00
Dean Herbert
80f146e4bd Fix a locally set beatmap getting overridden by the game-global one. 2016-11-12 18:26:27 +09:00
Dean Herbert
099b309645 Introduce back the concept of Rulesets. 2016-11-12 18:26:21 +09:00
Dean Herbert
16a0be44df Add local InputManager to Player; handle Z and X. 2016-11-12 18:26:14 +09:00
Dean Herbert
18c0e431c1 Fix some nullrefs. 2016-11-12 18:25:58 +09:00
Dean Herbert
3b99a8fd06 Add a shadow and bit of elasticity to MusicController. 2016-11-12 17:09:58 +09:00
Dean Herbert
b65eb33774 Fix weird artifacting when the MusicController fades in and out by using a buffered container. 2016-11-12 16:44:31 +09:00
Dean Herbert
8d56a881d0 Merge pull request #157 from SirCmpwn/string-options 
Add TextBoxOption and wire it up
 2016-11-12 16:11:09 +09:00
Dean Herbert
12bc259071 Merge pull request #158 from SirCmpwn/implement-options 
Implement ShowUnicode option behavior
 2016-11-12 16:10:27 +09:00
Dean Herbert
a39d28efe2 Merge pull request #159 from SirCmpwn/platform-options 
Remove certain options when not running on Windows
 2016-11-12 16:05:47 +09:00
Drew DeVault
00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
Drew DeVault
a8bba445db Move scroll logic into Update 2016-11-12 01:44:26 -05:00
Drew DeVault
32196c57af Track the visible section in options 2016-11-12 01:44:11 -05:00
Dean Herbert
ff67b77c5b Merge pull request #154 from peppy/sidebar-toolbar-coexistence 
Make options overlay coexist with toolbar.
 2016-11-11 13:34:08 +09:00
Dean Herbert
27542d9747 Merge pull request #151 from SirCmpwn/options-sidebar 
Expand the options sidebar on hover
 2016-11-11 13:33:10 +09:00
Dean Herbert
a0e1513df6 Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence 
# Conflicts:
#	osu.Game/OsuGame.cs
 2016-11-11 13:30:57 +09:00
Drew DeVault
d36c8e9203 Remove certain options when not running on Windows 2016-11-10 21:54:01 -05:00
Drew DeVault
d49b418449 Implement ShowUnicode option behavior 2016-11-10 21:35:58 -05:00
Drew DeVault
e2365cfad2 s/internalText/InternalText/g 2016-11-10 18:25:20 -05:00
Drew DeVault
a81f099d40 Add TextBoxOption and wire it up 2016-11-10 18:17:15 -05:00
Drew DeVault
0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
Drew DeVault
7327db307b Fix player loading from song select 2016-11-10 16:43:04 -05:00
Drew DeVault
2362665b8a Re-cache the new FontStore when overwritten 
Fixes issues with font loading
 2016-11-10 16:43:04 -05:00
Drew DeVault
fe9034323b Get the game running, though not perfectly 2016-11-10 16:42:29 -05:00
Drew DeVault
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Drew DeVault
dc03f36793 Use DI for Player 2016-11-10 16:38:44 -05:00
Drew DeVault
19fd6fe249 Introduce dependency injection 2016-11-10 16:38:25 -05:00
Dean Herbert
788c11de10 Merge pull request #103 from huoyaoyuan/music-controller 
Music controller
 2016-11-10 12:54:56 +09:00
Dean Herbert
904d258dc3 Fix checkbox not updating correctly. 2016-11-09 20:13:13 +09:00
Dean Herbert
a5dcae859c Give OptionsOverlay an offset to make up for toolbar possibly being present. 2016-11-09 15:24:27 +09:00
Dean Herbert
d9bd3717d0 Re-organise overlay-level elements in OsuGame. 2016-11-09 15:24:24 +09:00
Dean Herbert
fdb83bed79 Make OsuGameModes self-aware of if they want a toolbar or not. 2016-11-09 15:24:22 +09:00
Dean Herbert
9d1d5a5cea Modify toolbar tooltips to be closer to design. 2016-11-09 15:24:19 +09:00
Drew DeVault
676cdc44b2 Add expanding options sidebar 2016-11-08 23:36:06 -05:00
Drew DeVault
3ad633f363 Wire up all of the boolean options 2016-11-08 23:17:08 -05:00
Dean Herbert
04fa1f897e Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling. 2016-11-09 12:32:38 +09:00
Dean Herbert
d41d7b8e9a Don't derive ScrollContainer unnecessarily. 2016-11-09 12:10:22 +09:00
Dean Herbert
d70e8806b4 Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes 2016-11-09 11:41:36 +09:00
Dean Herbert
28a94e2df1 Remove unused constant. 2016-11-08 20:35:21 +09:00
Dean Herbert
3ef26a6bf0 Fix paddings, transitions, const variable names. 2016-11-08 20:23:18 +09:00
Dean Herbert
97f3023cd9 Ctrl+O for options. 2016-11-08 19:27:37 +09:00
Dean Herbert
4426a683ed Move OptionsOverlay to OsuGame. 2016-11-08 19:26:12 +09:00
Dean Herbert
89b11ed099 Handle sidebar buttons onClick not onMouseDown. 2016-11-08 19:18:31 +09:00
Dean Herbert
8c68f9ba93 OptionsSideNav -> OptionsSidebar. 2016-11-08 19:17:09 +09:00
Dean Herbert
3b0114671e Max sidebar draggable. 2016-11-08 19:16:39 +09:00
Dean Herbert
30323876a8 Use preload for options (fix icons). 2016-11-08 18:49:20 +09:00
Dean Herbert
a851d7b44f Updates. 2016-11-08 18:33:31 +09:00
Dean Herbert
c36b54b35a Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container 2016-11-08 18:29:21 +09:00
Drew DeVault
743c1bde58 Wire up alternative chat font 2016-11-07 22:37:21 -05:00
Drew DeVault
1bca78f4b6 Wire up one of the settings to the config 
One step at a time, right
 2016-11-07 22:36:24 -05:00
Drew DeVault
fbbd05e606 Remove unnecessary TODO 2016-11-07 22:28:02 -05:00
Drew DeVault
a6593505b3 Say NO to RelativeSizeAxes = Both 2016-11-07 22:19:02 -05:00
Drew DeVault
4d04eb6fb1 Rearrange some options a bit, update framework 2016-11-07 22:15:48 -05:00
Drew DeVault
cbbac0565f Remove unused using statements 2016-11-07 21:28:06 -05:00
Drew DeVault
1ce6a7285a Rearrange options namespaces 2016-11-07 21:24:41 -05:00
Drew DeVault
b2bbdfa284 Refactor how the sidebar buttons are created/used 2016-11-07 18:04:49 -05:00
Drew DeVault
e6c3fc1091 Implement scrolling to each section 2016-11-07 17:07:55 -05:00
Huo Yaoyuan
ef5968e243 More robust metadata handling. 2016-11-07 23:12:49 +08:00
Huo Yaoyuan
fd977cacb3 Fix corner case when shuffling. 2016-11-07 23:06:14 +08:00
Huo Yaoyuan
02b903f1ea Shuffle playlist. 2016-11-07 22:12:58 +08:00
Huo Yaoyuan
dc347a74f5 Don't play transition if audio equals. 2016-11-07 21:58:30 +08:00
Huo Yaoyuan
c59cad2478 AudioEquals method for BeatmapInfo. 2016-11-07 21:52:23 +08:00
Huo Yaoyuan
d1f64cfbfc Make external changes into history. 2016-11-07 21:30:25 +08:00
Huo Yaoyuan
ad1dccf6ce Use play history for back and forward. 2016-11-07 21:25:37 +08:00
Huo Yaoyuan
644e337cf6 Add a list for play history. 2016-11-07 20:57:33 +08:00
Dean Herbert
d57d5daac9 Support generic FlowContainer. 2016-11-07 21:17:29 +09:00
Dean Herbert
a61fb5ef5d Initial updates to make generic containers work. 2016-11-07 21:13:56 +09:00
Huo Yaoyuan
c272041f37 Block click and drag at MusicController level. 2016-11-07 20:07:45 +08:00
Huo Yaoyuan
736079a60d Update FontAwesome usage. 2016-11-07 19:00:20 +08:00
Huo Yaoyuan
8037f1233f Merge branch 'master' 2016-11-07 18:58:35 +08:00
Dean Herbert
f14a35d480 Update FontAwesome definitions. 2016-11-07 17:59:00 +09:00
Thomas Müller
90c889a7ce Smoothen wedged buttons in main menu and the wedges on song select background. 2016-11-06 19:34:44 +01:00
Thomas Müller
103176826f Ensure transformations are never used prior to being added to the Drawable tree. 2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks 
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
 2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2 Remove now obsolete clock usages. 2016-11-06 10:06:09 +01:00
Huo Yaoyuan
c8a7bd2ece Minor implementation changes. 2016-11-06 16:47:37 +08:00
Huo Yaoyuan
000c2218b8 Make background update happens in update thread, and thread-safer. 2016-11-06 16:34:47 +08:00
Thomas Müller
8894e5f73a Fade the options overlay to prevent unnecessary updates to its content. 2016-11-06 08:54:36 +01:00
Thomas Müller
a6c0fd29f2 Make use of new timing system in Drawables and Transforms. 2016-11-06 08:25:21 +01:00
Maciej
bcc1d7c669 Background scaling different approach 2016-11-06 04:37:41 +01:00
Maciej
c4132339a6 Working beatmap background scaling fix 
Add a check for the working beatmap background width and assign a proper
scaling value to cover the whole box
 2016-11-06 04:12:35 +01:00
Huo Yaoyuan
d63e3b6724 Add fallback texture of beatmap when getting null; 2016-11-06 05:37:55 +08:00
Huo Yaoyuan
0c6825bb20 Adjust visual behavior. 2016-11-06 05:35:35 +08:00
Huo Yaoyuan
c53298a3b1 Update font size (*1.25) to follow the design image. 2016-11-06 01:53:10 +08:00
Huo Yaoyuan
74000f77ad Set font in music controller. 2016-11-06 01:50:38 +08:00
Huo Yaoyuan
a19bb1270d Async workflow on music controller. 2016-11-06 00:46:09 +08:00
Huo Yaoyuan
859a59a8ab Set children in constructor. 2016-11-06 00:24:03 +08:00
Huo Yaoyuan
5eed07db57 Update access of WorkingBeatmap. 2016-11-06 00:13:45 +08:00
Huo Yaoyuan
c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00
Dean Herbert
3c8f94dd0f Merge pull request #136 from Tom94/general-fixes 
Fix wrong initial state of beatmap panels.
 2016-11-05 23:04:37 +09:00
Thomas Müller
7c7e2160ec Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 2016-11-05 14:05:42 +01:00
Thomas Müller
619d97c642 Fix indentation and typo. 2016-11-05 13:51:52 +01:00
Thomas Müller
07e74068e7 Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
 2016-11-05 13:35:15 +01:00
Huo Yaoyuan
e69dac7745 Fix lock object. 2016-11-05 20:21:08 +08:00
Huo Yaoyuan
f2b37e1fe7 Add lock on each property of WorkingBeatmap. 2016-11-05 20:01:46 +08:00
Thomas Müller
ba39a9df8e Fix wrong initial state of beatmap panels. 2016-11-05 12:24:15 +01:00
Dean Herbert
a11d534067 Add beatmap backgrounds. 2016-11-05 20:00:14 +09:00
Dean Herbert
7cc19d74c6 Add full Exo font set and bring song select panels closer to final design. 2016-11-05 18:22:09 +09:00
Dean Herbert
8fe63689a4 Fix thread safety issue when accessing files in beatmap (zip) files. 2016-11-05 18:19:01 +09:00
Dean Herbert
2ee5e2efb7 Bring framework up-to-date. 
# Conflicts:
#	osu-framework
 2016-11-05 18:18:52 +09:00
Huo Yaoyuan
2d86cb1e81 Merge branch 'master' 2016-11-05 16:21:59 +08:00
Dean Herbert
10f2ed4387 Add explicit privates. 2016-11-04 16:12:35 +09:00
Dean Herbert
b17d219ace Share Triangles logic. 2016-11-04 16:11:22 +09:00
Dean Herbert
108b7092c9 Fix regression in hitcircle appearance. 2016-11-04 16:08:04 +09:00
Dean Herbert
9df43c6d33 Fix draw order of hitobjects. 2016-11-04 15:43:53 +09:00
Dean Herbert
da18e2d4f6 Fix off-by-one colour retrieval. 2016-11-04 15:43:53 +09:00
Dean Herbert
b72e9221fd Only add valid hitobjects. 2016-11-04 15:43:53 +09:00
Dean Herbert
74c655ebfc Fix input not working. 2016-11-04 15:43:53 +09:00
Dean Herbert
b40ccccbe4 Add HitObject colours back in the mix. 2016-11-04 15:43:53 +09:00
Dean Herbert
92b85b251e Fix scale more. 2016-11-04 15:43:53 +09:00
Dean Herbert
e939746159 Fix scale ratio of gamefield. 2016-11-04 15:43:53 +09:00
Dean Herbert
788cba6f4d Add autoplay toggle (const). 2016-11-04 15:43:53 +09:00
Dean Herbert
f5f5aa9eac Fix some incorrect default values. 2016-11-04 15:43:53 +09:00
Dean Herbert
a4e2f25065 Flush recursively, more transform tidying. 2016-11-04 15:43:53 +09:00
Dean Herbert
1854160321 Add hit time and the ability for an external operator to block hits. 2016-11-04 15:43:53 +09:00
Dean Herbert
fbaae94ba4 Limit state changes to apply only once. 2016-11-04 15:43:53 +09:00
Dean Herbert
8d4e7038b3 Part -> Layer. 2016-11-04 15:43:53 +09:00
Dean Herbert
bc53642cab Fix some warnings. 2016-11-04 15:40:05 +09:00
Dean Herbert
10e5472624 Block mouse events from hitting things behind options. 2016-11-04 12:29:05 +09:00
Dean Herbert
2135b93791 Make options semi-transparent. 2016-11-04 12:28:00 +09:00
Dean Herbert
f3d461e318 Fix some events not firing correctly. 2016-11-04 12:27:43 +09:00
Drew DeVault
408173319b Refactor options header and layout stuff 2016-11-03 23:01:11 -04:00
Drew DeVault
cb40b7079f Rework how references are passed about 2016-11-03 22:43:00 -04:00
Drew DeVault
af8e4415c3 Split out [Sub]sections into seperate files 2016-11-03 19:06:22 -04:00
Drew DeVault
1d8c6db0a7 Add remaining options 2016-11-03 19:06:22 -04:00
Drew DeVault
c7fa0a5ab0 Add more options 2016-11-03 19:06:22 -04:00
Drew DeVault
7e77efcfdc Add Graphics options 2016-11-03 19:06:22 -04:00
Drew DeVault
6c0cef894e Add OsuButton with sane defaults 2016-11-03 19:06:22 -04:00
Drew DeVault
2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
Drew DeVault
2f990b884e Tweak style to more closely match osu!next 2016-11-03 19:06:22 -04:00
Drew DeVault
40e667b2d8 Add default values from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
89d3f4c2be Import enum from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
dd0cb5da01 Add options from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
9f78f8607b Implement General options section 2016-11-03 19:06:22 -04:00
Drew DeVault
2aaff01675 Implement config persistence through BasicStorage 2016-11-03 19:06:22 -04:00
Huo Yaoyuan
9e0fbed748 Use PreLoad on music controller. 2016-11-03 22:38:10 +08:00
Huo Yaoyuan
f2a8cc0c29 Merge branch 'master' 2016-11-03 20:38:34 +08:00
Dean Herbert
439204b4fa Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow 2016-11-03 16:44:49 +09:00
Dean Herbert
54dbb0a355 Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow 
# Conflicts:
#	osu.Game/Beatmaps/Drawable/Panel.cs
 2016-11-02 16:43:35 +09:00
Dean Herbert
617a3f5c4f Adjust glow colour slightly. 2016-11-02 10:22:46 +09:00
Dean Herbert
2811d55e13 Merge pull request #120 from Tom94/fix-beatmap-panel-border-alpha 
Fix beatmap panel border alpha being way too large.
 2016-11-02 09:57:32 +09:00