yugecin
ec53f531c8
got rid of dependency injection, it doesn't add anything at this point and only slows down things and makes a mess. Also some refactoring.
2017-05-21 11:12:55 +02:00
yugecin
be23541ac3
refactor options
2017-03-26 22:57:10 +02:00
yugecin
68e0b6fad8
better workaround for #130
2017-03-04 00:27:53 +01:00
yugecin
bff4eb3b90
workaround for #130
2017-03-04 00:15:33 +01:00
yugecin
2b4ca9198d
"fix" sliders expanding 1 unit after slider is done (reduced fading out sliderbody by 1 unit)
2017-03-03 23:27:22 +01:00
yugecin
e783b4fe3c
workaround for #114
2017-02-25 23:51:42 +01:00
yugecin
5ccc863a17
fix slider followcircle shrink animations showing on repeats
2017-02-25 23:45:22 +01:00
yugecin
9c31cd63ba
slider follow circle start/end animations ( itdelatrisu/opsu@99c698b )
2017-02-25 23:35:51 +01:00
yugecin
0eac32505b
destroy even more images when closing
2017-01-18 19:40:31 +01:00
yugecin
ba10b43f7e
fix slider circle animation color on mirrored slider
2016-12-25 21:48:44 +01:00
yugecin
20194d58b3
post merge stuff
2016-12-24 14:35:36 +01:00
yugecin
a6540044b6
Merge remote-tracking branch 'remotes/original/master' into upstream
...
# Conflicts:
# src/itdelatrisu/opsu/Container.java
# src/itdelatrisu/opsu/GameData.java
# src/itdelatrisu/opsu/Options.java
# src/itdelatrisu/opsu/audio/MusicController.java
# src/itdelatrisu/opsu/objects/Circle.java
# src/itdelatrisu/opsu/objects/Slider.java
# src/itdelatrisu/opsu/render/CurveRenderState.java
# src/itdelatrisu/opsu/states/Game.java
# src/itdelatrisu/opsu/states/MainMenu.java
# src/itdelatrisu/opsu/states/SongMenu.java
# src/itdelatrisu/opsu/ui/Colors.java
# src/itdelatrisu/opsu/ui/MenuButton.java
2016-12-24 14:35:20 +01:00
Jeffrey Han
aa1babed3b
Delayed fade-out of UI after finishing a game.
...
All elements quickly fade out, and wait 2.5s before switching screens (instead of immediately).
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2016-12-24 01:55:43 -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
yugecin
089ff7d0de
minor cleanup
2016-12-18 16:47:55 +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
yugecin
33064b1e69
fix mirror reversearrow animation drawing when it shouldn't
2016-12-12 20:35:40 +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
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
83466c9ef5
fade out reversearrows after ball passed them
2016-12-12 01:05:32 +01:00
yugecin
814922e58a
Merge branch 'options-redesign'
2016-12-11 13:34:28 +01:00
yugecin
f0c51084d1
clean up options
2016-12-11 13:25:04 +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
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
yugecin
c843dba782
fix merge conflicts
2016-12-10 02:31:55 +01:00
yugecin
c87c5a8d7a
don't show hitresult fades for sliders when hidden is enabled
2016-12-10 02:01:53 +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
00fcf0ebc1
add options for slider styles and make it all work
2016-12-04 17:35:55 +01:00
yugecin
06445e59c4
fix slider leftovers being drawn
2016-12-03 20:13:58 +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
Jeffrey Han
3b847d088d
Follow-up to #155 .
...
Some code cleanup and tweaks to the scoreboard display.
2016-10-13 14:41:58 -04:00
yugecin
99c5f9b407
New hidden slider style
2016-10-04 13:01:24 +02:00
yugecin
ea45767fa1
Onyl show mirrored object hitresults if autopilot is active >.<
2016-10-01 12:39:52 +02:00
yugecin
5a899e29cb
don't play the hitsounds twice >.<
2016-10-01 00:25:55 +02:00
yugecin
230dd6d98f
put common stuff in utils
2016-09-30 23:56:07 +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
0ccf4874d8
hotfix for dummy img as hitobjectnumber prevent drawing of hitcircleoverlay
2016-09-30 20:01:31 +02:00
yugecin
965f88ecc3
attempt to support HitCircleOverlap and ScoreOverlap ( #4 )
2016-09-30 16:13:23 +02:00
MatteoS
6f685cf5c7
Ingame scoreboard initial implementation
2015-11-29 09:56:10 +01:00
Jeffrey Han
14496050ea
Minor style changes from #134 .
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2015-09-18 16:02:19 -04:00
Peter Tissen
131138ea8c
Snaking sliders initial implementation.
...
Draws curves in a range from 0 to x (where x is a value between 0 and 1) while blending them in (if enabled in the options)
Cache a unit-cone once and re-use that with scaling and translation instead of generating it each time again.
This is more for readability than performance (since presumably feeding it mostly constants like before would be faster)
Only draws the cones in the curve once if possible
(only possible if consective calls to draw with the intervals x_1 before x_2 are made and [0, x_1] [0, x_2] with x_1 < x_2 holds true)
minor refactoring and cleanup
Omg my code is such a mess. I feel like I've committed a crime against humanity by just randomly putting that
random vbo id into the class called "Rendertarget". But there's really no good place for it now (that has a way to clean it up).
But if "Rendertarget" will ever be used by anything else but the sliders I'm gonna pull that out.
added blending in for return arrows and ticks
2015-09-18 20:21:37 +02:00
Jeffrey Han
6506967c12
Added some missing @param and @throws Javadoc comments.
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2015-09-09 23:51:16 -04:00
Jeffrey Han
01fb9c50c9
Replace xy float[] arrays with Vec2f (mostly in game objects).
...
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2015-09-05 12:53:42 -05:00
Jeffrey Han
b83d6be5fd
Clarified GameImage "skinnable" field as "beatmap-skinnable".
...
Renamed some methods and modified comments to avoid this confusion, as game skins were implemented much later than beatmap skins.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2015-08-23 20:41:09 -05:00
Jeffrey Han
ae5016f3ab
Validate audio files before trying to load them. (part of #120 )
...
Also fixed an issue where songMenu.resetGameDataOnLoad() sometimes wasn't being called when it should be (e.g. after playing a beatmap, if you move to a different screen, your score won't appear in the song menu right away). It's now being called more often than necessary, but that should be fine.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
2015-08-20 22:58:45 -05:00
