Dean Herbert
|
9f90b57543
|
Move BPM calculations to Beatmap.
|
2017-01-30 16:03:45 +09:00 |
|
Dean Herbert
|
0272c4b559
|
Add StarDifficulty property and correct colouring of difficulty icons.
|
2017-01-30 15:26:28 +09:00 |
|
Dean Herbert
|
1f2f2fa144
|
Fix visualtests.
|
2017-01-30 15:15:56 +09:00 |
|
Dean Herbert
|
0c2152f3d0
|
Use beatmap's play mode.
|
2017-01-30 13:14:02 +09:00 |
|
Dean Herbert
|
e93f60396f
|
Add the ability for individual game modes to report statistics for display at song select.
|
2017-01-30 13:12:30 +09:00 |
|
DrabWeb
|
28967cf77a
|
Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups
|
2017-01-29 05:04:48 -04:00 |
|
Dean Herbert
|
3286713d11
|
avg -> mostly
|
2017-01-29 15:16:38 +09:00 |
|
Dean Herbert
|
6027cc7afa
|
Formatting fixes.
|
2017-01-29 15:15:04 +09:00 |
|
Dean Herbert
|
2e76874384
|
Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).
|
2017-01-29 15:09:42 +09:00 |
|
Dean Herbert
|
3125fa89ee
|
Fix method which should be class.
|
2017-01-29 15:06:44 +09:00 |
|
Dean Herbert
|
77558abf58
|
Merge branch 'master' into more-beatmap-info
# Conflicts:
# osu.Game/Screens/Select/BeatmapInfoWedge.cs
|
2017-01-29 14:47:42 +09:00 |
|
DrabWeb
|
582599a8de
|
Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar
|
2017-01-28 16:55:42 -04:00 |
|
Drew DeVault
|
10897486ba
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-27 15:41:46 -05: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 |
|
DrabWeb
|
601a5ed39c
|
Reverted Player to upstream
|
2017-01-27 14:29:51 -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
|
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
|
81de5a2097
|
Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)
|
2017-01-27 06:36:43 -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 |
|
Dean Herbert
|
5787b43586
|
wip
|
2017-01-27 19:14:44 +09:00 |
|
DrabWeb
|
fe265c01cb
|
Added current work on pause overlay
|
2017-01-27 05:24:49 -04:00 |
|
Dean Herbert
|
6d44c5c8f1
|
Move logo colour definitions local to their usage.
|
2017-01-27 17:57:52 +09:00 |
|
Dean Herbert
|
9b2669e1ae
|
Add flash when activating the osu! logo.
|
2017-01-27 17:23:53 +09:00 |
|
Dean Herbert
|
50e4c39e32
|
Add flash when activating a menu button.
|
2017-01-27 17:23:53 +09:00 |
|
Dean Herbert
|
a238637990
|
Move osu! logo colour declarations to palette.
|
2017-01-27 17:23:53 +09:00 |
|
Dean Herbert
|
f3e9da609e
|
Merge pull request #295 from peppy/songselect-footer
Initial implementation of song select footer area.
|
2017-01-27 16:13:43 +09:00 |
|
Drew DeVault
|
f3c5c1f0b8
|
Fixes following recent updates upstream
|
2017-01-26 21:31:28 -05:00 |
|
Drew DeVault
|
417933b7ec
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-26 13:57:55 -05:00 |
|
Dean Herbert
|
f07b9591cd
|
Add null check when popping backgrounds from the mode stack.
|
2017-01-27 00:41:34 +09:00 |
|
Dean Herbert
|
139cac5e57
|
Add fail dialog and flow.
|
2017-01-27 00:41:34 +09:00 |
|
Dean Herbert
|
8c7bb4990c
|
Add support for failing.
|
2017-01-27 00:38:21 +09:00 |
|
Dean Herbert
|
70271fee35
|
Move PlayerInputManager to own file.
|
2017-01-27 00:38:21 +09:00 |
|
Dean Herbert
|
4a7b3cf391
|
Initial implementation of song select footer area.
|
2017-01-27 00:36:12 +09:00 |
|
Dean Herbert
|
1853bbdda8
|
Move window/volume configuration to framework level.
|
2017-01-25 18:44:51 +09:00 |
|
Dean Herbert
|
3a27178bb1
|
Merge pull request #289 from UselessToucan/JudgementsCapacity
Specify ScoreProcessor.Judgements.Capacity
|
2017-01-23 21:40:00 +09:00 |
|
Dean Herbert
|
ae464fcace
|
Move Intro logic to OnEntering in line with framework changes.
|
2017-01-20 16:30:24 +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
|
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 |
|
Drew DeVault
|
c222be05c0
|
Add Color4.Opacity and OsuColor.Gray
|
2017-01-10 13:44:40 -05: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 |
|
柯十六夜
|
ef11c3f389
|
Add default Beatmap ID
|
2016-12-21 14:47:56 +08:00 |
|
柯十六夜
|
02f6e46105
|
Add support for v9 beatmaps
|
2016-12-20 23:56:49 +08: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 |
|
n4b3l
|
df305989d0
|
use config bindable directly
|
2016-12-18 10:48:59 +01: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 |
|
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
|
8ce18e8986
|
Improve song select startup time via better database querying. Also fix difficulty displays.
|
2016-12-15 22:58:32 +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 |
|
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
|
6cfb174f02
|
Fix exiting results screen returning to player.
|
2016-12-08 20:03:18 +09:00 |
|
Dean Herbert
|
bbc11c77ca
|
Add (temporary) transitions to songselect and player.
|
2016-12-07 20:47:28 +09:00 |
|
Dean Herbert
|
f356640cb7
|
Add missing licence headers.
|
2016-12-06 19:07:15 +09:00 |
|
Dean Herbert
|
ef8793ff24
|
Merge branch 'refs/heads/master' into more-sound-effects
|
2016-12-06 00:08:45 +09:00 |
|
Dean Herbert
|
7bd9a87bda
|
Add menu button sound effects.
|
2016-12-05 21:09:41 +09:00 |
|