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
yugecin
ceb6751831
leadin delay 2s
2016-11-12 19:04:40 +01:00
yugecin
7276705533
add 5s delay after last hitobj
2016-11-12 18:44:04 +01:00
yugecin
3dc0ad8c68
get tick points from slider
2016-11-12 18:25:44 +01:00
yugecin
9860175196
fix saving the value
2016-11-12 18:25:25 +01:00
yugecin
25d16ddfae
kickoff slidermovers
2016-11-12 15:41:20 +01:00
yugecin
6a3aaf7375
something
2016-11-06 11:46:56 +01:00
yugecin
b90a9a963a
remove println
2016-11-05 22:40:29 +01:00
yugecin
4f289c2291
add piece
2016-11-05 22:17:02 +01:00
yugecin
86710f53b5
move logo to the beat
2016-11-05 21:49:20 +01:00
yugecin
df8b53db7a
making _sure_ that #37 doesn't happen anymroe
2016-10-15 20:16:14 +02:00
yugecin
05ca421d78
attempt to fix problem with muting applause
2016-10-15 10:48:33 +02:00
yugecin
6a5ba7cd9e
add option to force fallback sliders ( #24 )
2016-10-15 00:09:52 +02:00
yugecin
6b1b4e2339
add option to allow multiple instances ( closes #33 )
2016-10-14 23:54:06 +02:00
Jeffrey Han
79bfa1c255
Properly fix #177 .
...
Previous fix (#186 ) threw NPE upon failing a song. Thanks to #155 .
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-10-13 17:51:51 -04:00
Jeffrey Han
3b847d088d
Follow-up to #155 .
...
Some code cleanup and tweaks to the scoreboard display.
2016-10-13 14:41:58 -04:00
Jeffrey Han
21579daa26
Merge pull request #155 from mad-s/master
...
Add ingame scoreboard
2016-10-13 14:15:02 -04:00
Jeffrey Han
410e6d6765
Destroy SoundController resources before exit.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-10-13 04:52:03 -04:00
Jeffrey Han
2d150c9939
Follow-up to dabfb82.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-10-13 04:20:03 -04:00
Jeffrey Han
dabfb827ee
Use Download class to download track previews into a Temp/ directory.
...
AudioSystem.getAudioInputStream(URL) was causing issues, so just download the files using the more robust Download class.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-10-13 04:12:47 -04:00
Jeffrey Han
89e8341686
Merge pull request #186 from yugecin/master
...
Fix #177
2016-10-13 02:26:24 -04:00
Jeffrey Han
f3918b7b60
New MengSkyServer API.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-10-13 02:07:45 -04:00
Jeffrey Han
76c8efb0c2
Disable SSL validation for YaSOnlineServer.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-10-13 01:17:59 -04:00
yugecin
d8aaa3e5a4
tabs
2016-10-11 18:36:28 +02:00
Awlex
164d272340
Muting 'Applause' after leaving resultscreen closes #27
2016-10-11 18:06:59 +02:00
yugecin
97dd34cfc3
better way to check if display settings changed
2016-10-11 11:51:29 +02:00
yugecin
4d16508625
automatically restart when display settings changed
2016-10-11 11:47:46 +02:00
yugecin
0e43e6f938
option to allow larger resolutions, close #11
2016-10-11 11:40:16 +02:00
yugecin
35695ccf97
add native resolution to resolution list
2016-10-11 11:37:47 +02:00
yugecin
b1887b953b
add fullscreen option, close #17
2016-10-11 11:22:32 +02:00
yugecin
3d3296f4ff
fix #25
2016-10-11 11:04:41 +02:00
yugecin
255280de95
fix 'use last objects color' cursor color override using the color before the object was hit
2016-10-10 23:46:20 +02:00
yugecin
9e4cfb47cf
Option to only color cursor trail
2016-10-04 15:22:13 +02:00
yugecin
177e75ba29
show github link in playfield
2016-10-04 14:40:41 +02:00
yugecin
c0ea819ccb
make the spinner delay less sensitive
2016-10-04 13:44:05 +02:00
yugecin
5c2fc16124
use better spinnerdelay
2016-10-04 13:43:08 +02:00
yugecin
fb74d1219a
edit issues & update url to point the opsu-dance repo
2016-10-04 13:05:10 +02:00
yugecin
99c5f9b407
New hidden slider style
2016-10-04 13:01:24 +02:00
yugecin
23eed71a9c
Put the text above the repo buttons so that the fps counter will not block it
2016-10-04 12:40:01 +02:00
yugecin
7ab4e4263f
Don't hide ui in break periods when auto isn't active
2016-10-02 10:47:48 +02:00
yugecin
0ef65e2dd1
Fix pippi using a wrong radius in the beginning
2016-10-01 21:40:58 +02:00
yugecin
3a30087929
Fix selecting "IAHN - Transform [Aspire]" map crashing the game ( #5 )
2016-10-01 21:21:33 +02:00
yugecin
f15ead1476
better sliderball scale
2016-10-01 15:57:41 +02:00
yugecin
6ad4348d7c
fix start
2016-10-01 15:47:01 +02:00
yugecin
b6c8b9753e
add key for single mirror object
2016-10-01 15:24:30 +02:00
yugecin
f93fab1874
fix mirrorFrom
2016-10-01 15:16:34 +02:00
yugecin
e08d5f2a83
use mapid to decide starting hue for rainbow objects, also use mapid instead of title for direction etc
2016-10-01 15:10:20 +02:00
yugecin
3a507453f9
Use map title to get initial rainbow colors
2016-10-01 15:00:12 +02:00
yugecin
38d5c64a26
Don't show mirror mouse trail from 0,0 when toggling mirror
2016-10-01 14:54:05 +02:00
yugecin
c58cf824a3
Add option to do circles in lazy sliders
2016-10-01 14:51:09 +02:00
yugecin
9d6c413eb7
Implement circleslowsliders
2016-10-01 14:46:39 +02:00
yugecin
49e03add75
Make mirror collage toggleable ingame by pressing M
2016-10-01 13:58:10 +02:00
yugecin
376cb558cb
Merge branch 'spinners' into master
2016-10-01 13:44:54 +02:00
yugecin
be599885f5
add spinnerdelay option
2016-10-01 13:44:34 +02:00
yugecin
58b22cadd6
remove debug println
2016-10-01 13:14:58 +02:00
yugecin
9dc566ca4e
always use white reversearrows
2016-10-01 13:14:31 +02:00
yugecin
70d006b645
make reversearrows scale to the bpm
2016-10-01 13:12:02 +02:00
yugecin
ea45767fa1
Onyl show mirrored object hitresults if autopilot is active >.<
2016-10-01 12:39:52 +02:00
yugecin
eb3ff1040b
fxi F7 forreal
2016-10-01 12:19:26 +02:00
yugecin
d6bd2b5649
make F7 key work again
2016-10-01 12:17:02 +02:00
yugecin
a7e1a2e32f
cursor trail length override
2016-10-01 12:14:39 +02:00
yugecin
c7538ef348
Add 1000fps option
2016-10-01 12:06:05 +02:00
yugecin
6404bbafdc
better scale for rgb cursor color hue inc
2016-10-01 12:03:07 +02:00
yugecin
1a44b38636
add separate rgb inc option for cursor
2016-10-01 11:59:03 +02:00
yugecin
652bb4f2d0
add cursor color overrides
2016-10-01 11:53:33 +02:00
yugecin
eee65a589e
fix first object movement
2016-10-01 11:34:32 +02:00
yugecin
d424db9a7f
make sample override a percent instread of boolean
2016-10-01 10:46:28 +02:00
yugecin
6788cd84d8
Merge branch 'hitresults'
2016-10-01 00:26:02 +02:00
yugecin
5a899e29cb
don't play the hitsounds twice >.<
2016-10-01 00:25:55 +02:00
yugecin
0199c445c6
Use dance option tab as initial tab
2016-09-30 23:57:43 +02:00
yugecin
230dd6d98f
put common stuff in utils
2016-09-30 23:56:07 +02:00
yugecin
ad370fd8fb
Show mirrored result for slider ends
2016-09-30 23:53:48 +02:00
yugecin
4409d538fd
Show mirrored results for hitcircles
2016-09-30 23:51:28 +02:00
yugecin
b1d69cf9f4
Instantly show hitresult on slider initial circle, don't show the other end when finishing. Also show results in mirrored circles
2016-09-30 23:48:02 +02:00
yugecin
5b264a5277
Option to hide all objects
2016-09-30 23:11:43 +02:00
yugecin
722180d9ff
Merge branch 'pippi'
2016-09-30 22:58:05 +02:00
yugecin
2b91288adb
PIPPI!
2016-09-30 22:57:57 +02:00
yugecin
5bcf072a69
add options
2016-09-30 22:08:45 +02:00
yugecin
4ab767f464
Adjust default values for dancer options
2016-09-30 21:51:59 +02:00
yugecin
043237d1a1
add to option menu
2016-09-30 21:45:19 +02:00
yugecin
daa7bec0da
Add mover direction
2016-09-30 21:40:33 +02:00
yugecin
2f5f2a610d
add opposite combo color as override option
2016-09-30 21:32:24 +02:00
yugecin
ae9bdcd68f
implement sliderballtint
2016-09-30 21:11:16 +02:00
yugecin
39b24b5f1c
attempt to load normal image if there's no array (load sliderb if there's no sliderb0, sliderb1 etc)
2016-09-30 21:11:03 +02:00
yugecin
08d9f4165a
option to ignore beatmap sample volume
2016-09-30 21:08:15 +02:00
yugecin
8891976d48
Flash warningarrows after breaks 4 times instead of 2
2016-09-30 20:08:50 +02:00
yugecin
be547cfa1f
Don't draw UI on breaks
2016-09-30 20:05:33 +02:00
yugecin
0ccf4874d8
hotfix for dummy img as hitobjectnumber prevent drawing of hitcircleoverlay
2016-09-30 20:01:31 +02:00
yugecin
8c7531e550
prevent arrayindexoutofbounds
2016-09-30 19:56:47 +02:00
yugecin
b12ed6fa0e
Also draw skipbutton when using auto
2016-09-30 19:41:42 +02:00
yugecin
be5288d1f7
auto activate auto
2016-09-30 19:39:47 +02:00
yugecin
f6b791cf25
Option to apply last object color to cursor
2016-09-30 19:38:02 +02:00
