Commit Graph

1500 Commits

Author SHA1 Message Date
yugecin
aa3b898a12 Merge branch 'master' into upstream 2016-12-10 10:56:17 +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
4500b9f985 Merge remote-tracking branch 'remotes/yugefork/slider-improvements'
# Conflicts:
#	src/itdelatrisu/opsu/GameData.java
#	src/itdelatrisu/opsu/objects/Slider.java
2016-12-10 02:30:57 +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
b3a69cda23 md 2016-12-10 01:40:44 +01:00
yugecin
6c798b0780 Revert "remove gradle"
This reverts commit 51f5282517.
2016-12-10 01:38:55 +01:00
yugecin
c1ac3bfe9e update example vid in readme 2016-12-10 01:38:32 +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
84cb6d34e2 sync opsu's readme with upstream 2016-12-10 01:29:59 +01:00
yugecin
cb1b9fbe42 Merge branch 'upstream' 2016-12-10 01:25:00 +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
Jeffrey Han
0b9a0e188d Merge pull request #205 from mad-s/master
Improve slider rendering.
2016-12-06 11:37:02 -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
25f310887d Merge branch 'knorkemergingsliders' 2016-12-04 22:40:35 +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