yugecin
|
a6540044b6
|
Merge remote-tracking branch 'remotes/original/master' into upstream
# Conflicts:
# src/itdelatrisu/opsu/Container.java
# src/itdelatrisu/opsu/GameData.java
# src/itdelatrisu/opsu/Options.java
# src/itdelatrisu/opsu/audio/MusicController.java
# src/itdelatrisu/opsu/objects/Circle.java
# src/itdelatrisu/opsu/objects/Slider.java
# src/itdelatrisu/opsu/render/CurveRenderState.java
# src/itdelatrisu/opsu/states/Game.java
# src/itdelatrisu/opsu/states/MainMenu.java
# src/itdelatrisu/opsu/states/SongMenu.java
# src/itdelatrisu/opsu/ui/Colors.java
# src/itdelatrisu/opsu/ui/MenuButton.java
|
2016-12-24 14:35:20 +01:00 |
|
Jeffrey Han
|
e161d0180e
|
Follow-up to #211: fix slider hit results not appearing; code cleanup.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
2016-12-19 16:33:20 -05:00 |
|
yugecin
|
3ca2653197
|
adjust the slider circles alpha when hidden mod is enabled
|
2016-12-18 16:41:52 +01:00 |
|
yugecin
|
b252f0ec42
|
use the same fade for reversearrows as circles
|
2016-12-18 16:37:48 +01:00 |
|
yugecin
|
5be3fdf1a3
|
fade in slider circles after repeats, hide them if ball does not need to go to them again
|
2016-12-18 16:18:51 +01:00 |
|
yugecin
|
2260299c4b
|
don't show reversearrow pop when slider wasn't held
|
2016-12-18 15:06:21 +01:00 |
|
yugecin
|
55fa6f4070
|
fix initial circle animation position
|
2016-12-18 14:53:04 +01:00 |
|
yugecin
|
3c6b20f4c8
|
adjust the animations on the first circle of the slider
|
2016-12-18 14:46:02 +01:00 |
|
yugecin
|
62a7ee0f21
|
always fadeout slider curve
|
2016-12-18 13:03:09 +01:00 |
|
yugecin
|
cb09e2149c
|
let sliders shrink one point more for more fluent shrinking
|
2016-12-13 15:45:18 +01:00 |
|
yugecin
|
d7d28a559b
|
fix shrinking sliders on sliders with odd amount of repeats when using fallback rendering (close #108)
|
2016-12-13 15:44:33 +01:00 |
|
yugecin
|
1c5f66f149
|
Option to disable reverse arrow hit anim
|
2016-12-12 08:37:21 +01:00 |
|
yugecin
|
6f46092766
|
follow-up to 1bf9186: don't color the reversearrow black on bright combo color, add mirror reverseerror fade out
|
2016-12-12 08:33:57 +01:00 |
|
yugecin
|
3048b31ec7
|
follow-up to 1bf9186
|
2016-12-12 01:36:00 +01:00 |
|
yugecin
|
1bf9186685
|
Merge remote-tracking branch 'remotes/yugefork/slider-improvements'
# Conflicts:
# src/itdelatrisu/opsu/GameData.java
# src/itdelatrisu/opsu/objects/Slider.java
|
2016-12-12 01:35:33 +01:00 |
|
yugecin
|
0d9378edb0
|
remove an unused parameter
|
2016-12-12 01:23:12 +01:00 |
|
yugecin
|
50912cf72e
|
remove an unused variable
|
2016-12-12 01:21:37 +01:00 |
|
yugecin
|
a3813075d7
|
fade in sliderticks after repeat
|
2016-12-12 01:21:05 +01:00 |
|
yugecin
|
83466c9ef5
|
fade out reversearrows after ball passed them
|
2016-12-12 01:05:32 +01:00 |
|
yugecin
|
497f41ec6b
|
show initial slidercircle hit for non-auto player too
|
2016-12-12 00:36:26 +01:00 |
|
yugecin
|
814922e58a
|
Merge branch 'options-redesign'
|
2016-12-11 13:34:28 +01:00 |
|
yugecin
|
f0c51084d1
|
clean up options
|
2016-12-11 13:25:04 +01:00 |
|
yugecin
|
6238f378be
|
fix shrinking knorkesliders
|
2016-12-10 19:54:03 +01:00 |
|
yugecin
|
d96bbd3a08
|
attempt to fix shrinking sliders
|
2016-12-10 19:30:21 +01:00 |
|
yugecin
|
22a6cfd851
|
fix code order to fade in reversearrows
|
2016-12-10 11:07:47 +01:00 |
|
yugecin
|
badae5f85c
|
Merge remote-tracking branch 'remotes/original/master' into upstream
# Conflicts:
# src/itdelatrisu/opsu/objects/Slider.java
|
2016-12-10 11:00:58 +01:00 |
|
Jeffrey Han
|
cc250ad6fc
|
Follow-up to #210.
Disabled bouncing reverse arrow; minor cleanup.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
2016-12-10 00:49:33 -05:00 |
|
yugecin
|
452daee4d8
|
bouncy reversearrow
|
2016-12-10 02:16:58 +01:00 |
|
yugecin
|
8ea4bcf7de
|
expand followcircle on sliderticks
|
2016-12-10 02:13:56 +01:00 |
|
yugecin
|
5657290abf
|
fix first tick after repeat being ignored
|
2016-12-10 02:08:37 +01:00 |
|
yugecin
|
ffd1a57755
|
don't draw sliderticks that the sliderball already passed
|
2016-12-10 02:04:37 +01:00 |
|
yugecin
|
7a45e1abbb
|
fade out sliders when hidden is enabled
|
2016-12-10 01:54:29 +01:00 |
|
yugecin
|
5989c50456
|
fix #94
|
2016-12-07 13:35:29 +01:00 |
|
yugecin
|
d5296d51fa
|
fix shrinking sliders for fallback sliders
|
2016-12-05 00:35:11 +01:00 |
|
yugecin
|
766e3657c7
|
hide sliderticks that the ball already passed
|
2016-12-04 22:16:25 +01:00 |
|
yugecin
|
8171cfdec6
|
also use splice for non-merging sliders instead of reverse
|
2016-12-04 22:03:09 +01:00 |
|
yugecin
|
0eb09d4e0d
|
shrink the slider faster
|
2016-12-04 21:53:10 +01:00 |
|
yugecin
|
a3af1c71b8
|
attemt to fix shrinking sliders with odd amount of repeats with merged slider rendering
|
2016-12-04 21:52:15 +01:00 |
|
yugecin
|
50f475e0f7
|
correct shrinking sliders for slider with odd amount of repeats
|
2016-12-04 21:12:22 +01:00 |
|
yugecin
|
00fcf0ebc1
|
add options for slider styles and make it all work
|
2016-12-04 17:35:55 +01:00 |
|
yugecin
|
06445e59c4
|
fix slider leftovers being drawn
|
2016-12-03 20:13:58 +01:00 |
|
yugecin
|
580f11a3d3
|
draw sliders on correct times
|
2016-12-03 19:11:36 +01:00 |
|
yugecin
|
89245d9976
|
first attempt at merging sliders
|
2016-12-03 18:39:20 +01:00 |
|
yugecin
|
e025fd70d5
|
make reversearrows expand more like in osu! (close #50)
|
2016-11-20 13:05:37 +01:00 |
|
yugecin
|
e2e1ee2dfc
|
fix first slidertick after repeats not working
|
2016-11-18 01:09:04 +01:00 |
|
yugecin
|
d3552bc3ad
|
add followcircle expand on ticks (close #49)
|
2016-11-18 00:50:20 +01:00 |
|
yugecin
|
8d9e7aba94
|
Merge branch 'sb'
|
2016-11-13 01:39:41 +01:00 |
|
yugecin
|
cf14bca4a5
|
prevent hue shifting when hue inc or obj color override is changed by sb
|
2016-11-13 01:39:30 +01:00 |
|
yugecin
|
992655ff10
|
only show arrow when slider has been clicked initially
|
2016-11-13 01:19:59 +01:00 |
|
yugecin
|
711fd0a03e
|
fix object color override for sb
|
2016-11-13 00:58:50 +01:00 |
|