Jeffrey Han
1b99795abd
Draw hit objects on top of hit result animations.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-19 17:13:22 -05: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
Jeffrey Han
d111fc0efe
Merge pull request #211 from yugecin/slider-improvements
...
Slider improvements (fade in ticks, fade out reversearrow, animations)
2016-12-19 14:21:01 -05:00
Jeffrey Han
6bc6441985
Follow-up to #216 .
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-19 14:17:41 -05:00
Matteo Signer
2aa1fd7b4e
Fix OpenGL version requirement.
2016-12-19 17:42:21 +01:00
Matteo Signer
bae3b711cf
Render end cap at all times.
2016-12-19 17:33:10 +01:00
yugecin
624296deea
add a timingpoint for the themesong so the logo can be pulsed
2016-12-18 23:51:30 +01:00
yugecin
0ee16f2cb2
javadoc adjustment
2016-12-18 23:48:55 +01:00
yugecin
f47d54c4d0
added pulsing logo at the bottom right of the song menu
2016-12-18 23:45:33 +01:00
yugecin
f7e42c271f
make the main menu logo pulse
2016-12-18 23:41:36 +01:00
yugecin
13e1fb5193
parse timingpoints of a map when playing the song, to allow logo pulsing
2016-12-18 23:40:58 +01:00
yugecin
ff68145ba3
added BeatmapParser#parseOnlyTimingPoints
2016-12-18 23:39:39 +01:00
yugecin
77c6dfd65a
added MusicController#getBeatProgress
2016-12-18 23:31:17 +01:00
yugecin
474b40750e
allow custom scale overrides on menubuttons
2016-12-18 23:29:49 +01:00
yugecin
caefbdee9b
minor cleanup
2016-12-18 22:57:19 +01:00
yugecin
338e74b7d2
pulse mainmenu logo when nothing is playing ( close #105 )
2016-12-18 21:12:40 +01:00
yugecin
c974374d67
Add option to color main menu logo based on the cursor color ( close #82 )
2016-12-18 21:03:19 +01:00
yugecin
64a3a85eb0
ghost logo adjustments
2016-12-18 20:35:08 +01:00
yugecin
089ff7d0de
minor cleanup
2016-12-18 16:47:55 +01: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
59ed2f9ee3
don't draw animations when hidden is enabled
2016-12-18 13:08:36 +01:00
yugecin
62a7ee0f21
always fadeout slider curve
2016-12-18 13:03:09 +01:00
Jeffrey Han
db73fc9e14
Merge pull request #212 from mad-s/master
...
Fix falling sliders with new slider style.
2016-12-14 12:55:58 -05:00
Matteo Signer
2ade7fa349
Fix falling sliders with new slider style.
2016-12-14 15:31:41 +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
d9669ddcd5
gracefully handle error when loading all beatmaps ( close #110 )
2016-12-13 15:22:23 +01:00
yugecin
18e1ef1fcd
fix pippi radius not updating
2016-12-13 15:02:37 +01:00
yugecin
176de19745
nullcheck to fix #106
2016-12-13 00:01:01 +01:00
yugecin
33064b1e69
fix mirror reversearrow animation drawing when it shouldn't
2016-12-12 20:35:40 +01:00
yugecin
69cdecca69
Merge remote-tracking branch 'remotes/origin/master'
2016-12-12 19:54:20 +01:00
yugecin
c88035a66c
disable chaning to polymover when changing from storyboard ( close #102 )
2016-12-12 19:48:03 +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
4c6c0bd24c
kickstart cursor differently so it doesnt draw a line
2016-12-12 00:24:03 +01:00
yugecin
c11d8b3053
Merge branch 'sb'
2016-12-12 00:16:16 +01:00
yugecin
a8a92bce5c
fix wm
2016-12-12 00:16:05 +01:00
yugecin
baa43ac544
attempt to fix sb again
2016-12-11 20:15:08 +01:00
yugecin
86ebe2ef73
more sb fixes
2016-12-11 20:03:28 +01:00
yugecin
f446d29f36
fix!! changing obj color overrides in sb not working
2016-12-11 19:55:58 +01:00
yugecin
a22c232beb
fix cursortrail when changing sb index
2016-12-11 19:25:35 +01:00
yugecin
dce918208b
do cursortrail kickoff offscreen
2016-12-11 19:19:54 +01:00
yugecin
5af1facbbe
don't save wm
2016-12-11 19:06:46 +01:00
yugecin
6660f127f9
attempt to fix stuff not updating
2016-12-11 16:32:21 +01:00
yugecin
98e9b5c210
fix sb speed once and for all
2016-12-11 14:52:54 +01:00
yugecin
7309399fd5
fix speed resetting when skipping objects using sb
2016-12-11 14:41:09 +01:00
yugecin
642baf1081
fix mirror curve for mergingsliders
2016-12-11 14:37:48 +01:00
yugecin
cfa27727db
fix pippi radius option value range
2016-12-11 14:25:30 +01:00
yugecin
366eda0310
fix opsu not being able to start
2016-12-11 14:15:15 +01:00
yugecin
f06c285d22
change the position of the remove bg option
2016-12-11 14:07:23 +01:00
yugecin
f7ab8b2f01
kickstart the cursor trail for every state
2016-12-11 14:05:15 +01:00
yugecin
c1a07feee4
attempt to fix no cursortrail at start of slow maps ( close #73 )
2016-12-11 13:43:28 +01:00
yugecin
3675479f57
remove the 'unstable' from shrinking/merging sliders options
2016-12-11 13:39:40 +01:00
yugecin
814922e58a
Merge branch 'options-redesign'
2016-12-11 13:34:28 +01:00
yugecin
00616abf47
fix some option units
2016-12-11 13:31:54 +01:00
yugecin
f0c51084d1
clean up options
2016-12-11 13:25:04 +01:00
yugecin
03ef993a18
let the parent draw UI, fix SBoverlay input events
2016-12-11 12:16:20 +01:00
yugecin
da65270ab0
use new option overlay for storyboard menu
2016-12-11 11:57:17 +01:00
yugecin
b177605cbb
cleanup
2016-12-11 11:10:32 +01:00
yugecin
3c8b769248
make comboboxes work
2016-12-11 11:07:28 +01:00
yugecin
1bd5da6434
make sliders slide
2016-12-11 10:08:22 +01:00
yugecin
988975c612
checkboxes, sliders
2016-12-11 02:08:35 +01:00
yugecin
edd781b0d4
one big optionmenu
2016-12-11 01:17:30 +01:00
yugecin
8c172dc15f
draw the logo in the bottom right corner of the songmenu
2016-12-10 20:36:34 +01:00
yugecin
22d3ee1b32
move the method to get the beat progress to MusicController
2016-12-10 20:15:19 +01:00
yugecin
6238f378be
fix shrinking knorkesliders
2016-12-10 19:54:03 +01:00
yugecin
ab37d438e0
redraw instead of trying to do miracles
2016-12-10 19:49:43 +01:00
yugecin
d96bbd3a08
attempt to fix shrinking sliders
2016-12-10 19:30:21 +01:00
yugecin
7126cd58a5
add option to disable hit animations ( close #95 )
2016-12-10 17:33:34 +01:00
yugecin
b76a3b366d
don't show slider endcircle fadeout animation
2016-12-10 17:28:58 +01:00
yugecin
0132f00073
get rid of code repetition
2016-12-10 17:26:55 +01:00
yugecin
961ea097c7
fix crashing caused by merged slider when map doesn't have sliders
2016-12-10 17:19:45 +01:00
yugecin
f9e33a60ae
show option description as tooltip when hovering option
2016-12-10 17:08:21 +01:00
yugecin
a40c8b5d31
visit every object when multiple objects end during the same update ( close #72 )
2016-12-10 16:20:50 +01:00
yugecin
3a137b0ff0
allow seticon to fail ( close #85 )
2016-12-10 14:46:46 +01:00
yugecin
b66c0d5c5c
add nullcheck ( fix #96 )
2016-12-10 11:21:03 +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
Jeffrey Han
3dad0c93a9
Merge pull request #210 from yugecin/slider-improvements
...
Slider improvements (hidden, followcircle, ticks, reversearrow)
2016-12-10 00:08:49 -05:00
Jeffrey Han
e6ca847d17
Follow-up to #209 : minor consistency changes.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-09 23:15:47 -05:00
Jeffrey Han
8186236556
Merge pull request #209 from yugecin/aspire-fix
...
Aspire fix
2016-12-09 23:11:42 -05:00
Jeffrey Han
40cf877540
Removed HexideServer.
...
Looks like it's down for good.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-09 22:56:23 -05:00
yugecin
c843dba782
fix merge conflicts
2016-12-10 02:31:55 +01: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
c87c5a8d7a
don't show hitresult fades for sliders when hidden is enabled
2016-12-10 02:01:53 +01:00
yugecin
7a45e1abbb
fade out sliders when hidden is enabled
2016-12-10 01:54:29 +01:00
yugecin
848f83ed29
hide scoreboard if 'hide all UI' option is enabled
2016-12-10 01:35:48 +01:00
yugecin
c0acb7ad6b
Merge branch 'yugecin/opsu/aspire-fix'
...
# Conflicts:
# src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java
2016-12-10 01:32:04 +01:00
yugecin
9ed6e8b320
CurveRenderState geometry
2016-12-10 01:21:17 +01:00
yugecin
e878f0fb0d
Merge branch 'master' of https://github.com/itdelatrisu/opsu into 'upstream'
...
# Conflicts:
# README.md
# src/itdelatrisu/opsu/Opsu.java
# src/itdelatrisu/opsu/Utils.java
# src/itdelatrisu/opsu/render/CurveRenderState.java
# src/itdelatrisu/opsu/states/Game.java
2016-12-10 01:19:31 +01:00
yugecin
fdf936e47b
fade in/out letterboxes during breaks
2016-12-10 00:13:07 +01:00
yugecin
915728ec24
force break end when next object shows
2016-12-09 23:13:05 +01:00
yugecin
5f9f68c6e8
check array size before accessing next element (fixes aspire map crash)
2016-12-09 22:16:42 +01:00
yugecin
fd8474365d
clamp msPerBeat in timingpoints between 10 and 1000 like upstream game does (thanks to @McKay42 for the suggestion)
2016-12-09 22:14:13 +01:00
yugecin
4c64eee4db
fix rendering too much merged slider after loading checkpoint
2016-12-09 22:09:50 +01:00
yugecin
2000aacde3
remove some commented stuff
2016-12-09 22:02:02 +01:00
Jeffrey Han
38daee002f
Follow-up to af667a4.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-08 20:05:08 -05:00
Jeffrey Han
af667a48d5
Added GL version/vendor to error report. ( #207 )
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-08 20:00:14 -05:00
yugecin
5989c50456
fix #94
2016-12-07 13:35:29 +01:00
Jeffrey Han
4b1dc39e4a
Follow-up to #205 : fixed some compile warnings.
2016-12-06 11:53:27 -05:00
yugecin
b52b2b251c
remove unused code
2016-12-05 21:13:18 +01:00
yugecin
cfc5426963
fix blending... and update slidergradient
2016-12-05 20:48:38 +01:00
yugecin
601280cfa3
increase curve density for more beautiful sliders
2016-12-05 18:45:30 +01:00
yugecin
5cd9515d87
disable blending for slider curves
2016-12-05 18:37:37 +01:00
yugecin
d5296d51fa
fix shrinking sliders for fallback sliders
2016-12-05 00:35:11 +01:00
yugecin
9e63086600
rename the 'enable storyboard' option
2016-12-04 23:47:59 +01:00
yugecin
d7601b8f7e
change map end delay max to 15000
2016-12-04 22:53:47 +01:00
yugecin
e3fdd73e36
fix wrong trackposition during lead in caused by music offsets
2016-12-04 22:45:05 +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
33f018bf0f
Merge branch 'master' into knorkemergingsliders
2016-12-04 16:22:15 +01:00
yugecin
f820cc546a
modify factor min/max
2016-12-04 16:15:26 +01:00
yugecin
4acca328a7
fix bezier depending options
2016-12-04 16:11:15 +01:00
yugecin
8b1d1e03bb
fix menu hiding items cause derpings in detecting current hovering option
2016-12-04 16:06:13 +01:00
yugecin
403075a53d
add cubic bezier mover for slider entries, add aggressiveness factor for slider entry/exit
2016-12-04 15:32:38 +01:00
yugecin
f91f2bb88f
fix aggressiveness not updating
2016-12-04 14:31:35 +01:00
yugecin
e916e73ddb
chagne quadr bez setting sensitivity
2016-12-04 13:54:26 +01:00
yugecin
27be84e99a
hide options with failing showcondition
2016-12-04 13:49:35 +01:00
yugecin
e2453db9d5
add showcondition for options
2016-12-04 13:40:41 +01:00
yugecin
3c15aeb9bd
add aggressiveness in optionmenu
2016-12-04 13:37:00 +01:00
Matteo Signer
041014ab47
Fix float constants.
2016-12-03 23:53:48 +01:00
yugecin
06445e59c4
fix slider leftovers being drawn
2016-12-03 20:13:58 +01:00
yugecin
8f9f16de98
try fix the slidercones inbetween
2016-12-03 19:25:22 +01:00
yugecin
580f11a3d3
draw sliders on correct times
2016-12-03 19:11:36 +01:00
yugecin
022035dce5
Merge branch 'knorkesliders' into knorkemergingsliders
...
# Conflicts:
# src/itdelatrisu/opsu/objects/Slider.java
2016-12-03 18:54:09 +01:00
Matteo Signer
9991364077
Improve slider rendering.
...
Significantly improves looks and performance of sliders, especially on
shared memory graphics models like integegrated GPUs.
No longer renders using cones and a framebuffer, instead renders quads
and triangles for curves, using much less geometry.
2016-12-03 18:46:13 +01:00
yugecin
89245d9976
first attempt at merging sliders
2016-12-03 18:39:20 +01:00
yugecin
08834471fc
first attemt at shrinking sliders
2016-12-03 18:18:18 +01:00
yugecin
b19523ff26
ctrl+click slider option to reset to default value
2016-11-20 23:19:13 +01:00
yugecin
7898b669f5
add visual indicator for numeric values in the option menu
2016-11-20 23:06:47 +01:00
yugecin
b6f2101c16
add pippi radius ( close #26 )
2016-11-20 22:50:49 +01:00
yugecin
6ef16bce36
fix not being able to skip when epilepsy warning is taking its time
2016-11-20 22:41:33 +01:00
yugecin
44bcaf06f9
fix npe caused be last commit changes
2016-11-20 22:27:16 +01:00
yugecin
63144426d1
new cursor override: use next object's colors ( close #43 )
2016-11-20 22:10:17 +01:00
yugecin
e18eba17de
make dancer code more resilient to storyboard changes
2016-11-20 18:35:20 +01:00
yugecin
cdd88d9a8d
merge the movers into one list, use java8 for default impl in interfaces
2016-11-20 17:24:58 +01:00
yugecin
30186b94f4
getting rid of repetitions
2016-11-20 17:01:56 +01:00
yugecin
726fef9b38
Merge branch 'Awlexus-master' into pullreqs
2016-11-20 14:22:54 +01:00
yugecin
da90c98fce
ability to change map offset while playing (- and + keys)
2016-11-20 13:49:53 +01:00
yugecin
7daafd612e
on exceptions that make game crash, show dialog with the real cause ( close #51 )
2016-11-20 13:45:05 +01:00
yugecin
3ddda20b64
disable epilepsy warning by default
2016-11-20 13:32:12 +01:00
yugecin
319b40dfdb
hide epilepsy warning when skipping intro
2016-11-20 13:31:44 +01:00
yugecin
896ba657a7
don't show epilepsy img when jumping object index using sb
2016-11-20 13:30:02 +01:00
yugecin
b3d8b02cb8
restart when the skin changed
2016-11-20 13:24:37 +01:00
yugecin
45dc7260b4
ensure minimumsize for buttons (mods, random map, options, ..) in songmenu and add ctrl+o shortcut to go to options screen ( close #58 )
2016-11-20 13:19:21 +01:00
yugecin
e025fd70d5
make reversearrows expand more like in osu! ( close #50 )
2016-11-20 13:05:37 +01:00
Awlex
b36d7d487f
Remodeled PolyMoverFactories and Movers, to be more effizient and userfriendly
2016-11-20 04:42:46 +01:00
Awlex
a671f9dba2
something
2016-11-19 22:47:27 +01:00
yugecin
a018c5fb32
add a timingpoint to the theme map so the mainmenu logo can dance
2016-11-19 22:00:29 +01:00
Awlex
6f5f17da74
First try integrating a Arc. Status: Still alot to do
2016-11-19 02:33:15 +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
64d1239e84
add mainmenu ghost logo
2016-11-18 00:24:27 +01:00
yugecin
8be9adbd62
simplify main menu logo piece positioning
2016-11-18 00:16:58 +01:00
yugecin
a1a9dde5ae
add epilepsy warning img
2016-11-17 00:12:44 +01:00
yugecin
07cf71fe8e
rename never draw bg option
2016-11-13 13:24:08 +01:00
yugecin
438c718d6e
make the logo in mainmenu open a bit less wide
2016-11-13 12:34:07 +01:00
yugecin
c2d6756114
speedy gonzalez main menu button animations
2016-11-13 12:17:24 +01:00
yugecin
4b5fab5050
add map start & end delay adjustable ( #10 optimalisation)
2016-11-13 04:17:28 +01:00
yugecin
5aa3a60f16
Merge branch 'logo'
2016-11-13 02:45:40 +01:00
yugecin
f17bd4df45
don't loop the theme music
2016-11-13 02:45:26 +01:00
yugecin
de2ddfc151
parse beatmap timing points when main menu wants it :>
2016-11-13 02:40:43 +01:00
yugecin
cd54352865
parse beatmap timing points when main menu wants it :>
2016-11-13 02:38:37 +01:00
yugecin
11f0b8ddfb
shift logo back to center when pressing esc
2016-11-13 02:35:48 +01:00
yugecin
38d1bdf14b
cleanup the mess
2016-11-13 02:10:09 +01:00
yugecin
2b585e376f
get the scale from the menubutton to scale the piece
2016-11-13 02:01:21 +01:00
yugecin
9f40b4f4a1
use the new menubuttons
2016-11-13 01:52:09 +01:00
yugecin
fa47399970
Merge branch 'sb'
2016-11-13 01:45:18 +01:00
yugecin
b722808d70
add option to enable/disable sb
2016-11-13 01:45:06 +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
a98ac98b67
Merge branch 'sb'
2016-11-13 01:10:16 +01:00
yugecin
711fd0a03e
fix object color override for sb
2016-11-13 00:58:50 +01:00
yugecin
d869f2ef48
save settings on enter, revert on leave
2016-11-13 00:14:38 +01:00
yugecin
15f560ee68
some interaction fixes
2016-11-12 23:55:39 +01:00
yugecin
1cb815360c
make the menu respond better (for slider values etc)
2016-11-12 23:34:45 +01:00
yugecin
43e1109f40
make the menu work
2016-11-12 23:31:18 +01:00
yugecin
f466fafa03
skip through objects
2016-11-12 23:13:41 +01:00
yugecin
b584dcaf68
overlays, draw an optionmenu
2016-11-12 22:30:22 +01:00
