Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,183 Commits 2 Branches 0 Tags 50 MiB
b37e03b3be
Commit Graph

1047 Commits

Author SHA1 Message Date
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
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
7e82b05a56 use inner interface instead of default impl so we can go back to java 7 :) (close #87) 2016-12-04 23:54:53 +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
041e0dd439 correct the position/speed when exiting sliders 2016-12-04 15:00:07 +01:00
yugecin
79f0cead0c cleanups 2016-12-04 14:35:47 +01:00
yugecin
f91f2bb88f fix aggressiveness not updating 2016-12-04 14:31:35 +01:00
yugecin
22146e1ac6 fix sboverlay showcondition 2016-12-04 14:05:18 +01:00
yugecin
7459dd66d0 add the showcondition to sboverlay options 2016-12-04 13:57:02 +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
yugecin
f95d1c4669 add quadratic bezier mover 2016-12-04 13:23:37 +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
fd39b69cbf disable the second linear mover 2016-12-02 14:56:33 +01:00
yugecin
7f64d80b47 add pippi radius to storyboard options 2016-11-23 22:34:51 +01:00
yugecin
bf517eeb07 fix first slidermover derping 2016-11-20 23:52:28 +01:00
yugecin
6e4d34b3c5 hotfix broken slidermovers 2016-11-20 23:40:30 +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
8421930f27 add star approach circle 2016-11-20 22:38:05 +01:00
yugecin
e5a359cc63 add star spinner (close #53) 2016-11-20 22:29:40 +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
b325b53e4f polymovers don't like slidermovers 2016-11-20 17:02:55 +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
Awlex
14d88f38bf The model is now working and downwards compatible 2016-11-20 13:49:40 +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
5a5c13f64c ArcFactory works with one Arc 2016-11-20 00:04:56 +01:00
Awlex
a671f9dba2 something 2016-11-19 22:47:27 +01:00
Awlex
3bd16a8593 Merge branch 'master' into Curving 2016-11-19 22:17:19 +01:00
Awlex
21aa986ea9 Fixing Dancer 2016-11-19 22:16:36 +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
9ff2145b39 Merge remote-tracking branch 'refs/remotes/origin/Curving' 2016-11-19 21:57:11 +01:00
Awlex
a64e939d88 Added Sinus Mover 2016-11-19 21:56:52 +01:00
Awlex
5366b53db0 Merge remote-tracking branch 'refs/remotes/yugecin/master' 2016-11-19 21:55:05 +01:00
Awlex
b01033edd5 It looks better now 2016-11-19 21:54:33 +01:00
yugecin
f0db0b82fb fix #55 2016-11-19 21:21:11 +01:00
Awlex
eb561d8369 It doesn't crash anymore 2016-11-19 15:41:53 +01:00
Awlex
6f5f17da74 First try integrating a Arc. Status: Still alot to do 2016-11-19 02:33:15 +01:00
Awlex
375a44722d Revert "Improved all Spiral Classes." 
This reverts commit ffcdeed948.
 2016-11-19 00:08:10 +01:00
Awlex
5c5f6bd621 Basic Implementation of a Mover with more than 2 points (GameObjects) and added Jama (Java Matrix) library to the project 2016-11-19 00:06:55 +01:00
Awlex
ffcdeed948 Improved all Spiral Classes. 2016-11-18 17:45:57 +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
872ae68990 Merge branch 'sb' 2016-11-13 13:33:18 +01:00
yugecin
3812742b76 reload sb settings when deleting a setting 2016-11-13 13:33:11 +01:00
yugecin
07cf71fe8e rename never draw bg option 2016-11-13 13:24:08 +01:00
yugecin
6644ed96f5 Merge branch 'sb' 2016-11-13 13:17:35 +01:00
yugecin
1786e74a51 use name instead of displayname 2016-11-13 13:13:22 +01:00
yugecin
41143586f6 show option value in sblist 2016-11-13 13:12:57 +01:00
yugecin
db6c813715 pause music when pressing c and already at 0 speed 2016-11-13 13:10:49 +01:00
yugecin
454d09b5d0 save the current options into the first obj's options 2016-11-13 13:09:28 +01:00
yugecin
a01a233245 add hint for keymap save/load position 2016-11-13 12:53:57 +01:00
yugecin
ea7856e52d add hit lighting as sb option 2016-11-13 12:51:53 +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
fbd62e4342 Merge branch 'sb' 2016-11-13 04:23:34 +01:00
yugecin
fed1f1ee50 fix going back not reverting the changes from last index 2016-11-13 04:23:27 +01:00
yugecin
4b5fab5050 add map start & end delay adjustable (#10 optimalisation) 2016-11-13 04:17:28 +01:00
yugecin
e8a6b07fef Merge branch 'sb' 2016-11-13 04:07:02 +01:00
yugecin
0268d325d1 fix more aiob 2016-11-13 04:06:52 +01:00
yugecin
173d3e7c2c use a linearmover for the first movement 2016-11-13 03:18:21 +01:00
yugecin
3a0de6df90 Merge branch 'sb' 2016-11-13 03:12:33 +01:00
yugecin
6f083d47da add visual indicator for map progress 2016-11-13 03:12:26 +01:00
yugecin
b969946fc4 fix array index out of bounds 2016-11-13 03:07:46 +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
81890effd3 also instantly update when obj color rgb inc changes 2016-11-13 01:29:26 +01:00
yugecin
623c5eefdd fix object color override not live changing after editing in sb 2016-11-13 01:27:32 +01:00
yugecin
7d9384f09e fix sb changes being drawn above each other instead of under 2016-11-13 01:25:34 +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
53a444bd78 display the sb changed at current object 2016-11-13 01:10:08 +01:00
yugecin
711fd0a03e fix object color override for sb 2016-11-13 00:58:50 +01:00
yugecin
e853abcd9f fix list item options not saving 2016-11-13 00:43:29 +01:00
yugecin
7ae70c7c16 catch escape key in overlay 2016-11-13 00:41:04 +01:00
yugecin
7bd3c22b8a prevent aiobe 2016-11-13 00:27:38 +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
fe2169c39c make it work 2016-11-12 18:25:55 +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
3d5afa77b0 remove the overridden one 2016-11-12 15:41:55 +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