Jeffrey Han
59204665bc
Fixed a potential NullPointerException in ScoreDB. ( #219 )
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-20 10:19:02 -05:00
Jeffrey Han
7fa9355bbf
More efficient beat progress calculation. ( #214 )
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-19 22:39:49 -05:00
Jeffrey Han
90a2f1d2f2
Follow-up to #214 : cleanup.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-19 21:02:01 -05:00
Jeffrey Han
0f936d32cb
Merge pull request #214 from yugecin/pusing-logo
...
Pulse main menu logo to the beat, add pulsing logo in song menu
2016-12-19 19:17:26 -05:00
yugecin
22f6259092
fix hover scale
2016-12-20 00:51:38 +01:00
yugecin
156d52f8c8
cleanup
2016-12-20 00:40:51 +01:00
Jeffrey Han
4af2d7bfcf
Minor "auto" mod fixes in the song menu.
...
- Enable "auto" with ctrl+click (instead of just ctrl+enter).
- Always turn off "auto" after one game.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-19 18:33:06 -05:00
yugecin
82e2d2100d
simplify expand scale calc
2016-12-20 00:32:14 +01:00
yugecin
e648a553ea
make the footer logo a button, start game when clicking & expand on hover
2016-12-20 00:31:15 +01:00
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
c42e7e4399
fix hover option in option menu not updating when scrolling
2016-12-18 21:04:17 +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
48d742bbc5
fix a wild indentation error and spaces
2016-12-12 23:22:12 +01:00
yugecin
f0781ee1c6
fix weird behavior when removing a storyboard option
2016-12-12 21:12:16 +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
5e8d218000
restore accidental deleted line
2016-12-12 18:49:26 +01:00
yugecin
35179729c6
init the listhoverindex
2016-12-12 18:46:57 +01:00
yugecin
4f995c4eb8
variable consistency
2016-12-12 18:46:32 +01:00
yugecin
53278409fa
ask for key input when mouse button released, not pressed
2016-12-12 18:43:01 +01:00
yugecin
6501998bb4
make a sound when changing slider values
2016-12-12 18:41:26 +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
d8bd6ce93b
add code again to remove sb options
2016-12-11 19:48:01 +01:00
yugecin
a22c232beb
fix cursortrail when changing sb index
2016-12-11 19:25:35 +01:00
yugecin
1660c4f3d7
fix ob1
2016-12-11 19:24:01 +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
55453c5d26
Use round instead of cast to get better slider feeling
2016-12-11 18:58:01 +01:00
yugecin
42335b2024
attempts to fix storyboard
2016-12-11 18:09:02 +01:00
yugecin
b210b462fb
fix don't show the enable sb option in sb option menu
2016-12-11 16:47:05 +01:00
yugecin
7ff55b87c8
fix the save events
2016-12-11 16:46:47 +01:00
yugecin
066382d4bf
compacter lists
2016-12-11 16:41:56 +01:00
yugecin
0e06ab6249
make default tab actually work
2016-12-11 16:36:29 +01:00
yugecin
7096201521
cleanup tabstuff in optionsoverlay
2016-12-11 16:33:32 +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
347705aadf
fix quadratic bezier aggressiveness
2016-12-11 14:16:35 +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
15e3d46272
add hit animations to sb options
2016-12-11 13:40:03 +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
1588d896e1
reset sb speed on enter ( close #74 )
2016-12-11 13:29:43 +01:00
yugecin
3054071bd6
move values more to the right in sb overlay
2016-12-11 13:27:29 +01:00
yugecin
f0c51084d1
clean up options
2016-12-11 13:25:04 +01:00
yugecin
5cf0f5bd1f
more cleanup
2016-12-11 12:47:33 +01:00
yugecin
4bfd5147fb
add key input option handling and other improvements
2016-12-11 12:31:52 +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
30b07f75d8
draw comboboxes
2016-12-11 10:40:21 +01:00
yugecin
c1f137c72d
color the value
2016-12-11 10:23:32 +01:00
yugecin
81449fb8d5
fix maximum scroll offset not being changed when options are not shown
2016-12-11 10:20:22 +01:00
yugecin
03a2e646ad
remove sout
2016-12-11 10:08:41 +01:00
yugecin
1bd5da6434
make sliders slide
2016-12-11 10:08:22 +01:00
yugecin
cd06b13f66
tooltip with description
2016-12-11 02:33:50 +01:00
yugecin
82269bf2bb
fix scrollbar and max scroll position
2016-12-11 02:29:48 +01:00
yugecin
4a79ad8a25
only click option when mouse was not dragged
2016-12-11 02:26:31 +01:00
yugecin
0a54d63877
scroll by moving mouse
2016-12-11 02:23:02 +01:00
yugecin
7225095472
some sound effects
2016-12-11 02:18:50 +01:00
yugecin
7abd0d5c63
clickable tabs
2016-12-11 02:14:43 +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
e8877d762d
rename optionsoverlay
2016-12-10 22:36:38 +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
